Merge branch 'master' into stages

3 files changed, 9 insertions, 1 deletions

diff --git a/src/discord/discord.hpp b/src/discord/discord.hpp
index ed7245e..44a7328 100644
--- a/src/discord/discord.hpp
+++ b/src/discord/discord.hpp
@@ -331,7 +331,7 @@ private:
 
     std::string m_token;
 
-    uint32_t m_build_number = 142000;
+    uint32_t m_build_number = 279382;
 
     void AddUserToGuild(Snowflake user_id, Snowflake guild_id);
     std::map<Snowflake, std::set<Snowflake>> m_guild_to_users;
diff --git a/src/discord/httpclient.cpp b/src/discord/httpclient.cpp
index 37436ee..25839f8 100644
--- a/src/discord/httpclient.cpp
+++ b/src/discord/httpclient.cpp
@@ -143,7 +143,13 @@ void HTTPClient::AddHeaders(http::request &r) {
         r.set_header(name, val);
     }
     curl_easy_setopt(r.get_curl(), CURLOPT_COOKIE, m_cookie.c_str());
+    // https://github.com/curl/curl/issues/13226
+    // TODO remove when new release
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM == 0x080701 || LIBCURL_VERSION_NUM == 0x080700)
+    //
+#else
     curl_easy_setopt(r.get_curl(), CURLOPT_ACCEPT_ENCODING, "");
+#endif
 }
 
 void HTTPClient::OnResponse(const http::response_type &r, const std::function<void(http::response_type r)> &cb) {
diff --git a/src/discord/voiceclient.cpp b/src/discord/voiceclient.cpp
index 164033f..c0c83b2 100644
--- a/src/discord/voiceclient.cpp
+++ b/src/discord/voiceclient.cpp
@@ -265,6 +265,8 @@ void DiscordVoiceClient::OnGatewayMessage(const std::string &str) {
         case VoiceGatewayOp::Speaking:
             HandleGatewaySpeaking(msg);
             break;
+        case VoiceGatewayOp::HeartbeatAck:
+            break; // stfu
         default:
             const auto opcode_int = static_cast<int>(msg.Opcode);
             m_log->warn("Unhandled opcode: {}", opcode_int);