🐛 #236 Destroying connection improperly (#245)

manuel-rw · Nov 19, 2023 · 56d7f0f · 56d7f0f
1 parent 02f2dbe
commit 56d7f0f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,9 @@
+# COPY THIS AND RENAME TO .ENV WHEN YOU RUN FROM SOURCE
+
+DISCORD_CLIENT_TOKEN=
+JELLYFIN_SERVER_ADDRESS=http://0.0.0.0:8096
+JELLYFIN_AUTHENTICATION_USERNAME=
+JELLYFIN_AUTHENTICATION_PASSWORD=
+UPDATER_DISABLE_NOTIFICATIONS=false
+ALLOW_EVERYONE=false
+# LOG_LEVEl=DEBUG
diff --git a/src/clients/discord/discord.voice.service.ts b/src/clients/discord/discord.voice.service.ts
@@ -197,7 +197,8 @@ export class DiscordVoiceService {
       };
     }
 
-    this.voiceConnection.destroy();
+    this.voiceConnection.disconnect();
+    this.audioPlayer = undefined;
     this.voiceConnection = undefined;
     return {
       success: true,
@@ -214,7 +215,7 @@ export class DiscordVoiceService {
     );
 
     connections.forEach((connection) => {
-      connection.destroy();
+      connection.disconnect();
     });
   }
 

diff --git a/src/commands/disconnect.command.ts b/src/commands/disconnect.command.ts
@@ -32,8 +32,13 @@ export class DisconnectCommand {
       ],
     });
 
-    this.discordVoiceService.stop(false);
-    this.playbackService.getPlaylistOrDefault().clear();
+    const playlist = this.playbackService.getPlaylistOrDefault();
+
+    if (playlist.hasActiveTrack()) {
+      this.discordVoiceService.stop(false);
+    }
+    playlist.clear();
+
     const disconnect = this.discordVoiceService.disconnect();
 
     if (!disconnect.success) {