From 6496453a86549901ae82db654c952e99545a7994 Mon Sep 17 00:00:00 2001
From: HELLSNAKE <63496374+HELLSNAKES@users.noreply.github.com>
Date: Sat, 2 Oct 2021 20:43:30 +0700
Subject: [PATCH] Update Music

---
 commands/Music/autoplay.js   |  7 +++++++
 commands/Music/filter.js     |  7 +++++++
 commands/Music/loop.js       | 13 ++++++++++---
 commands/Music/nowplay.js    |  7 +++++--
 commands/Music/pause.js      | 13 ++++++++++---
 commands/Music/resume.js     | 13 ++++++++++---
 commands/Music/shuffle.js    | 13 ++++++++++---
 commands/Music/skip.js       | 13 ++++++++++---
 commands/Music/skiptotime.js | 11 +++++++----
 commands/Music/stop.js       | 13 ++++++++++---
 commands/Music/volume.js     | 23 +++++++++++++++--------
 11 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/commands/Music/autoplay.js b/commands/Music/autoplay.js
index e6b418e..ea0da68 100644
--- a/commands/Music/autoplay.js
+++ b/commands/Music/autoplay.js
@@ -11,6 +11,13 @@ module.exports = {
     run : async(client, message, args) => {
 		if(!message.member.voice.channel) 
         return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+            .setDescription("There is Nothing Playing")
+            .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
 		let mode = client.distube.toggleAutoplay(message);
 		return message.reply("Set autoplay mode to `" + (mode ? "On" : "Off") + "`");
 	}
diff --git a/commands/Music/filter.js b/commands/Music/filter.js
index dd15cf5..dd2551e 100644
--- a/commands/Music/filter.js
+++ b/commands/Music/filter.js
@@ -26,6 +26,13 @@ module.exports = {
     run: async (client, message, args) => {
         if (!message.member.voice.channel)
             return message.reply('Please join a voice channel!')
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         if (filters.includes(args[0])) {
             const filter = client.distube.setFilter(message, args[0]);
             await message.react('👌')
diff --git a/commands/Music/loop.js b/commands/Music/loop.js
index f5e8fe2..0acd1eb 100644
--- a/commands/Music/loop.js
+++ b/commands/Music/loop.js
@@ -8,9 +8,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.setRepeatMode(message, parseInt(args[0]));
         await message.react('🔁');
     }
diff --git a/commands/Music/nowplay.js b/commands/Music/nowplay.js
index b2d9369..ef75dd2 100644
--- a/commands/Music/nowplay.js
+++ b/commands/Music/nowplay.js
@@ -11,9 +11,12 @@ module.exports = {
     run: async (client, message, args) => {
         if (!message.member.voice.channel)
             return message.reply('Please join a voice channel!')
-        const queue = client.distube.getQueue(message)
+        let queue = client.distube.getQueue(message);
         if (!queue) {
-            return message.reply(`There are currently no songs`);
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
         }
         const song = queue.songs[0]
         const embed = new Discord.MessageEmbed()
diff --git a/commands/Music/pause.js b/commands/Music/pause.js
index cb92efa..77a930d 100644
--- a/commands/Music/pause.js
+++ b/commands/Music/pause.js
@@ -8,9 +8,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.pause(message)
         await message.react('⏸');
     }
diff --git a/commands/Music/resume.js b/commands/Music/resume.js
index 4a7ba96..4728b1a 100644
--- a/commands/Music/resume.js
+++ b/commands/Music/resume.js
@@ -8,9 +8,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.resume(message)
         await client.distube.pause(message)
         await client.distube.resume(message)
diff --git a/commands/Music/shuffle.js b/commands/Music/shuffle.js
index 1d4a48e..3f4d39a 100644
--- a/commands/Music/shuffle.js
+++ b/commands/Music/shuffle.js
@@ -7,9 +7,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[Harmonynos Team]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.shuffle(message)
         await message.react('🔀');
     }
diff --git a/commands/Music/skip.js b/commands/Music/skip.js
index 42ea35c..bd5537a 100644
--- a/commands/Music/skip.js
+++ b/commands/Music/skip.js
@@ -8,9 +8,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.skip(message)
         await message.react('⏭');
     }
diff --git a/commands/Music/skiptotime.js b/commands/Music/skiptotime.js
index 29a9fd3..954ff35 100644
--- a/commands/Music/skiptotime.js
+++ b/commands/Music/skiptotime.js
@@ -9,15 +9,18 @@ module.exports = {
     usage: "[command]",
     author: "[Harmonynos Team]",
     run: async (client, message, args) => {
-        if (!message.member.voice.channel) {
+        if (!message.member.voice.channel)
             return message.reply('Please join a voice channel!');
-        }
         let queue = client.distube.getQueue(message);
         if (!queue) {
-            return message.reply(`There are currently no songs`);
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
         }
         let time = parseInt(args[0]);
-        if(!time) return message.reply("Please specify a time | Time in seconds.")
+        if (!time) return message.reply("Please specify a time | Time in seconds.")
+        if (time >= queue.songs[0].duration) return message.reply(`Time <  \`${queue.songs[0].duration} seconds\``)
         client.distube.seek(message, Number(args[0] * 1000));
         await message.react('⏩');
         message.reply(`Skip time to \`${args[0]} seconds\``);
diff --git a/commands/Music/stop.js b/commands/Music/stop.js
index 0b55329..c1c8a49 100644
--- a/commands/Music/stop.js
+++ b/commands/Music/stop.js
@@ -8,9 +8,16 @@ module.exports = {
     timeout: 3000,
     usage: "[command]",
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run : async(client, message, args) => {
-        if(!message.member.voice.channel) 
-        return message.reply('Please join a voice channel!');
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!');
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         await client.distube.stop(message)
         await message.react('⏹');
     }
diff --git a/commands/Music/volume.js b/commands/Music/volume.js
index 5bedef6..264df7b 100644
--- a/commands/Music/volume.js
+++ b/commands/Music/volume.js
@@ -3,18 +3,25 @@ const progressbar = require('string-progressbar');
 
 module.exports = {
     name: "volume",
-    category : "Music",
-    aliases : ['v'],
-    description : "Change the music player's volume.",
+    category: "Music",
+    aliases: ['v'],
+    description: "Change the music player's volume.",
     timeout: 3000,
     usage: '[command]+[amount]',
     author: "[CuSO4-c3c,Hiyoriii,Hellsnakes]",
-    run: async(client, message, args) => {
-        if(!message.member.voice.channel)
-         return message.reply('Please join a voice channel!')
+    run: async (client, message, args) => {
+        if (!message.member.voice.channel)
+            return message.reply('Please join a voice channel!')
+        let queue = client.distube.getQueue(message);
+        if (!queue) {
+            const queueError = new Discord.MessageEmbed()
+                .setDescription("There is Nothing Playing")
+                .setColor("RANDOM")
+            return message.channel.send(queueError)
+        }
         let amount = parseInt(args[0]);
-        if(!amount) return message.channel.send("Please specify a volume.")
-        if(amount > 100) {
+        if (!amount) return message.channel.send("Please specify a volume.")
+        if (amount > 100) {
             message.channel.send("Please enter a valid number (between 1 and 100)")
         } else {
             client.distube.setVolume(message, amount);