bump gateway version to 8

5 files changed, 10 insertions, 10 deletions

diff --git a/discord/discord.cpp b/discord/discord.cpp
index 86191fd..abbbbad 100644
--- a/discord/discord.cpp
+++ b/discord/discord.cpp
@@ -476,7 +476,7 @@ void DiscordClient::ProcessNewGuild(Guild &guild) {
     for (auto &c : guild.Channels) {
         c.GuildID = guild.ID;
         m_store.SetChannel(c.ID, c);
-        for (auto& p : c.PermissionOverwrites) {
+        for (auto &p : c.PermissionOverwrites) {
             m_store.SetPermissionOverwrite(c.ID, p.ID, p);
         }
     }
diff --git a/discord/discord.hpp b/discord/discord.hpp
index 596228d..f8c76e6 100644
--- a/discord/discord.hpp
+++ b/discord/discord.hpp
@@ -43,7 +43,7 @@ class DiscordClient {
     friend class Abaddon;
 
 public:
-    static const constexpr char *DiscordGateway = "wss://gateway.discord.gg/?v=6&encoding=json&compress=zlib-stream";
+    static const constexpr char *DiscordGateway = "wss://gateway.discord.gg/?v=8&encoding=json&compress=zlib-stream";
     static const constexpr char *DiscordAPI = "https://discord.com/api";
     static const constexpr char *GatewayIdentity = "Discord";
 
diff --git a/discord/guild.cpp b/discord/guild.cpp
index 35db47c..bf279e7 100644
--- a/discord/guild.cpp
+++ b/discord/guild.cpp
@@ -13,8 +13,10 @@ void from_json(const nlohmann::json &j, Guild &m) {
     JS_ON("discovery_splash", m.DiscoverySplash);
     JS_O("owner", m.IsOwner);
     JS_D("owner_id", m.OwnerID);
-    JS_O("permissions", m.Permissions);
-    JS_O("permissions_new", m.PermissionsNew);
+    std::string tmp;
+    JS_O("permissions", tmp);
+    if (tmp != "")
+        m.Permissions = std::stoull(tmp);
     JS_D("region", m.VoiceRegion);
     JS_N("afk_channel_id", m.AFKChannelID);
     JS_D("afk_timeout", m.AFKTimeout);
diff --git a/discord/permissions.cpp b/discord/permissions.cpp
index 3f269a0..f181e13 100644
--- a/discord/permissions.cpp
+++ b/discord/permissions.cpp
@@ -3,10 +3,9 @@
 void from_json(const nlohmann::json &j, PermissionOverwrite &m) {
     JS_D("id", m.ID);
     std::string tmp;
-    JS_D("type", tmp);
-    m.ID = tmp == "role" ? PermissionOverwrite::ROLE : PermissionOverwrite::MEMBER;
-    JS_D("allow_new", tmp);
+    m.ID = j.at("type").get<int>() == 0 ? PermissionOverwrite::ROLE : PermissionOverwrite::MEMBER;
+    JS_D("allow", tmp);
     m.Allow = static_cast<Permission>(std::stoull(tmp));
-    JS_D("deny_new", tmp);
+    JS_D("deny", tmp);
     m.Deny = static_cast<Permission>(std::stoull(tmp));
 }
diff --git a/discord/role.cpp b/discord/role.cpp
index d752f72..f1cd5ea 100644
--- a/discord/role.cpp
+++ b/discord/role.cpp
@@ -6,9 +6,8 @@ void from_json(const nlohmann::json &j, Role &m) {
     JS_D("color", m.Color);
     JS_D("hoist", m.IsHoisted);
     JS_D("position", m.Position);
-    JS_D("permissions", m.PermissionsLegacy);
     std::string tmp;
-    JS_D("permissions_new", tmp);
+    JS_D("permissions", tmp);
     m.Permissions = static_cast<Permission>(std::stoull(tmp));
     JS_D("managed", m.IsManaged);
     JS_D("mentionable", m.IsMentionable);