Merge pull request #17 from Alee14/testing

Merging testing branch

1 files changed, 10 insertions, 4 deletions

diff --git a/Commands/join.js b/Commands/join.js
index 2649784..dd49969 100644
--- a/Commands/join.js
+++ b/Commands/join.js
@@ -23,17 +23,23 @@ import { SlashCommandBuilder } from 'discord.js';
 import { voiceInit } from '../AudioBackend/VoiceInitialization.js';
 import { PermissionFlagsBits } from 'discord-api-types/v10';
 import { readFileSync } from 'node:fs';
+import { getVoiceConnection } from '@discordjs/voice';
+import i18next from '../Utilities/i18n.js';
 const { djRole, ownerID } = JSON.parse(readFileSync('./config.json', 'utf-8'));
-
+const t = i18next.t;
 export default {
   data: new SlashCommandBuilder()
     .setName('join')
     .setDescription('Joins voice chat'),
   async execute(interaction, bot) {
-    if (!interaction.member.voice.channel) return await interaction.reply({ content: 'You need to be in a voice channel to use this command.', ephemeral: true });
-    if (!interaction.member.roles.cache.has(djRole) && interaction.user.id !== ownerID && !interaction.member.permission.has(PermissionFlagsBits.ManageGuild)) return interaction.reply({ content: 'You need a specific role to execute this command', ephemeral: true });
+    if (!interaction.member.voice.channel) return await interaction.reply({ content: t('voicePermission'), ephemeral: true });
+    if (!interaction.member.roles.cache.has(djRole) && interaction.user.id !== ownerID && !interaction.memberPermissions.has(PermissionFlagsBits.ManageGuild)) return interaction.reply({ content: t('rolePermission'), ephemeral: true });
 
-    await interaction.reply({ content: 'Joining voice channel', ephemeral: true });
+    const connection = getVoiceConnection(interaction.guild.id);
+    if (connection) {
+      return await interaction.reply({ content: t('alreadyJoin'), ephemeral: true });
+    }
+    await interaction.reply({ content: t('joinVoice'), ephemeral: true });
     return await voiceInit(bot);
   }
 };