Minki/abaddon
1
0
Fork 0
mirror of https://github.com/uowuo/abaddon.git synced 2024-09-20 06:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont crash on unavailable guild

Browse Source
This commit is contained in:
ouwou 2020-08-28 18:21:18 -04:00
parent 5b7d36bb74
commit c001c0e08a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/discord.cpp
View File

@ -255,7 +255,10 @@ void DiscordClient::HandleGatewayReady(const GatewayMessage &msg) {
m_ready_received = true;
ReadyEventData data = msg.Data;
for (const auto &g : data.Guilds) {
StoreGuild(g.ID, g);
if (g.IsUnavailable)
printf("guild (%lld) unavailable\n", g.ID);
else
StoreGuild(g.ID, g);
}
m_abaddon->DiscordNotifyReady();
m_user_settings = data.UserSettings;
@ -368,6 +371,11 @@ void from_json(const nlohmann::json &j, UserData &m) {
void from_json(const nlohmann::json &j, GuildData &m) {
JS_D("id", m.ID);
if (j.contains("unavailable")) {
m.IsUnavailable = true;
return;
}
JS_D("name", m.Name);
JS_N("icon", m.Icon);
JS_N("splash", m.Splash);