3.5.2

When audioplayer throws PlayingError and the queue is empty, player destroys themselves.
Improved error output in Discord.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicbot",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "Discord Bot for playing music",
   "main": "build/main.js",
   "scripts": {

src/audioplayer/AudioPlayersManager.ts

@@ -87,21 +87,21 @@ export class AudioPlayersManager {
       const queue = this.distube.getQueue(voiceChannel.guildId);
 
       if (!queue) return;
-      if (queue.songs.length === 0) await this.stop(voiceChannel.guild);
+      if (queue.songs.length === 0) await this.stop(voiceChannel.guild.id);
     }
   }
 
-  async stop(guild: Guild) {
-    const queue = this.distube.getQueue(guild);
+  async stop(guildId: string) {
+    const queue = this.distube.getQueue(guildId);
 
     if (queue) {
       await queue.stop();
       queue.voice.leave();
     } else {
-      this.distube.voices.leave(guild);
+      this.distube.voices.leave(guildId);
     }
 
-    await this.playersManager.remove(guild.id);
+    await this.playersManager.remove(guildId);
   }
 
   async pause(guild: Guild) {
@@ -404,14 +404,16 @@ export class AudioPlayersManager {
         if (queue._next || queue._prev || queue.stopped || queue.songs.length > 1) return;
         await this.playersManager.get(queue.id)?.setState('waiting');
       })
-      .on(DistubeEvents.ERROR, async (error, queue) => {
+      .on(DistubeEvents.ERROR, async (error, queue, song) => {
         let errorName = `ERROR`;
         const errorMessage = `${error.name} + \n\n + ${error.message}`;
 
-        if (queue.songs.length >= 1) {
-          errorName = queue.songs[0].name!;
+        if (song) {
+          errorName = song.name!;
         }
 
+        if (queue.songs.length === 0) await this.stop(queue.id)
+
         await queue.textChannel?.send({
           embeds: [generateErrorEmbed(errorMessage, errorName)]
         });

src/audioplayer/PlayerButtons.ts

@@ -148,7 +148,7 @@ export class PlayerButtons {
               });
             }
 
-            await this.client.audioPlayer.stop(guild);
+            await this.client.audioPlayer.stop(guild.id);
 
             await ButtonInteraction.deferUpdate();
             break;

src/audioplayer/PlayerInstance.ts

@@ -50,7 +50,7 @@ export class PlayerInstance {
   async startAfkTimer() {
     try {
       this.afkTimer = setTimeout(async () => {
-        await this.client.audioPlayer.stop(this.textChannel.guild);
+        await this.client.audioPlayer.stop(this.textChannel.guild.id);
         await this.textChannel.send({
           embeds: [generateSimpleEmbed(i18next.t('audioplayer:event_empty') as string)]
         });
@@ -79,7 +79,7 @@ export class PlayerInstance {
           // loggerSend('try to stop player on cooldown')
           if (queue) return;
           if (checkBotInVoice(this.textChannel.guild)) {
-            await this.client.audioPlayer.stop(this.textChannel.guild);
+            await this.client.audioPlayer.stop(this.textChannel.guild.id);
             await this.textChannel.send({
               embeds: [generateSimpleEmbed(i18next.t('audioplayer:event_finish_time') as string)]
             });

src/audioplayer/eventsHandlers/AudioPlayerEventChannelDelete.ts

@@ -3,6 +3,6 @@ import { Client, TextChannel } from 'discord.js';
 export async function AudioPlayerEventChannelDelete(client: Client, channel: TextChannel) {
   const player = client.audioPlayer.playersManager.get(channel.guild.id);
   if (player?.textChannel.id === channel.id) {
-    await client.audioPlayer.stop(channel.guild);
+    await client.audioPlayer.stop(channel.guild.id);
   }
 }

src/audioplayer/util/downloadSong.ts

@@ -109,5 +109,13 @@ export function DownloadSongErrorGetLocale(errorMessage: DownloadSongMessage) {
       maxDownloadSize: maxDownloadSizeMB
     });
   }
-  return i18next.t(`commands:download_song_error_${errorMessage}`);
+
+  const localeToken = `commands:download_song_error_${errorMessage}`
+  const locale =  i18next.t(localeToken)
+
+  if (localeToken !== locale){
+    return locale
+  }
+
+  return errorMessage
 }

src/commands/audio/stop.command.ts

@@ -1,6 +1,6 @@
 import { ICommand } from '../../CommandTypes.js';
 import {
-  EmbedBuilder,
+  EmbedBuilder, Guild,
   GuildMember,
   Message,
   PermissionsBitField,
@@ -21,7 +21,7 @@ export default function (): ICommand {
       description: i18next.t('commands:stop_desc'),
       execute: async (message: Message) => {
         await AudioCommandWrapperText(message, async () => {
-          await message.client.audioPlayer.stop(message.guild!);
+          await message.client.audioPlayer.stop((message.guild as Guild).id);
           await message.reply({ embeds: [generateEmbedAudioPlayerStop(message.member!)] });
         });
       }
@@ -32,7 +32,7 @@ export default function (): ICommand {
         .setDescription(i18next.t('commands:stop_desc')),
       execute: async (interaction) => {
         await AudioCommandWrapperInteraction(interaction, async () => {
-          await interaction.client.audioPlayer.stop(interaction.guild!);
+          await interaction.client.audioPlayer.stop((interaction.guild as Guild).id);
           await interaction.reply({
             embeds: [generateEmbedAudioPlayerStop(interaction.member as GuildMember)]
           });