Fix issues with events not firing in Java context

kordlib · Aug 21, 2023 · 83a17e6 · 83a17e6
1 parent a23fe0d
commit 83a17e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/example/src/commonMain/kotlin/Lavakord.kt b/example/src/commonMain/kotlin/Lavakord.kt
@@ -13,9 +13,8 @@ import dev.kord.core.on
 import dev.kord.gateway.Intent
 import dev.kord.gateway.PrivilegedIntent
 import dev.kord.rest.builder.interaction.string
-import dev.schlaubi.lavakord.plugins.lavasrc.lavaSrcInfo
+import dev.schlaubi.lavakord.audio.Event
 import dev.schlaubi.lavakord.audio.Link
-import dev.schlaubi.lavakord.audio.TrackEvent
 import dev.schlaubi.lavakord.audio.on
 import dev.schlaubi.lavakord.kord.getLink
 import dev.schlaubi.lavakord.kord.lavakord
@@ -50,7 +49,7 @@ suspend fun main() {
         }
     }
 
-    lavalink.addNode("wss://joachim.lava-hosts.schlaubi.net", "jcdrNb7Y8D8TTo6D64x&msiA3CzD")
+    lavalink.addNode("ws://localhost:2333", "youshallnotpass")
 
     kord.on<GuildChatInputCommandInteractionCreateEvent> {
         val ack = interaction.deferPublicResponse()
@@ -61,9 +60,9 @@ suspend fun main() {
             val followUpCreator = FollowupPermittingInteractionResponseBehavior(
                 interaction.applicationId, interaction.token, interaction.kord, interaction.supplier
             )
-            player.on<TrackEvent> {
+            player.on<Event> {
                 try {
-                    followUpCreator.createEphemeralFollowup { content = "Event: ${this@on.track.lavaSrcInfo}" }
+                    followUpCreator.createEphemeralFollowup { content = "Event: ${this@on}" }
                 } catch (e: Exception) {
                     e.printStackTrace()
                 }

diff --git a/java/src/main/kotlin/dev/schlaubi/lavakord/interop/JavaEventSource.kt b/java/src/main/kotlin/dev/schlaubi/lavakord/interop/JavaEventSource.kt
@@ -28,7 +28,9 @@ public interface JavaEventSource<T : Any> {
      */
     public fun <E : T> on(eventType: Class<E>, handler: Consumer<E>) {
         events.subscribe(object : Subscriber<T> {
-            override fun onSubscribe(subscription: Flow.Subscription) = Unit
+            override fun onSubscribe(subscription: Flow.Subscription) {
+                subscription.request(Long.MAX_VALUE)
+            }
 
             override fun onError(throwable: Throwable) {
                 // This in theory should never happen