Refactor other commands

Signed-off-by: TannerGabriel <gabrieltanner.code@gmail.com>
TannerGabriel · Jul 16, 2023 · 1ea4858 · 1ea4858
1 parent b05d881
commit 1ea4858
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 94 deletions.
diff --git a/commands/ban.js b/commands/ban.js
@@ -15,11 +15,11 @@ module.exports = {
     const member = interaction.options.getUser('user');
 
     if (!member) {
-      return message.reply('You need to mention the member you want to ban him');
+      return interaction.reply('You need to mention the member you want to ban him');
     }
 
     if (!interaction.member.permissions.has('BAN_MEMBERS')) {
-      return message.reply("I can't ban this user.");
+      return interaction.reply("I can't ban this user.");
     }
 
     const userinfo = client.users.cache.getMember(member);

diff --git a/commands/loop.js b/commands/loop.js
@@ -1,5 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType} = require('discord.js');
-const {QueueRepeatMode} = require('discord-player');
+const {QueueRepeatMode, useQueue} = require('discord-player');
 
 module.exports = {
   name: 'loop',
@@ -51,17 +51,17 @@ module.exports = {
 
       await interaction.deferReply();
 
-      const queue = player.getQueue(interaction.guildId);
-      if (!queue || !queue.playing) {
+      const queue = useQueue(interaction.guild.id)
+      if (!queue || !queue.currentTrack) {
         return void interaction.followUp({content: '❌ | No music is being played!'});
       }
 
       const loopMode = interaction.options.getInteger('mode');
-      const success = queue.setRepeatMode(loopMode);
+      queue.setRepeatMode(loopMode);
       const mode = loopMode === QueueRepeatMode.TRACK ? '🔂' : loopMode === QueueRepeatMode.QUEUE ? '🔁' : '▶';
 
       return void interaction.followUp({
-        content: success ? `${mode} | Updated loop mode!` : '❌ | Could not update loop mode!',
+        content: `${mode} | Updated loop mode!`,
       });
     } catch (error) {
       console.log(error);

diff --git a/commands/move.js b/commands/move.js
@@ -1,4 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType } = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
   name: 'move',
@@ -36,15 +37,15 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing) return void interaction.followUp({content: '❌ | No music is being played!'});
+    const queue = useQueue(interaction.guild.id)
+    if (!queue || !queue.currentTrack) return void interaction.followUp({content: '❌ | No music is being played!'});
     const queueNumbers = [interaction.options.getInteger('track') - 1, interaction.options.getInteger('position') - 1];
-    if (queueNumbers[0] > queue.tracks.length || queueNumbers[1] > queue.tracks.length)
+    if (queueNumbers[0] > queue.tracks.size || queueNumbers[1] > queue.tracks.size)
       return void interaction.followUp({content: '❌ | Track number greater than queue depth!'});
 
     try {
-      const track = queue.remove(queueNumbers[0]);
-      queue.insert(track, queueNumbers[1]);
+      const track = queue.node.remove(queueNumbers[0]);
+      queue.node.insert(track, queueNumbers[1]);
       return void interaction.followUp({
         content: `✅ | Moved **${track}**!`,
       });

diff --git a/commands/nowplaying.js b/commands/nowplaying.js
@@ -1,4 +1,5 @@
 const {GuildMember} = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
   name: 'nowplaying',
@@ -22,19 +23,19 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing)
+    const queue = useQueue(interaction.guild.id)
+    if (!queue || !queue.currentTrack)
       return void interaction.followUp({
         content: '❌ | No music is being played!',
       });
-    const progress = queue.createProgressBar();
-    const perc = queue.getPlayerTimestamp();
+    const progress = queue.node.createProgressBar()
+    const perc = queue.node.getTimestamp();
 
     return void interaction.followUp({
       embeds: [
         {
           title: 'Now Playing',
-          description: `🎶 | **${queue.current.title}**! (\`${perc.progress}%\`)`,
+          description: `🎶 | **${queue.currentTrack.title}**! (\`${perc.progress}%\`)`,
           fields: [
             {
               name: '\u200b',

diff --git a/commands/play.js b/commands/play.js
@@ -14,8 +14,6 @@ module.exports = {
   ],
   async execute(interaction) {
     try {
-      const channel = interaction.member.voice.channel;
-
       const player = useMainPlayer()
 
       if (!(interaction.member instanceof GuildMember) || !interaction.member.voice.channel) {
@@ -63,44 +61,9 @@ module.exports = {
                 content: `⏱ | Loading your ${searchResult.playlist ? 'playlist' : 'track'}...`,
             });
 		} catch (error) {
-			//await interaction.editReply({ content: `${this.container.client.dev.error} | An **error** has occurred` });
+            // TODO: Return error via interaction
 			return console.log(error);
 		}
-
-      /*const queue = player?.queues.create(interaction.guild.id, {
-        metadata: {
-          channel: interaction.channel,
-          client: interaction.guild?.members.me
-        },
-        leaveOnEmptyCooldown: 300000,
-        leaveOnEmpty: true,
-        leaveOnEnd: false,
-        bufferingTimeout: 0,
-        volume: 10,
-        defaultFFmpegFilters: ['lofi', 'bassboost', 'normalizer'],
-        ytdlOptions: {
-          quality: "highest",
-          filter: "audioonly",
-          highWaterMark: 1 << 30,
-          dlChunkSize: 0,
-        },
-      });*/
-
-
-      /*try {
-        if (!queue.connection) await queue.connect(interaction.member.voice.channel);
-      } catch {
-        queue.delete();
-        return void interaction.followUp({
-          content: 'Could not join your voice channel!',
-        });
-      }
-
-      await interaction.followUp({
-        content: `⏱ | Loading your ${searchResult.playlist ? 'playlist' : 'track'}...`,
-      });
-      searchResult.playlist ? queue.addTrack(searchResult.tracks) : queue.addTrack(searchResult.tracks[0]);
-      if (!queue.playing) await queue.node.play();*/
     } catch (error) {
       await interaction.followUp({
         content: 'There was an error trying to execute that command: ' + error.message,

diff --git a/commands/playtop.js b/commands/playtop.js
@@ -1,5 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType} = require('discord.js');
-const {QueryType} = require('discord-player');
+const {QueryType, useQueue} = require('discord-player');
 
 module.exports = {
   name: 'playtop',
@@ -43,20 +43,11 @@ module.exports = {
       if (!searchResult || !searchResult.tracks.length)
         return void interaction.followUp({content: 'No results were found!'});
 
-      const queue = await player.createQueue(interaction.guild, {
-        ytdlOptions: {
-        quality: "highest",
-        filter: "audioonly",
-        highWaterMark: 1 << 25,
-        dlChunkSize: 0,
-      },
-        metadata: interaction.channel,
-      });
+      const queue = useQueue(interaction.guild.id)
 
       try {
         if (!queue.connection) await queue.connect(interaction.member.voice.channel);
       } catch {
-        void player.deleteQueue(interaction.guildId);
         return void interaction.followUp({
           content: 'Could not join your voice channel!',
         });
@@ -65,8 +56,8 @@ module.exports = {
       await interaction.followUp({
         content: `⏱ | Loading your ${searchResult.playlist ? 'playlist' : 'track'}...`,
       });
-      searchResult.playlist ? queue.insert(searchResult.tracks, 0) : queue.insert(searchResult.tracks[0], 0);
-      if (!queue.playing) await queue.play();
+      searchResult.playlist ? queue.node.insert(searchResult.tracks, 0) : queue.node.insert(searchResult.tracks[0], 0);
+      if (!queue.currentTrack) await player.play();
     } catch (error) {
       console.log(error);
       interaction.followUp({

diff --git a/commands/queue.js b/commands/queue.js
@@ -1,12 +1,10 @@
 const {GuildMember} = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
-
     name: 'queue',
     description: 'View the queue of current songs!',
-
     async execute (interaction, player) {
-
         if (!(interaction.member instanceof GuildMember) || !interaction.member.voice.channel) {
             return void interaction.reply({
               content: 'You are not in a voice channel!',
@@ -23,14 +21,14 @@ module.exports = {
               ephemeral: true,
             });
           }
-          var queue = player.getQueue(interaction.guildId);
+          const queue = useQueue(interaction.guild.id)
           if (typeof(queue) != 'undefined') {
-            trimString = (str, max) => ((str.length > max) ? `${str.slice(0, max - 3)}...` : str);
+            const trimString = (str, max) => ((str.length > max) ? `${str.slice(0, max - 3)}...` : str);
               return void interaction.reply({
                 embeds: [
                   {
                     title: 'Now Playing',
-                    description: trimString(`The Current song playing is 🎶 | **${queue.current.title}**! \n 🎶 | ${queue}! `, 4095),
+                    description: trimString(`The Current song playing is 🎶 | **${queue.currentTrack.title}**! \n 🎶 | ${queue}! `, 4095),
                   }
                 ]
               })

diff --git a/commands/remove.js b/commands/remove.js
@@ -1,4 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType } = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
   name: 'remove',
@@ -30,12 +31,12 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing) return void interaction.followUp({content: '❌ | No music is being played!'});
+    const queue = useQueue(interaction.guild.id);
+    if (!queue || !queue.currentTrack) return void interaction.followUp({content: '❌ | No music is being played!'});
     const number = interaction.options.getInteger('number') - 1;
-    if (number > queue.tracks.length)
+    if (number > queue.tracks.size)
       return void interaction.followUp({content: '❌ | Track number greater than queue depth!'});
-    const removedTrack = queue.remove(number);
+    const removedTrack = queue.node.remove(number);
     return void interaction.followUp({
       content: removedTrack ? `✅ | Removed **${removedTrack}**!` : '❌ | Something went wrong!',
     });

diff --git a/commands/shuffle.js b/commands/shuffle.js
@@ -1,4 +1,5 @@
 const {GuildMember} = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
   name: 'shuffle',
@@ -22,17 +23,17 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing) return void interaction.followUp({content: '❌ | No music is being played!'});
+    const queue = useQueue(interaction.guild.id)
+    if (!queue || !queue.currentTrack) return void interaction.followUp({content: '❌ | No music is being played!'});
     try {
-      queue.shuffle();
-      trimString = (str, max) => (str.length > max ? `${str.slice(0, max - 3)}...` : str);
+      queue.tracks.shuffle();
+      const trimString = (str, max) => (str.length > max ? `${str.slice(0, max - 3)}...` : str);
       return void interaction.followUp({
         embeds: [
           {
             title: 'Now Playing',
             description: trimString(
-              `The Current song playing is 🎶 | **${queue.current.title}**! \n 🎶 | ${queue}! `,
+              `The Current song playing is 🎶 | **${queue.currentTrack.title}**! \n 🎶 | ${queue}! `,
               4095,
             ),
           },

diff --git a/commands/swap.js b/commands/swap.js
@@ -1,4 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType } = require('discord.js');
+const {useQueue} = require("discord-player");
 
 module.exports = {
   name: 'swap',
@@ -36,21 +37,21 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing) return void interaction.followUp({content: '❌ | No music is being played!'});
+    const queue = useQueue(interaction.guild.id);
+    if (!queue || !queue.currentTrack) return void interaction.followUp({content: '❌ | No music is being played!'});
     const queueNumbers = [interaction.options.getInteger('track1') - 1, interaction.options.getInteger('track2') - 1];
     // Sort so the lowest number is first for swap logic to work
     queueNumbers.sort(function (a, b) {
       return a - b;
     });
-    if (queueNumbers[1] > queue.tracks.length)
+    if (queueNumbers[1] > queue.getSize())
       return void interaction.followUp({content: '❌ | Track number greater than queue depth!'});
 
     try {
-      const track2 = queue.remove(queueNumbers[1]); // Remove higher track first to avoid list order issues
-      const track1 = queue.remove(queueNumbers[0]);
-      queue.insert(track2, queueNumbers[0]); // Add track in lowest position first to avoid list order issues
-      queue.insert(track1, queueNumbers[1]);
+      const track2 = queue.node.remove(queueNumbers[1]); // Remove higher track first to avoid list order issues
+      const track1 = queue.node.remove(queueNumbers[0]);
+      queue.node.insert(track2, queueNumbers[0]); // Add track in lowest position first to avoid list order issues
+      queue.node.insert(track1, queueNumbers[1]);
       return void interaction.followUp({
         content: `✅ | Swapped **${track1}** & **${track2}**!`,
       });

diff --git a/commands/volume.js b/commands/volume.js
@@ -1,4 +1,5 @@
 const {GuildMember, ApplicationCommandOptionType } = require('discord.js');
+const { useQueue} = require("discord-player");
 
 module.exports = {
   name: 'volume',
@@ -30,16 +31,16 @@ module.exports = {
     }
 
     await interaction.deferReply();
-    const queue = player.getQueue(interaction.guildId);
-    if (!queue || !queue.playing)
+    const queue = useQueue(interaction.guild.id);
+    if (!queue || !queue.currentTrack)
       return void interaction.followUp({
         content: '❌ | No music is being played!',
       });
 
-    var volume = interaction.options.getInteger('volume');
+    let volume = interaction.options.getInteger('volume');
     volume = Math.max(0, volume);
     volume = Math.min(200, volume);
-    const success = queue.setVolume(volume);
+    const success = queue.node.setVolume(volume);
 
     return void interaction.followUp({
       content: success ? `🔊 | Volume set to ${volume}!` : '❌ | Something went wrong!',