feat: Renamed validator files and added permission validator

mariusbegby · Jul 23, 2023 · b68b7da · b68b7da
1 parent f04937e
commit b68b7da
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 22 deletions.
diff --git a/src/commands/player/filters.js b/src/commands/player/filters.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions, ffmpegFilterOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const {
     SlashCommandBuilder,
     EmbedBuilder,

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/voiceChannelValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/loop.js b/src/commands/player/loop.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions, botOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/nowplaying.js b/src/commands/player/nowplaying.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions, playerOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/pause.js b/src/commands/player/pause.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/play.js b/src/commands/player/play.js
@@ -1,7 +1,8 @@
 const logger = require('../../services/logger');
 const { embedOptions, playerOptions, botOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { transformQuery } = require('../../utils/validation/searchQueryValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { cannotJoinVoiceOrTalk } = require('../../utils/validation/permissionValidator');
+const { transformQuery } = require('../../utils/validation/searchQueryValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useMainPlayer, useQueue } = require('discord-player');
 
@@ -16,6 +17,10 @@ module.exports = {
             return;
         }
 
+        if (await cannotJoinVoiceOrTalk(interaction)) {
+            return;
+        }
+
         const player = useMainPlayer();
         const query = interaction.options.getString('query');
 

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/voiceChannelValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/remove.js b/src/commands/player/remove.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/seek.js b/src/commands/player/seek.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/skip.js b/src/commands/player/skip.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist, queueNoCurrentTrack } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/player/volume.js b/src/commands/player/volume.js
@@ -1,7 +1,7 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidation');
-const { queueDoesNotExist } = require('../../utils/validation/queueValidation');
+const { notInVoiceChannel } = require('../../utils/validation/voiceChannelValidator');
+const { queueDoesNotExist } = require('../../utils/validation/queueValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const { useQueue } = require('discord-player');
 

diff --git a/src/commands/system/guilds.js b/src/commands/system/guilds.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notValidGuildId } = require('../../utils/validation/systemCommandValidation');
+const { notValidGuildId } = require('../../utils/validation/systemCommandValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 
 module.exports = {

diff --git a/src/commands/system/status.js b/src/commands/system/status.js
@@ -1,6 +1,6 @@
 const logger = require('../../services/logger');
 const { embedOptions } = require('../../config');
-const { notValidGuildId } = require('../../utils/validation/systemCommandValidation');
+const { notValidGuildId } = require('../../utils/validation/systemCommandValidator');
 const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
 const osu = require('node-os-utils');
 const { version, dependencies } = require('../../../package.json');

diff --git a/src/utils/validation/permissionValidator.js b/src/utils/validation/permissionValidator.js
@@ -0,0 +1,24 @@
+const logger = require('../../services/logger');
+const { embedOptions } = require('../../config');
+const { EmbedBuilder } = require('discord.js');
+
+exports.cannotJoinVoiceOrTalk = async (interaction) => {
+    const channel = interaction.member.voice.channel;
+
+    if (!channel.joinable || !channel.speakable) {
+        await interaction.editReply({
+            embeds: [
+                new EmbedBuilder()
+                    .setDescription(
+                        `**${embedOptions.icons.warning} Oops!**\nI do not have permission to play audio in the voice channel you are in.\n\nPlease make sure I have the **Connect** and **Speak** permissions in this voice channel.`
+                    )
+                    .setColor(embedOptions.colors.warning)
+            ]
+        });
+
+        logger.debug(`User tried to use command ${interaction.commandName} but was not in a voice channel.`);
+        return true;
+    }
+
+    return false;
+};
diff --git a/src/utils/validation/queueValidation.js → src/utils/validation/queueValidator.js b/src/utils/validation/queueValidation.js → src/utils/validation/queueValidator.js
diff --git a/...utils/validation/searchQueryValidation.js → src/utils/validation/searchQueryValidator.js b/...utils/validation/searchQueryValidation.js → src/utils/validation/searchQueryValidator.js
diff --git a/...ils/validation/systemCommandValidation.js → ...tils/validation/systemCommandValidator.js b/...ils/validation/systemCommandValidation.js → ...tils/validation/systemCommandValidator.js
diff --git a/...tils/validation/voiceChannelValidation.js → ...utils/validation/voiceChannelValidator.js b/...tils/validation/voiceChannelValidation.js → ...utils/validation/voiceChannelValidator.js