From 5a74115bebb42df2eac3a277478f69ef706c4e83 Mon Sep 17 00:00:00 2001
From: DrunkenToast <peter5leconte@gmail.com>
Date: Sat, 20 Nov 2021 21:10:39 +0100
Subject: [PATCH] feat: remove from queue + fix typo queuecommand

---
 src/commands/play.ts    |  1 +
 src/commands/remove.ts  | 77 +++++++++++++++++++++++++++++++++++++++++
 src/inversify.config.ts |  6 ++--
 src/services/player.ts  |  4 +++
 4 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/commands/remove.ts

diff --git a/src/commands/play.ts b/src/commands/play.ts
index a907a40..3bf19a4 100644
--- a/src/commands/play.ts
+++ b/src/commands/play.ts
@@ -37,6 +37,7 @@ export default class implements Command {
     this.getSongs = getSongs;
   }
 
+  // eslint-disable-next-line complexity
   public async execute(msg: Message, args: string[]): Promise<void> {
     const [targetVoiceChannel] = getMemberVoiceChannel(msg.member!) ?? getMostPopularVoiceChannel(msg.guild!);
 
diff --git a/src/commands/remove.ts b/src/commands/remove.ts
new file mode 100644
index 0000000..8f2931f
--- /dev/null
+++ b/src/commands/remove.ts
@@ -0,0 +1,77 @@
+import {Message, TextChannel} from 'discord.js';
+import {inject, injectable} from 'inversify';
+import {TYPES} from '../types.js';
+import PlayerManager from '../managers/player.js';
+import Command from '.';
+import LoadingMessage from '../utils/loading-message.js';
+import errorMsg from '../utils/error-msg.js';
+
+@injectable()
+export default class implements Command {
+  public name = 'remove';
+  public aliases = ['rm'];
+  public examples = [
+    ['remove 1', 'removes the first song in the queue (not the one thats playing, just skip it dummy)'],
+    ['rm 6-9', 'removes the every song in range [6-9] from the queue'],
+  ];
+
+  private readonly playerManager: PlayerManager;
+
+  constructor(@inject(TYPES.Managers.Player) playerManager: PlayerManager) {
+    this.playerManager = playerManager;
+  }
+
+  public async execute(msg: Message, args: string []): Promise<void> {
+    const player = this.playerManager.get(msg.guild!.id);
+
+    const res = new LoadingMessage(msg.channel as TextChannel);
+    await res.start();
+
+    if (args.length === 0) {
+      await res.stop('atleast give me a clue for which song you want to remove');
+      return;
+    }
+
+    const reg = /^(\d+)-(\d+)$|^(\d+)$/g; // Expression has 3 groups: x-y or z. x-y is range, z is a single digit.
+    const match = reg.exec(args[0]);
+
+    if (match === null) {
+      await res.stop(errorMsg('incorrect format, just an index or start-end format'));
+      return;
+    }
+
+    if (match[3] === undefined) { // 3rd group (z) doesn't exist -> a range
+      const range = [parseInt(match[1], 10), parseInt(match[2], 10)];
+
+      if (range[0] < 1) {
+        await res.stop(errorMsg('you start counting with 1'));
+        return;
+      }
+
+      if (range[0] < range[1]) {
+        player.removeFromQueue(range[0], range[0] - range[1]);
+      } else {
+        await res.stop(errorMsg('range is backwards, just like you'));
+        return;
+      }
+
+      console.log(range);
+    } else { // 3rd group exists -> just one song
+      const index = parseInt(match[3], 10);
+
+      if (index < 1) {
+        await res.stop(errorMsg('it\'s got be bigger than 0, chief'));
+        return;
+      }
+
+      if (index > player.queueSize()) {
+        await res.stop(errorMsg('queue isn\'t THAT big'));
+        return;
+      }
+
+      player.removeFromQueue(index, 1);
+    }
+
+    await res.stop('to the trash it goes :wastebasket:');
+  }
+}
diff --git a/src/inversify.config.ts b/src/inversify.config.ts
index b45c588..ae17791 100644
--- a/src/inversify.config.ts
+++ b/src/inversify.config.ts
@@ -21,7 +21,8 @@ import ForwardSeek from './commands/fseek.js';
 import Help from './commands/help.js';
 import Pause from './commands/pause.js';
 import Play from './commands/play.js';
-import QueueCommad from './commands/queue.js';
+import QueueCommand from './commands/queue.js';
+import Remove from './commands/remove.js';
 import Seek from './commands/seek.js';
 import Shortcuts from './commands/shortcuts.js';
 import Shuffle from './commands/shuffle.js';
@@ -60,7 +61,8 @@ container.bind<NaturalLanguage>(TYPES.Services.NaturalLanguage).to(NaturalLangua
   Help,
   Pause,
   Play,
-  QueueCommad,
+  QueueCommand,
+  Remove,
   Seek,
   Shortcuts,
   Shuffle,
diff --git a/src/services/player.ts b/src/services/player.ts
index 0446fa8..9568ce0 100644
--- a/src/services/player.ts
+++ b/src/services/player.ts
@@ -271,6 +271,10 @@ export default class {
     this.queue = newQueue;
   }
 
+  removeFromQueue(index: number, amount = 1): void {
+    this.queue.splice(this.queuePosition + index, amount);
+  }
+
   removeCurrent(): void {
     this.queue = [...this.queue.slice(0, this.queuePosition), ...this.queue.slice(this.queuePosition + 1)];
   }