Fix volume display and load type in music commands

appujet · Dec 26, 2023 · a65fdc6 · a65fdc6
1 parent 3e64d45
commit a65fdc6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/src/commands/music/Volume.ts b/src/commands/music/Volume.ts
@@ -68,7 +68,7 @@ export default class Volume extends Command {
             embeds: [
                 embed
                     .setColor(this.client.color.main)
-                    .setDescription(`Set the volume to ${(player.volume).toFixed()}`),
+                    .setDescription(`Set the volume to ${player.player.volume}`),
             ],
         });
     }

diff --git a/src/events/client/SetupButtons.ts b/src/events/client/SetupButtons.ts
@@ -74,35 +74,35 @@ export default class SetupButtons extends Event {
         if (message) {
             switch (interaction.customId) {
                 case 'LOW_VOL_BUT': {
-                    const vol = player.volume - 10;
+                    const vol = player.player.volume - 10;
                     player.player.setGlobalVolume(vol);
                     await buttonReply(
                         interaction,
-                        `Volume set to ${vol.toFixed()}%`,
+                        `Volume set to ${vol}%`,
                         this.client.color.main
                     );
                     await message.edit({
                         embeds: [
                             embed.setFooter({
-                                text: `Volume: ${vol.toFixed()}%`,
+                                text: `Volume: ${vol}%`,
                                 iconURL: interaction.member.displayAvatarURL({}),
                             }),
                         ],
                     });
                     break;
                 }
                 case 'HIGH_VOL_BUT': {
-                    const vol2 = player.volume + 10;
+                    const vol2 = player.player.volume + 10;
                     player.player.setGlobalVolume(vol2);
                     await buttonReply(
                         interaction,
-                        `Volume set to ${vol2.toFixed()}%`,
+                        `Volume set to ${vol2}%`,
                         this.client.color.main
                     );
                     await message.edit({
                         embeds: [
                             embed.setFooter({
-                                text: `Volume: ${vol2.toFixed()}%`,
+                                text: `Volume: ${vol2}%`,
                                 iconURL: interaction.member.displayAvatarURL({}),
                             }),
                         ],

diff --git a/src/utils/SetupSystem.ts b/src/utils/SetupSystem.ts
@@ -4,6 +4,7 @@ import { ColorResolvable, EmbedBuilder, Message, TextChannel } from 'discord.js'
 import { getButtons } from './Buttons.js';
 import { Song } from '../structures/Dispatcher.js';
 import { Dispatcher, Lavamusic } from '../structures/index.js';
+import { LoadType } from 'shoukaku';
 
 function neb(embed: EmbedBuilder, player: Dispatcher, client: Lavamusic): EmbedBuilder {
     let iconUrl = client.config.icons[player.current.info.sourceName];
@@ -46,7 +47,7 @@ async function setupStart(
         try {
             let res = await client.queue.search(query);
             switch (res.loadType) {
-                case 'LOAD_FAILED':
+                case LoadType.ERROR:
                     await message.channel
                         .send({
                             embeds: [
@@ -61,7 +62,7 @@ async function setupStart(
                             }, 5000);
                         });
                     break;
-                case 'NO_MATCHES':
+                case LoadType.EMPTY:
                     await message.channel
                         .send({
                             embeds: [
@@ -76,8 +77,8 @@ async function setupStart(
                             }, 5000);
                         });
                     break;
-                case 'TRACK_LOADED':
-                    const track = player.buildTrack(res.tracks[0], message.author);
+                case LoadType.TRACK:
+                    const track = player.buildTrack(res.data[0], message.author);
 
                     if (player.queue.length > client.config.maxQueueSize) {
                         await message.channel
@@ -105,7 +106,7 @@ async function setupStart(
                                 embed
                                     .setColor(client.color.main)
                                     .setDescription(
-                                        `Added [${res.tracks[0].info.title}](${res.tracks[0].info.uri}) to the queue.`
+                                        `Added [${res.data[0].info.title}](${res.data[0].info.uri}) to the queue.`
                                     ),
                             ],
                         })
@@ -117,7 +118,7 @@ async function setupStart(
                     neb(n, player, client);
                     if (m) await m.edit({ embeds: [n] }).catch(() => { });
                     break;
-                case 'PLAYLIST_LOADED':
+                case LoadType.PLAYLIST:
                     if (res.length > client.config.maxPlaylistSize) {
                         await message.channel
                             .send({
@@ -136,7 +137,7 @@ async function setupStart(
                             });
                         return;
                     }
-                    for (const track of res.tracks) {
+                    for (const track of res.data.tracks) {
                         const pl = player.buildTrack(track, message.author);
                         if (player.queue.length > client.config.maxQueueSize) {
                             await message.channel
@@ -165,7 +166,7 @@ async function setupStart(
                                 embed
                                     .setColor(client.color.main)
                                     .setDescription(
-                                        `Added [${res.tracks.length}](${res.tracks[0].info.uri}) to the queue.`
+                                        `Added [${res.data.tracks.length}](${res.data.tracks[0].info.uri}) to the queue.`
                                     ),
                             ],
                         })
@@ -177,8 +178,8 @@ async function setupStart(
                     neb(n, player, client);
                     if (m) await m.edit({ embeds: [n] }).catch(() => { });
                     break;
-                case 'SEARCH_RESULT':
-                    const track2 = player.buildTrack(res.tracks[0], message.author);
+                case LoadType.SEARCH:
+                    const track2 = player.buildTrack(res.data[0], message.author);
                     if (player.queue.length > client.config.maxQueueSize) {
                         await message.channel
                             .send({
@@ -205,7 +206,7 @@ async function setupStart(
                                 embed
                                     .setColor(client.color.main)
                                     .setDescription(
-                                        `Added [${res.tracks[0].info.title}](${res.tracks[0].info.uri}) to the queue.`
+                                        `Added [${res.data[0].info.title}](${res.data[0].info.uri}) to the queue.`
                                     ),
                             ],
                         })