Also remove it on track stop

lavalink-devs · Dec 3, 2023 · d4ecf36 · d4ecf36
1 parent 12615a3
commit d4ecf36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt b/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt
@@ -78,8 +78,14 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
             Message.Op.Event -> {
                 event as Message.EmittedEvent
 
-                if (event is Message.EmittedEvent.TrackStartEvent) {
-                    node.playerCache[event.guildId.toLong()]?.track = event.track
+                when (event) {
+                    is Message.EmittedEvent.TrackStartEvent -> {
+                        node.playerCache[event.guildId.toLong()]?.track = event.track
+                    }
+                    is Message.EmittedEvent.TrackEndEvent -> {
+                        node.playerCache[event.guildId.toLong()]?.track = null
+                    }
+                    else -> {}
                 }
 
                 // TODO: handle websocket closed event from discord?

diff --git a/src/test/java/JavaJDAExample.java b/src/test/java/JavaJDAExample.java
@@ -178,13 +178,13 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
                     public void ontrackLoaded(@NotNull LoadResult.TrackLoaded result) {
                         final Track track = result.getData();
 
-                        link.createOrUpdatePlayer()
-                            .setEncodedTrack(track.getEncoded())
-                            .setVolume(35)
-                            .asMono()
-                            .subscribe((ignored) -> {
-                                event.getHook().sendMessage("Now playing: " + track.getInfo().getTitle()).queue();
-                            });
+                        link.getPlayer()
+                                .flatMap((p) -> p.setTrack(track)
+                                        .setVolume(35)
+                                        .asMono())
+                                    .subscribe((ignored) -> {
+                                        event.getHook().sendMessage("Now playing: " + track.getInfo().getTitle()).queue();
+                                    });
                     }
 
                     @Override