fix command permission handling and push discord to v10 (#640)

Co-authored-by: Max Isom <[email protected]>

4 files changed, 13 insertions, 8 deletions

diff --git a/src/services/add-query-to-queue.ts b/src/services/add-query-to-queue.ts
index 7980ca0..15192b4 100644
--- a/src/services/add-query-to-queue.ts
+++ b/src/services/add-query-to-queue.ts
@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import {CommandInteraction, GuildMember} from 'discord.js';
+import {ChatInputCommandInteraction, GuildMember} from 'discord.js';
 import {inject, injectable} from 'inversify';
 import shuffle from 'array-shuffle';
 import {TYPES} from '../types.js';
@@ -12,7 +12,8 @@ import {getMemberVoiceChannel, getMostPopularVoiceChannel} from '../utils/channe
 
 @injectable()
 export default class AddQueryToQueue {
-  constructor(@inject(TYPES.Services.GetSongs) private readonly getSongs: GetSongs, @inject(TYPES.Managers.Player) private readonly playerManager: PlayerManager) {}
+  constructor(@inject(TYPES.Services.GetSongs) private readonly getSongs: GetSongs, @inject(TYPES.Managers.Player) private readonly playerManager: PlayerManager) {
+  }
 
   public async addToQueue({
     query,
@@ -25,7 +26,7 @@ export default class AddQueryToQueue {
     addToFrontOfQueue: boolean;
     shuffleAdditions: boolean;
     shouldSplitChapters: boolean;
-    interaction: CommandInteraction;
+    interaction: ChatInputCommandInteraction;
   }): Promise<void> {
     const guildId = interaction.guild!.id;
     const player = this.playerManager.get(guildId);
@@ -121,7 +122,11 @@ export default class AddQueryToQueue {
     }
 
     newSongs.forEach(song => {
-      player.add({...song, addedInChannelId: interaction.channel!.id, requestedBy: interaction.member!.user.id}, {immediate: addToFrontOfQueue ?? false});
+      player.add({
+        ...song,
+        addedInChannelId: interaction.channel!.id,
+        requestedBy: interaction.member!.user.id,
+      }, {immediate: addToFrontOfQueue ?? false});
     });
 
     const firstSong = newSongs[0];
diff --git a/src/services/config.ts b/src/services/config.ts
index 1b4f4c9..ca4fc68 100644
--- a/src/services/config.ts
+++ b/src/services/config.ts
@@ -18,7 +18,7 @@ const CONFIG_MAP = {
   CACHE_DIR: path.join(DATA_DIR, 'cache'),
   CACHE_LIMIT_IN_BYTES: xbytes.parseSize(process.env.CACHE_LIMIT ?? '2GB'),
   BOT_STATUS: process.env.BOT_STATUS ?? 'online',
-  BOT_ACTIVITY_TYPE: process.env.BOT_ACTIVITY_TYPE ?? 'LISTENING',
+  BOT_ACTIVITY_TYPE: process.env.BOT_ACTIVITY_TYPE ?? 'Listening',
   BOT_ACTIVITY_URL: process.env.BOT_ACTIVITY_URL ?? '',
   BOT_ACTIVITY: process.env.BOT_ACTIVITY ?? 'music',
 } as const;
diff --git a/src/services/player.ts b/src/services/player.ts
index abcc8ca..c8a95a4 100644
--- a/src/services/player.ts
+++ b/src/services/player.ts
@@ -10,7 +10,7 @@ import {
   AudioPlayerState,
   AudioPlayerStatus,
   createAudioPlayer,
-  createAudioResource,
+  createAudioResource, DiscordGatewayAdapterCreator,
   joinVoiceChannel,
   StreamType,
   VoiceConnection,
@@ -82,7 +82,7 @@ export default class {
     this.voiceConnection = joinVoiceChannel({
       channelId: channel.id,
       guildId: channel.guild.id,
-      adapterCreator: channel.guild.voiceAdapterCreator,
+      adapterCreator: channel.guild.voiceAdapterCreator as DiscordGatewayAdapterCreator,
     });
   }
 
diff --git a/src/services/spotify-api.ts b/src/services/spotify-api.ts
index 7f90aff..4347df2 100644
--- a/src/services/spotify-api.ts
+++ b/src/services/spotify-api.ts
@@ -47,7 +47,7 @@ export default class {
       items.push(...tracksResponse.items.map(playlistItem => playlistItem.track));
     }
 
-    const tracks = this.limitTracks(items, playlistLimit).map(this.toSpotifyTrack);
+    const tracks = this.limitTracks(items.filter(i => i !== null) as SpotifyApi.TrackObjectSimplified[], playlistLimit).map(this.toSpotifyTrack);
 
     return [tracks, playlist];
   }