[Fix] fixed a bug with the disconnect command where users were able t…

…o disconnect the bot if not connected to a voice channel
naseif · Oct 5, 2021 · a47a8b7 · a47a8b7
1 parent 4a57192
commit a47a8b7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/commands/Music/disconnect.js b/commands/Music/disconnect.js
@@ -18,6 +18,16 @@ module.exports = {
       });
     }
 
+    if (
+      message.guild.me.voice.channelId &&
+      message.member.voice.channelId !== message.guild.me.voice.channelId
+    )
+      return await message.channel.send({
+        embeds: [
+          embedMessage("#9dcc37", `❌ | You must be in my voice channel to disconnect me!`),
+        ],
+      });
+
     try {
       if (queue) {
         await queue.connection.disconnect();
@@ -58,6 +68,17 @@ module.exports = {
       });
     }
 
+    if (
+      interaction.guild.me.voice.channelId &&
+      interaction.member.voice.channelId !== interaction.guild.me.voice.channelId
+    )
+      return await interaction.followUp({
+        embeds: [
+          embedMessage("#9dcc37", `❌ | You must be in my voice channel to disconnect me!`),
+        ],
+      });
+
+
     try {
       if (queue) {
         await queue.destroy(true);

diff --git a/commands/Music/play.js b/commands/Music/play.js
@@ -10,8 +10,10 @@ module.exports = {
   usage: "p <YouTube URL | Song Name | Spotify URL | Soundcloud URL |>",
   async run(message, args, client, prefix) {
     const songString = args.join(" ");
+
     if (!songString)
-      return message.channel.send({embeds: [embedMessage("#9dcc37", `❌ | ${message.member.toString()}, You have to provide a song name or URL`)]});
+      return await message.channel.send({embeds: [embedMessage("#9dcc37", `❌ | ${message.member.toString()}, You have to provide a song name or URL`)]});
+
     if (!message.member.voice.channelId)
       return message.channel.send({
         embeds: [
@@ -26,7 +28,7 @@ module.exports = {
       message.guild.me.voice.channelId &&
       message.member.voice.channelId !== message.guild.me.voice.channelId
     )
-      return message.channel.send({
+      return await message.channel.send({
         embeds: [
           embedMessage("#9dcc37", `❌ | You must be in my voice channel!`),
         ],