From e5c86859e4c6a9a6829bcc2e3cf626b05a873ff7 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Tue, 20 Dec 2022 17:54:56 -0500 Subject: Revamped next/previous cmds (Voting system); Basic i18n support; --- Commands/next.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Commands/next.js') diff --git a/Commands/next.js b/Commands/next.js index d3240cf..f082c89 100644 --- a/Commands/next.js +++ b/Commands/next.js @@ -20,23 +20,21 @@ ***************************************************************************/ import { SlashCommandBuilder } from 'discord.js'; -import { player } from '../AudioBackend/VoiceInitialization.js'; -import { nextAudio, playerState } from '../AudioBackend/AudioControl.js'; -import { PermissionFlagsBits } from 'discord-api-types/v10'; +import { voteSkip } from '../Utilities/Voting.js'; export default { data: new SlashCommandBuilder() .setName('next') .setDescription('Goes to next music') - .setDefaultMemberPermissions(PermissionFlagsBits.Administrator), + .addSubcommand(subcommand => + subcommand.setName('vote') + .setDescription('Voting to skip this audio track')) + .addSubcommand(subcommand => + subcommand.setName('force') + .setDescription('Forces skip this audio track')), + 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 (playerState === 'Playing' || playerState === 'Paused') { - await interaction.reply({ content: 'Playing next music', ephemeral: true }); - player.stop(); - return await nextAudio(bot); - } else if (playerState === 'Stopped') { - return await interaction.reply({ content: 'Cannot play next music. Player is currently stopped...', ephemeral: true }); - } + await voteSkip(interaction, bot); } }; -- cgit v1.2.3