fix: remove Promise.resolve() return and fix queue type

mariusbegby · Aug 29, 2023 · 67e4572 · 67e4572
1 parent d5cc5b8
commit 67e4572
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 117 deletions.
diff --git a/src/handlers/interactionCommandHandler.ts b/src/handlers/interactionCommandHandler.ts
@@ -24,7 +24,7 @@ export const handleCommand = async (
     }
 
     if (await cannotSendMessageInChannel({ interaction, executionId })) {
-        return Promise.resolve();
+        return;
     }
 
     logger.debug('Executing command interaction.');

diff --git a/src/interactions/commands/info/status.ts b/src/interactions/commands/info/status.ts
@@ -39,37 +39,28 @@ const command: CustomSlashCommandInteraction = {
         let totalTracks: number = 0;
         let totalListeners: number = 0;
 
-        await client!.shard!
-            .broadcastEval(() => {
+        await client!
+            .shard!.broadcastEval(() => {
                 /* eslint-disable no-undef */
                 return player.generateStatistics();
             })
             .then((results) => {
-                const queueCountList: number[] = [];
-                const trackCountList: number[] = [];
-                const listenerCountList: number[] = [];
                 results.map((result) => {
-                    queueCountList.push(result.queues.length);
-                    if (result.queues.length > 0) {
-                        result.queues.map((queue) => {
-                            trackCountList.push(queue.status.playing ? queue.tracksCount + 1 : queue.tracksCount);
-                            listenerCountList.push(queue.listeners);
-                        });
-                    }
+                    activeVoiceConnections += result.queues.length;
+                    result.queues.map((queue) => {
+                        totalTracks += queue.status.playing ? queue.tracksCount + 1 : queue.tracksCount;
+                        totalListeners += queue.listeners;
+                    });
                 });
 
-                activeVoiceConnections = queueCountList.reduce((acc, queueAmount) => acc + queueAmount, 0);
-                totalTracks = trackCountList.reduce((acc, trackAmount) => acc + trackAmount, 0);
-                totalListeners = listenerCountList.reduce((acc, listenerAmount) => acc + listenerAmount, 0);
-
                 logger.debug('Successfully fetched player statistics from shards.');
             })
             .catch((error) => {
                 logger.error(error, 'Failed to fetch player statistics from shards.');
             });
 
-        await client!.shard!
-            .fetchClientValues('guilds.cache')
+        await client!
+            .shard!.fetchClientValues('guilds.cache')
             .then((results) => {
                 const guildCaches = results as Guild[][];
                 guildCaches.map((guildCache: Guild[]) => {

diff --git a/src/interactions/commands/player/filters.ts b/src/interactions/commands/player/filters.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, QueueFilters, useQueue } from 'discord-player';
+import { GuildQueue, QueueFilters, useQueue } from 'discord-player';
 import {
     APIActionRowComponent,
     APIMessageActionRowComponent,
@@ -40,21 +40,21 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await queueDoesNotExist({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await queueNoCurrentTrack({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const filterOptions: StringSelectMenuOptionBuilder[] = [];

diff --git a/src/interactions/commands/player/leave.ts b/src/interactions/commands/player/leave.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, useQueue } from 'discord-player';
+import { GuildQueue, useQueue } from 'discord-player';
 import { EmbedBuilder, GuildMember, SlashCommandBuilder } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -28,10 +28,10 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (!queue) {
             logger.debug('There is already no queue.');
@@ -49,7 +49,7 @@ const command: CustomSlashCommandInteraction = {
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (!queue.deleted) {

diff --git a/src/interactions/commands/player/loop.ts b/src/interactions/commands/player/loop.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, useQueue } from 'discord-player';
+import { GuildQueue, useQueue } from 'discord-player';
 import { EmbedBuilder, GuildMember, SlashCommandBuilder, SlashCommandStringOption } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -42,17 +42,17 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await queueDoesNotExist({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const loopModesFormatted = new Map([
@@ -132,6 +132,7 @@ const command: CustomSlashCommandInteraction = {
         if (queue.repeatMode === 0) {
             logger.debug('Disabled loop mode.');
 
+            // TODO: Different text when disabling autoplay.
             logger.debug('Responding with success embed.');
             return await interaction.editReply({
                 embeds: [

diff --git a/src/interactions/commands/player/lyrics.ts b/src/interactions/commands/player/lyrics.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, QueryType, useMainPlayer, useQueue } from 'discord-player';
+import { GuildQueue, QueryType, useMainPlayer, useQueue } from 'discord-player';
 import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 
 import { lyricsExtractor } from '@discord-player/extractor';
@@ -43,24 +43,24 @@ const command: CustomSlashCommandInteraction = {
         });
 
         const query = interaction.options.getString('query');
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
         let geniusSearchQuery = '';
 
         if (!query) {
             if (await notInVoiceChannel({ interaction, executionId })) {
-                return Promise.resolve();
+                return;
             }
 
             if (await queueDoesNotExist({ interaction, queue, executionId })) {
-                return Promise.resolve();
+                return;
             }
 
             if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-                return Promise.resolve();
+                return;
             }
 
             if (await queueNoCurrentTrack({ interaction, queue, executionId })) {
-                return Promise.resolve();
+                return;
             }
             geniusSearchQuery = queue.currentTrack!.title.slice(0, 50);
 
@@ -188,7 +188,7 @@ const command: CustomSlashCommandInteraction = {
                 }
             }
 
-            return Promise.resolve();
+            return;
         }
 
         logger.debug('Responding with info embed.');

diff --git a/src/interactions/commands/player/nowplaying.ts b/src/interactions/commands/player/nowplaying.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, Track, useQueue } from 'discord-player';
+import { GuildQueue, Track, useQueue } from 'discord-player';
 import {
     APIActionRowComponent,
     APIMessageActionRowComponent,
@@ -38,21 +38,21 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await queueDoesNotExist({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await queueNoCurrentTrack({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const sourceStringsFormatted = new Map([

diff --git a/src/interactions/commands/player/pause.ts b/src/interactions/commands/player/pause.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, useQueue } from 'discord-player';
+import { GuildQueue, useQueue } from 'discord-player';
 import { EmbedBuilder, GuildMember, SlashCommandBuilder } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -29,21 +29,21 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await queueDoesNotExist({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await queueNoCurrentTrack({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const currentTrack = queue.currentTrack!;

diff --git a/src/interactions/commands/player/play.ts b/src/interactions/commands/player/play.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { useMainPlayer, useQueue } from 'discord-player';
+import { GuildQueue, useMainPlayer, useQueue } from 'discord-player';
 import { EmbedBuilder, GuildMember, SlashCommandBuilder } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -43,17 +43,18 @@ const command: CustomSlashCommandInteraction = {
             guildId: interaction.guild?.id
         });
 
+
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await cannotJoinVoiceOrTalk({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        let queue = useQueue(interaction.guild!.id);
+        let queue: GuildQueue = useQueue(interaction.guild!.id)!;
         if (queue && (await notInSameVoiceChannel({ interaction, queue, executionId }))) {
-            return Promise.resolve();
+            return;
         }
 
         const player = useMainPlayer()!;
@@ -86,7 +87,7 @@ const command: CustomSlashCommandInteraction = {
             });
         }
 
-        queue = useQueue(interaction.guild!.id);
+        queue = useQueue(interaction.guild!.id)!;
         const queueSize = queue?.size ?? 0;
 
         if ((searchResult.playlist! && searchResult.tracks.length) > playerOptions.maxQueueSize - queueSize) {
@@ -211,7 +212,7 @@ const command: CustomSlashCommandInteraction = {
 
         logger.debug(`Successfully added track with player.play(). Query: '${query}'.`);
 
-        queue = useQueue(interaction.guild!.id);
+        queue = useQueue(interaction.guild!.id)!;
 
         if (!queue || !track) {
             logger.warn(`After player.play(), queue is undefined. Query: '${query}'.`);

diff --git a/src/interactions/commands/player/queue.ts b/src/interactions/commands/player/queue.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, useQueue } from 'discord-player';
+import { GuildQueue, useQueue } from 'discord-player';
 import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -30,13 +30,13 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const pageIndex = (interaction.options.getNumber('page') || 1) - 1;

diff --git a/src/interactions/commands/player/seek.ts b/src/interactions/commands/player/seek.ts
@@ -1,5 +1,5 @@
 import config from 'config';
-import { NodeResolvable, useQueue } from 'discord-player';
+import { GuildQueue, useQueue } from 'discord-player';
 import { EmbedBuilder, GuildMember, SlashCommandBuilder } from 'discord.js';
 
 import loggerModule from '../../../services/logger';
@@ -35,21 +35,21 @@ const command: CustomSlashCommandInteraction = {
         });
 
         if (await notInVoiceChannel({ interaction, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
-        const queue: NodeResolvable = useQueue(interaction.guild!.id)!;
+        const queue: GuildQueue = useQueue(interaction.guild!.id)!;
 
         if (await queueDoesNotExist({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await notInSameVoiceChannel({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         if (await queueNoCurrentTrack({ interaction, queue, executionId })) {
-            return Promise.resolve();
+            return;
         }
 
         const durationInput = interaction.options.getString('duration');