fix: Also validate is user is in same voice channel as bot for commands

mariusbegby · Jul 27, 2023 · 311e141 · 311e141
1 parent f590558
commit 311e141
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 17 deletions.
diff --git a/src/commands/player/filters.js b/src/commands/player/filters.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions, ffmpegFilterOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const {
     SlashCommandBuilder,
@@ -31,6 +31,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueNoCurrentTrack(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/leave.js b/src/commands/player/leave.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 
@@ -34,6 +34,10 @@ module.exports = {
             });
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (!queue.deleted) {
             queue.delete();
             logger.debug(

diff --git a/src/commands/player/loop.js b/src/commands/player/loop.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions, botOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -36,6 +36,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         const loopModesFormatted = new Map([
             [0, 'disabled'],
             [1, 'track'],

diff --git a/src/commands/player/nowplaying.js b/src/commands/player/nowplaying.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions, playerOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -24,6 +24,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueNoCurrentTrack(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/pause.js b/src/commands/player/pause.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -24,6 +24,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueNoCurrentTrack(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/play.js b/src/commands/player/play.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions, playerOptions, botOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { cannotJoinVoiceOrTalk } = require('../../utils/validation/permissionValidator');
 const { transformQuery } = require('../../utils/validation/searchQueryValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
@@ -48,15 +48,20 @@ module.exports = {
 
         return interaction.respond(response);
     },
-    execute: async ({ interaction }) => {
-        if (await notInVoiceChannel(interaction)) {
+    execute: async ({ interaction, client }) => {
+        if (await notInVoiceChannel(interaction, client)) {
             return;
         }
 
         if (await cannotJoinVoiceOrTalk(interaction)) {
             return;
         }
 
+        let queue = useQueue(interaction.guild.id);
+        if (queue && (await notInSameVoiceChannel(interaction, queue))) {
+            return;
+        }
+
         const player = useMainPlayer();
         const query = interaction.options.getString('query');
 
@@ -107,7 +112,7 @@ module.exports = {
             });
         }
 
-        let queue = useQueue(interaction.guild.id);
+        queue = useQueue(interaction.guild.id);
         let queueSize = queue?.size ?? 0;
 
         if ((searchResult.playlist && searchResult.tracks.length) > playerOptions.maxQueueSize - queueSize) {

diff --git a/src/commands/player/queue.js b/src/commands/player/queue.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions, playerOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 
@@ -19,6 +19,11 @@ module.exports = {
         }
 
         const queue = useQueue(interaction.guild.id);
+
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         const pageIndex = (interaction.options.getNumber('page') || 1) - 1;
         let queueString = '';
 

diff --git a/src/commands/player/remove.js b/src/commands/player/remove.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -31,6 +31,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         const removeTrackNumber = interaction.options.getNumber('tracknumber');
 
         if (removeTrackNumber > queue.tracks.data.length) {

diff --git a/src/commands/player/seek.js b/src/commands/player/seek.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -30,6 +30,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueNoCurrentTrack(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/shuffle.js b/src/commands/player/shuffle.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueIsEmpty } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -24,6 +24,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueIsEmpty(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/skip.js b/src/commands/player/skip.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -27,6 +27,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (await queueNoCurrentTrack(interaction, queue)) {
             return;
         }

diff --git a/src/commands/player/stop.js b/src/commands/player/stop.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 
@@ -34,6 +34,10 @@ module.exports = {
             });
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         if (!queue.deleted) {
             queue.setRepeatMode(0);
             queue.clear();

diff --git a/src/commands/player/volume.js b/src/commands/player/volume.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { notInVoiceChannel, notInSameVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
@@ -31,6 +31,10 @@ module.exports = {
             return;
         }
 
+        if (await notInSameVoiceChannel(interaction, queue)) {
+            return;
+        }
+
         const volume = interaction.options.getNumber('percentage');
 
         if (!volume && volume !== 0) {

diff --git a/src/utils/validation/voiceChannelValidator.js b/src/utils/validation/voiceChannelValidator.js
@@ -8,7 +8,7 @@ exports.notInVoiceChannel = async (interaction) => {
             embeds: [
                 new EmbedBuilder()
                     .setDescription(
-                        `**${embedOptions.icons.warning} Oops!**\nYou need to be in a voice channel to use this command.`
+                        `**${embedOptions.icons.warning} Not in a voice channel**\nYou need to be in a voice channel to use this command.`
                     )
                     .setColor(embedOptions.colors.warning)
             ]
@@ -20,3 +20,26 @@ exports.notInVoiceChannel = async (interaction) => {
 
     return false;
 };
+
+exports.notInSameVoiceChannel = async (interaction, queue) => {
+    if (!queue.dispatcher) {
+        return true;
+    }
+
+    if (interaction.member.voice.channel.id !== queue.dispatcher.channel.id) {
+        await interaction.editReply({
+            embeds: [
+                new EmbedBuilder()
+                    .setDescription(
+                        `**${embedOptions.icons.warning} Not in same voice channel**\nYou need to be in the same voice channel as me to use this command.\n\n**Voice channel:** ${queue.dispatcher.channel.name}`
+                    )
+                    .setColor(embedOptions.colors.warning)
+            ]
+        });
+
+        logger.debug(`User tried to use command ${interaction.commandName} but was not in the same voice channel.`);
+        return true;
+    }
+
+    return false;
+};