Merge Player and Queue services

2 files changed, 2 insertions, 28 deletions

diff --git a/src/managers/player.ts b/src/managers/player.ts
index e8bdf76..b05d506 100644
--- a/src/managers/player.ts
+++ b/src/managers/player.ts
@@ -1,25 +1,22 @@
 import {inject, injectable} from 'inversify';
 import {TYPES} from '../types';
 import Player from '../services/player';
-import QueueManager from './queue';
 
 @injectable()
 export default class {
   private readonly guildPlayers: Map<string, Player>;
   private readonly cacheDir: string;
-  private readonly queueManager: QueueManager;
 
-  constructor(@inject(TYPES.Config.CACHE_DIR) cacheDir: string, @inject(TYPES.Managers.Queue) queueManager: QueueManager) {
+  constructor(@inject(TYPES.Config.CACHE_DIR) cacheDir: string) {
     this.guildPlayers = new Map();
     this.cacheDir = cacheDir;
-    this.queueManager = queueManager;
   }
 
   get(guildId: string): Player {
     let player = this.guildPlayers.get(guildId);
 
     if (!player) {
-      player = new Player(this.queueManager.get(guildId), this.cacheDir);
+      player = new Player(this.cacheDir);
 
       this.guildPlayers.set(guildId, player);
     }
diff --git a/src/managers/queue.ts b/src/managers/queue.ts
deleted file mode 100644
index 6c12232..0000000
--- a/src/managers/queue.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {injectable} from 'inversify';
-import Queue from '../services/queue';
-
-@injectable()
-export default class {
-  private readonly guildQueues: Map<string, Queue>;
-
-  constructor() {
-    this.guildQueues = new Map();
-  }
-
-  get(guildId: string): Queue {
-    let queue = this.guildQueues.get(guildId);
-
-    if (!queue) {
-      queue = new Queue();
-
-      this.guildQueues.set(guildId, queue);
-    }
-
-    return queue;
-  }
-}