From 95870931e77a26a8d50ff3630bf387c923e61a2d Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@protonmail.com>
Date: Mon, 28 Mar 2022 16:05:12 -0400
Subject: Fixed the leave button

---
 commands/control.js | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'commands/control.js')

diff --git a/commands/control.js b/commands/control.js
index 42c168a..50a78e7 100644
--- a/commands/control.js
+++ b/commands/control.js
@@ -20,12 +20,8 @@
  ***************************************************************************/
 
 import { SlashCommandBuilder } from '@discordjs/builders'
-import { getVoiceConnection } from "@discordjs/voice";
 import { MessageEmbed, MessageActionRow, MessageButton } from 'discord.js'
-import { audio, player, playAudio } from '../AudioBackend.js'
-import fs from 'fs'
-
-let fileData;
+import { audio, player, playAudio, destroyAudio } from '../AudioBackend.js'
 
 export default {
     data: new SlashCommandBuilder()
@@ -61,32 +57,24 @@ export default {
 
         const collector = interaction.channel.createMessageComponentCollector();
 
-        collector.on('collect', async i => {
-            if (i.customId === 'play') {
+        collector.on('collect', async ctlButton => {
+            if (ctlButton.customId === 'play') {
                 player.unpause();
-                await i.reply({content:'Resuming music', ephemeral:true})
+                await ctlButton.reply({content:'Resuming music', ephemeral:true})
             }
-            if (i.customId === 'pause') {
+            if (ctlButton.customId === 'pause') {
                 player.pause();
-                await i.reply({content:'Pausing music', ephemeral:true})
+                await ctlButton.reply({content:'Pausing music', ephemeral:true})
             }
-            if (i.customId === 'skip') {
+            if (ctlButton.customId === 'skip') {
                 player.pause();
-                await i.reply({content:`Skipping \`${audio}\`...`, ephemeral:true})
+                await ctlButton.reply({content:`Skipping \`${audio}\`...`, ephemeral:true})
                 playAudio(bot);
             }
-            if (i.customId === 'leave') {
-                await i.reply({content:'Leaving voice channel.', ephemeral:true})
+            if (ctlButton.customId === 'leave') {
+                await ctlButton.reply({content:'Leaving voice channel.', ephemeral:true})
                 console.log('Leaving voice channel...');
-                fileData = "Now Playing: Nothing";
-                fs.writeFile("now-playing.txt", fileData, (err) => {
-                    if (err)
-                        console.log(err);
-                });
-                audio = "Not Playing";
-                player.stop();
-                const connection = getVoiceConnection(interaction.guild.id);
-                connection.destroy();
+                destroyAudio(interaction);
             }
         });
 
-- 
cgit v1.2.3