commands/voice/queue.py

@@ -15,6 +15,9 @@ from .utils import command_allowed, ensure_joined, play_next
 
 
 async def queue_or_play(message, edited=False):
+    if message.guild.id not in players:
+        players[message.guild.id] = audio.queue.Player()
+
     tokens = commands.tokenize(message.content)
     parser = arguments.ArgumentParser(
         tokens[0],
@@ -78,23 +81,19 @@ async def queue_or_play(message, edited=False):
     elif not command_allowed(message):
         return
 
-    if message.guild.id not in players:
-        players[message.guild.id] = audio.queue.Player()
-
     if edited:
-        found = next(
-            filter(
-                lambda queued: queued.trigger_message.id == message.id,
-                players[message.guild.id].queue,
-            ),
-            None,
-        )
+        found = None
+        for queued in players[message.guild.id].queue:
+            if queued.trigger_message.id == message.id:
+                found = queued
+                break
         if found:
             players[message.guild.id].queue.remove(found)
 
     if args.clear:
         players[message.guild.id].queue.clear()
         await utils.add_check_reaction(message)
+        return
     elif indices := args.remove_index:
         targets = []
         for i in indices:
@@ -115,15 +114,15 @@ async def queue_or_play(message, edited=False):
                 f"removed **{len(targets)}** queued {'song' if len(targets) == 1 else 'songs'}",
             )
     elif args.remove_title or args.remove_queuer:
-        targets = set()
+        targets = []
         for queued in players[message.guild.id].queue:
             if t := args.remove_title:
                 if t in queued.player.title:
-                    targets.add(queued)
+                    targets.append(queued)
+                    continue
             if q := args.remove_queuer:
                 if q == queued.trigger_message.author.id:
-                    targets.add(queued)
-        targets = list(targets)
+                    targets.append(queued)
         if not args.match_multiple:
             targets = targets[:1]