Fix voice moves causing invalid session if done in quick succession

Discord4J · Aug 16, 2023 · 884a981 · 884a981
1 parent d8bae24
commit 884a981
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 133 deletions.
diff --git a/core/src/main/java/discord4j/core/spec/VoiceChannelJoinSpecGenerator.java b/core/src/main/java/discord4j/core/spec/VoiceChannelJoinSpecGenerator.java
@@ -149,9 +149,22 @@ default Function<VoiceChannel, Mono<VoiceConnection>> asRequest() {
 
             final VoiceDisconnectTask disconnectTask = id -> voiceChannel.sendDisconnectVoiceState()
                     .then(gateway.getVoiceConnectionRegistry().disconnect(id));
-            //noinspection ConstantConditions
-            final VoiceServerUpdateTask serverUpdateTask = id -> onVoiceServerUpdate(gateway, id)
-                    .map(vsu -> new VoiceServerOptions(vsu.getToken(), vsu.getEndpoint()));
+            final VoiceServerUpdateTask serverUpdateTask = new VoiceServerUpdateTask() {
+
+                @Override
+                public Flux<VoiceServerOptions> onVoiceServerUpdates(Snowflake guildId) {
+                    //noinspection DataFlowIssue
+                    return gateway.getEventDispatcher()
+                            .on(VoiceServerUpdateEvent.class)
+                            .filter(vsu -> vsu.getGuildId().equals(guildId) && vsu.getEndpoint() != null)
+                            .map(vsu -> new VoiceServerOptions(vsu.getToken(), vsu.getEndpoint()));
+                }
+
+                @Override
+                public Mono<VoiceServerOptions> onVoiceServerUpdate(Snowflake guildId) {
+                    return onVoiceServerUpdates(guildId).next();
+                }
+            };
             final VoiceStateUpdateTask stateUpdateTask = id -> onVoiceStateUpdates(gateway, id)
                     .map(stateUpdateEvent -> stateUpdateEvent.getCurrent().getSessionId());
             final VoiceChannelRetrieveTask channelRetrieveTask = () -> gateway
@@ -218,4 +231,4 @@ public void subscribe(CoreSubscriber<? super VoiceConnection> actual) {
 
     @Override
     public abstract String toString();
-}
+}