Merge and slightly improve impl from freya

Author: duncte123

settings.gradle.kts

@@ -20,7 +20,7 @@ fun VersionCatalogBuilder.versionRefs() {
     version("dokka", "2.1.0")
     version("grgit", "5.2.0")
     version("maven-publish", "0.32.0")
-//    version("lavalink", "4.0.3")
+    // TODO: Update with actual version number when it arrives
     version("lavalink", "74a765017f39f01dd01d3eb9bc976bcb08ffef92-SNAPSHOT")
 
     version("logger", "2.0.7")

src/main/kotlin/dev/arbjerg/lavalink/libraries/discord4j/D4JVoiceUpdateHandler.kt

@@ -12,6 +12,8 @@ import discord4j.core.event.domain.VoiceStateUpdateEvent
 import reactor.core.Disposable
 import reactor.core.Disposables
 import reactor.core.publisher.Mono
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicReference
 import kotlin.jvm.optionals.getOrNull
 
 /**
@@ -24,12 +26,21 @@ import kotlin.jvm.optionals.getOrNull
  */
 @JvmName("install")
 fun GatewayDiscordClient.installVoiceHandler(lavalink: LavalinkClient): Disposable.Composite {
+    // guild_id -> channel_id
+    val channelIdCache = ConcurrentHashMap<Long, String>()
+
     val voiceStateUpdate = on(VoiceStateUpdateEvent::class.java) { event ->
         val update = event.current
         if (update.userId != update.client.selfId) return@on Mono.empty()
         val channel = update.channelId.getOrNull()
-        val link = lavalink.getLinkIfCached(update.guildId.asLong()) ?: return@on Mono.empty()
-        val player = link.node.playerCache[update.guildId.asLong()] ?: return@on Mono.empty()
+        val guildId = update.guildId.asLong()
+
+        channel?.let { channelSnowflake ->
+            channelIdCache[guildId] = channelSnowflake.asString()
+        }
+
+        val link = lavalink.getLinkIfCached(guildId) ?: return@on Mono.empty()
+        val player = link.node.playerCache[guildId] ?: return@on Mono.empty()
         val playerState = player.state
 
         if (channel == null && playerState.connected) {
@@ -42,15 +53,16 @@ fun GatewayDiscordClient.installVoiceHandler(lavalink: LavalinkClient): Disposab
     }.subscribe()
 
     val voiceServerUpdate = on(VoiceServerUpdateEvent::class.java) { update ->
+        val guildId = update.guildId.asLong()
         val state = VoiceState(
             update.token,
             update.endpoint!!,
             getGatewayClient(update.shardInfo.index).get().sessionId,
-            null // TODO: find where to get the channel id from
+            channelIdCache.remove(guildId) // TODO: Test if this works, is the order of events correct?
         )
 
         val region = VoiceRegion.fromEndpoint(update.endpoint!!)
-        val link = lavalink.getOrCreateLink(update.guildId.asLong(), region)
+        val link = lavalink.getOrCreateLink(guildId, region)
 
         link.onVoiceServerUpdate(state)
         Mono.empty<Unit>()

src/main/kotlin/dev/arbjerg/lavalink/libraries/jda/JDAVoiceUpdateListener.kt

@@ -12,7 +12,7 @@ class JDAVoiceUpdateListener(private val lavalink: LavalinkClient) : VoiceDispat
             update.token,
             update.endpoint,
             update.sessionId,
-            null // TODO: find where to get the channel id from
+            update.guild.selfMember.voiceState?.channel?.id // TODO: Test if this works, is the order of events correct?
         )
         val region = VoiceRegion.fromEndpoint(update.endpoint)
         val link = lavalink.getOrCreateLink(update.guildIdLong, region)