1 files changed, 40 insertions, 37 deletions

diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp
index f955f45..062a871 100644
--- a/src/discord/discord.cpp
+++ b/src/discord/discord.cpp
@@ -1284,21 +1284,10 @@ Snowflake DiscordClient::GetVoiceChannelID() const noexcept {
     return m_voice_channel_id;
 }
 
-std::unordered_set<Snowflake> DiscordClient::GetUsersInVoiceChannel(Snowflake channel_id) {
-    return m_voice_state_channel_users[channel_id];
-}
-
 std::optional<uint32_t> DiscordClient::GetSSRCOfUser(Snowflake id) const {
     return m_voice.GetSSRCOfUser(id);
 }
 
-std::optional<std::pair<Snowflake, VoiceStateFlags>> DiscordClient::GetVoiceState(Snowflake user_id) const {
-    if (const auto it = m_voice_states.find(user_id); it != m_voice_states.end()) {
-        return it->second;
-    }
-    return std::nullopt;
-}
-
 DiscordVoiceClient &DiscordClient::GetVoiceClient() {
     return m_voice;
 }
@@ -1314,6 +1303,17 @@ void DiscordClient::SetVoiceDeafened(bool is_deaf) {
 }
 #endif
 
+std::optional<std::pair<Snowflake, VoiceStateFlags>> DiscordClient::GetVoiceState(Snowflake user_id) const {
+    if (const auto it = m_voice_states.find(user_id); it != m_voice_states.end()) {
+        return it->second;
+    }
+    return std::nullopt;
+}
+
+std::unordered_set<Snowflake> DiscordClient::GetUsersInVoiceChannel(Snowflake channel_id) {
+    return m_voice_state_channel_users[channel_id];
+}
+
 void DiscordClient::SetReferringChannel(Snowflake id) {
     if (!id.IsValid()) {
         m_http.SetPersistentHeader("Referer", "https://discord.com/channels/@me");
@@ -1652,10 +1652,10 @@ void DiscordClient::HandleGatewayMessage(std::string str) {
                     case GatewayEvent::GUILD_MEMBERS_CHUNK: {
                         HandleGatewayGuildMembersChunk(m);
                     } break;
-#ifdef WITH_VOICE
                     case GatewayEvent::VOICE_STATE_UPDATE: {
                         HandleGatewayVoiceStateUpdate(m);
                     } break;
+#ifdef WITH_VOICE
                     case GatewayEvent::VOICE_SERVER_UPDATE: {
                         HandleGatewayVoiceServerUpdate(m);
                     } break;
@@ -2336,12 +2336,6 @@ void DiscordClient::HandleGatewayGuildMembersChunk(const GatewayMessage &msg) {
  *
  */
 
-void DiscordClient::HandleGatewayVoiceStateUpdate(const GatewayMessage &msg) {
-    spdlog::get("discord")->trace("VOICE_STATE_UPDATE");
-
-    CheckVoiceState(msg.Data);
-}
-
 void DiscordClient::HandleGatewayVoiceServerUpdate(const GatewayMessage &msg) {
     spdlog::get("discord")->trace("VOICE_SERVER_UPDATE");
 
@@ -2371,8 +2365,17 @@ void DiscordClient::HandleGatewayCallCreate(const GatewayMessage &msg) {
     }
 }
 
+#endif
+
+void DiscordClient::HandleGatewayVoiceStateUpdate(const GatewayMessage &msg) {
+    spdlog::get("discord")->trace("VOICE_STATE_UPDATE");
+
+    CheckVoiceState(msg.Data);
+}
+
 void DiscordClient::CheckVoiceState(const VoiceState &data) {
     if (data.UserID == m_user_data.ID) {
+#ifdef WITH_VOICE
         spdlog::get("discord")->debug("Voice session ID: {}", data.SessionID);
         m_voice.SetSessionID(data.SessionID);
 
@@ -2383,6 +2386,7 @@ void DiscordClient::CheckVoiceState(const VoiceState &data) {
             m_voice_channel_id = *data.ChannelID;
             m_signal_voice_channel_changed.emit(m_voice_channel_id);
         }
+#endif
     } else {
         if (data.GuildID.has_value() && data.Member.has_value()) {
             if (data.Member->User.has_value()) {
@@ -2409,7 +2413,6 @@ void DiscordClient::CheckVoiceState(const VoiceState &data) {
         }
     }
 }
-#endif
 
 void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) {
     ReadySupplementalData data = msg.Data;
@@ -2929,6 +2932,15 @@ void DiscordClient::SendVoiceStateUpdate() {
     m_websocket.Send(msg);
 }
 
+void DiscordClient::OnVoiceConnected() {
+    m_signal_voice_connected.emit();
+}
+
+void DiscordClient::OnVoiceDisconnected() {
+    m_signal_voice_disconnected.emit();
+}
+#endif
+
 void DiscordClient::SetVoiceState(Snowflake user_id, const VoiceState &state) {
     if (!state.ChannelID.has_value()) {
         spdlog::get("discord")->error("SetVoiceState called with missing channel ID");
@@ -2958,15 +2970,6 @@ void DiscordClient::ClearVoiceState(Snowflake user_id) {
     }
 }
 
-void DiscordClient::OnVoiceConnected() {
-    m_signal_voice_connected.emit();
-}
-
-void DiscordClient::OnVoiceDisconnected() {
-    m_signal_voice_disconnected.emit();
-}
-#endif
-
 void DiscordClient::LoadEventMap() {
     m_event_map["READY"] = GatewayEvent::READY;
     m_event_map["MESSAGE_CREATE"] = GatewayEvent::MESSAGE_CREATE;
@@ -3242,14 +3245,6 @@ DiscordClient::type_signal_voice_speaking DiscordClient::signal_voice_speaking()
     return m_signal_voice_speaking;
 }
 
-DiscordClient::type_signal_voice_user_disconnect DiscordClient::signal_voice_user_disconnect() {
-    return m_signal_voice_user_disconnect;
-}
-
-DiscordClient::type_signal_voice_user_connect DiscordClient::signal_voice_user_connect() {
-    return m_signal_voice_user_connect;
-}
-
 DiscordClient::type_signal_voice_requested_connect DiscordClient::signal_voice_requested_connect() {
     return m_signal_voice_requested_connect;
 }
@@ -3265,8 +3260,16 @@ DiscordClient::type_signal_voice_client_state_update DiscordClient::signal_voice
 DiscordClient::type_signal_voice_channel_changed DiscordClient::signal_voice_channel_changed() {
     return m_signal_voice_channel_changed;
 }
+#endif
+
+DiscordClient::type_signal_voice_user_disconnect DiscordClient::signal_voice_user_disconnect() {
+    return m_signal_voice_user_disconnect;
+}
+
+DiscordClient::type_signal_voice_user_connect DiscordClient::signal_voice_user_connect() {
+    return m_signal_voice_user_connect;
+}
 
 DiscordClient::type_signal_voice_state_set DiscordClient::signal_voice_state_set() {
     return m_signal_voice_state_set;
 }
-#endif