Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump gateway version to 8

Browse Source
This commit is contained in:
ouwou
2020-10-01 17:00:36 -04:00
parent 872b15e6af
commit 9cb0eefa56
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
discord/discord.cpp
View File

@@ -476,7 +476,7 @@ void DiscordClient::ProcessNewGuild(Guild &guild) {
for (auto &c : guild.Channels) { for (auto &c : guild.Channels) {
c.GuildID = guild.ID; c.GuildID = guild.ID;
m_store.SetChannel(c.ID, c); m_store.SetChannel(c.ID, c);
for (auto& p : c.PermissionOverwrites) { for (auto &p : c.PermissionOverwrites) {
m_store.SetPermissionOverwrite(c.ID, p.ID, p); m_store.SetPermissionOverwrite(c.ID, p.ID, p);
} }
} }

2
discord/discord.hpp
View File

@@ -43,7 +43,7 @@ class DiscordClient {
friend class Abaddon; friend class Abaddon;
public: 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 *DiscordAPI = "https://discord.com/api";
static const constexpr char *GatewayIdentity = "Discord"; static const constexpr char *GatewayIdentity = "Discord";

6
discord/guild.cpp
View File

@@ -13,8 +13,10 @@ void from_json(const nlohmann::json &j, Guild &m) {
JS_ON("discovery_splash", m.DiscoverySplash); JS_ON("discovery_splash", m.DiscoverySplash);
JS_O("owner", m.IsOwner); JS_O("owner", m.IsOwner);
JS_D("owner_id", m.OwnerID); JS_D("owner_id", m.OwnerID);
JS_O("permissions", m.Permissions); std::string tmp;
JS_O("permissions_new", m.PermissionsNew); JS_O("permissions", tmp);
if (tmp != "")
m.Permissions = std::stoull(tmp);
JS_D("region", m.VoiceRegion); JS_D("region", m.VoiceRegion);
JS_N("afk_channel_id", m.AFKChannelID); JS_N("afk_channel_id", m.AFKChannelID);
JS_D("afk_timeout", m.AFKTimeout); JS_D("afk_timeout", m.AFKTimeout);

7
discord/permissions.cpp
View File

@@ -3,10 +3,9 @@
void from_json(const nlohmann::json &j, PermissionOverwrite &m) { void from_json(const nlohmann::json &j, PermissionOverwrite &m) {
JS_D("id", m.ID); JS_D("id", m.ID);
std::string tmp; std::string tmp;
JS_D("type", tmp); m.ID = j.at("type").get<int>() == 0 ? PermissionOverwrite::ROLE : PermissionOverwrite::MEMBER;
m.ID = tmp == "role" ? PermissionOverwrite::ROLE : PermissionOverwrite::MEMBER; JS_D("allow", tmp);
JS_D("allow_new", tmp);
m.Allow = static_cast<Permission>(std::stoull(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)); m.Deny = static_cast<Permission>(std::stoull(tmp));
} }

3
discord/role.cpp
View File

@@ -6,9 +6,8 @@ void from_json(const nlohmann::json &j, Role &m) {
JS_D("color", m.Color); JS_D("color", m.Color);
JS_D("hoist", m.IsHoisted); JS_D("hoist", m.IsHoisted);
JS_D("position", m.Position); JS_D("position", m.Position);
JS_D("permissions", m.PermissionsLegacy);
std::string tmp; std::string tmp;
JS_D("permissions_new", tmp); JS_D("permissions", tmp);
m.Permissions = static_cast<Permission>(std::stoull(tmp)); m.Permissions = static_cast<Permission>(std::stoull(tmp));
JS_D("managed", m.IsManaged); JS_D("managed", m.IsManaged);
JS_D("mentionable", m.IsMentionable); JS_D("mentionable", m.IsMentionable);