From 56d7f0f03d7199d0d55f839d1645cedaca7a732c Mon Sep 17 00:00:00 2001
From: Manuel <30572287+manuel-rw@users.noreply.github.com>
Date: Sun, 19 Nov 2023 19:32:30 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20#236=20Destroying=20connection?=
 =?UTF-8?q?=20improperly=20(#245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                 | 9 +++++++++
 src/clients/discord/discord.voice.service.ts | 5 +++--
 src/commands/disconnect.command.ts           | 9 +++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..a9e3b06
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/src/clients/discord/discord.voice.service.ts b/src/clients/discord/discord.voice.service.ts
index 1b81c51..6d2cd39 100644
--- 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
index ae1e29a..eef3bb7 100644
--- 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) {