Clear command and improved playNextInQueue

commands/clear.js

@@ -0,0 +1,17 @@
+const { clearQueue, getQueue } = require('../utils/queueManager');
+
+module.exports = {
+    name: 'clear',
+    description: 'Clears the entire queue, except for the currently playing song.',
+    execute(message) {
+        const guildId = message.guild.id;
+        const queue = getQueue(guildId);
+
+        if (queue.length === 0) {
+            return message.reply('The queue is already empty!');
+        }
+
+        clearQueue(guildId);
+        message.channel.send('The queue has been cleared, except for the currently playing song.');
+    }
+};

utils/queueManager.js

@@ -29,27 +29,31 @@ function toggleRepeat(guildId) {
 
 function playNextInQueue(guildId, voiceChannel) {
     const queue = getQueue(guildId);
-    let currentTrack = getCurrentTrack(guildId);
+    const currentTrack = getCurrentTrack(guildId);
     const repeat = repeatMap.get(guildId);
 
-    if (currentTrack && repeat) {
+    if (currentTrack && !repeat) {
-        playTrack(guildId, voiceChannel, currentTrack);
-        return;
-    }
-
-    if (queue.length === 0 && !repeat) {
-        const connection = playerMap.get(guildId)?._state?.subscription?.connection;
-        if (connection && connection.state.status !== 'destroyed') {
-            connection.destroy();
-        }
         return false;
     }
 
-    if (queue.length > 0) {
+    let trackToPlay = currentTrack;
-        currentTrack = queue.shift();
+
-        currentTrackMap.set(guildId, currentTrack);
+    if (!trackToPlay) {
-        playTrack(guildId, voiceChannel, currentTrack);
+        if (queue.length > 0) {
+            trackToPlay = queue.shift();
+            currentTrackMap.set(guildId, trackToPlay);
+        } else if (repeat && currentTrack) {
+            trackToPlay = currentTrack;
+        } else {
+            const connection = playerMap.get(guildId)?._state?.subscription?.connection;
+            if (connection && connection.state.status !== 'destroyed') {
+                connection.destroy();
+            }
+            return false;
+        }
     }
+
+    playTrack(guildId, voiceChannel, trackToPlay);
 }
 
 function playTrack(guildId, voiceChannel, track) {
@@ -120,4 +124,8 @@ function skipTrack(guildId, voiceChannel) {
     }
 }
 
-module.exports = { addToQueue, getQueue, getCurrentTrack, playNextInQueue, skipTrack, toggleRepeat };
+function clearQueue(guildId) {
+    queueMap.set(guildId, []);
+}
+
+module.exports = { addToQueue, getQueue, getCurrentTrack, playNextInQueue, skipTrack, toggleRepeat, clearQueue };