Improve voice state event selection logic

disgoorg · Sep 25, 2024 · 9f601cc · 9f601cc
1 parent 71cd4c8
commit 9f601cc
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/handlers/voice_handlers.go b/handlers/voice_handlers.go
@@ -39,21 +39,25 @@ func gatewayHandlerVoiceStateUpdate(client bot.Client, sequenceNumber int, shard
 		OldVoiceState:          oldVoiceState,
 	})
 
-	if oldOk && oldVoiceState.ChannelID != nil && event.ChannelID != nil {
+	leave := oldOk && oldVoiceState.ChannelID != nil
+	join := event.ChannelID != nil
+
+	switch {
+	case leave && join:
 		client.EventManager().DispatchEvent(&events.GuildVoiceMove{
 			GenericGuildVoiceState: genericGuildVoiceEvent,
 			OldVoiceState:          oldVoiceState,
 		})
-	} else if (oldOk || oldVoiceState.ChannelID == nil) && event.ChannelID != nil {
-		client.EventManager().DispatchEvent(&events.GuildVoiceJoin{
-			GenericGuildVoiceState: genericGuildVoiceEvent,
-		})
-	} else if event.ChannelID == nil {
+	case leave:
 		client.EventManager().DispatchEvent(&events.GuildVoiceLeave{
 			GenericGuildVoiceState: genericGuildVoiceEvent,
 			OldVoiceState:          oldVoiceState,
 		})
-	} else {
+	case join:
+		client.EventManager().DispatchEvent(&events.GuildVoiceJoin{
+			GenericGuildVoiceState: genericGuildVoiceEvent,
+		})
+	default:
 		client.Logger().Warn("could not decide which GuildVoice to fire")
 	}
 }