fix skip with autoplay

when there were no related songs using autoplay, skip would fail. made it completely stop the queue instead
Prevter · Aug 8, 2023 · 3ca47fb · 3ca47fb
1 parent f34a705
commit 3ca47fb
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/src/commands/music/skip.js b/src/commands/music/skip.js
@@ -31,8 +31,20 @@ module.exports = class extends Command {
             if (number > 1) {
                 await queue.jump(number);
             } else {
-                if (queue.songs.length > 1 || queue.autoplay)
+                if (queue.songs.length > 1) {
                     await queue.skip();
+                }
+                else if (queue.autoplay) {
+                    try { 
+                        await queue.skip();
+                    } 
+                    catch (e) {
+                        if (e.errorCode === 'NO_RELATED') {
+                            await queue.stop();
+                        }
+                        else throw e;
+                    }
+                }
                 else {
                     await queue.stop();
                 }
@@ -61,8 +73,20 @@ module.exports = class extends Command {
             if (number > 1) {
                 await queue.jump(number);
             } else {
-                if (queue.songs.length > 1 || queue.autoplay)
+                if (queue.songs.length > 1) {
                     await queue.skip();
+                }
+                else if (queue.autoplay) {
+                    try { 
+                        await queue.skip();
+                    } 
+                    catch (e) {
+                        if (e.errorCode === 'NO_RELATED') {
+                            await queue.stop();
+                        }
+                        else throw e;
+                    }
+                }
                 else {
                     await queue.stop();
                 }