celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-27 16:16:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some PRESENCE_UPDATE bugs

Browse Source
This commit is contained in:
ouwou
2020-10-13 23:52:56 -04:00
parent 99597a80d2
commit 00770e4bcb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
discord/discord.cpp
View File

@@ -606,7 +606,8 @@ void DiscordClient::HandleGatewayGuildMemberUpdate(const GatewayMessage &msg) {
void DiscordClient::HandleGatewayPresenceUpdate(const GatewayMessage &msg) { void DiscordClient::HandleGatewayPresenceUpdate(const GatewayMessage &msg) {
PresenceUpdateMessage data = msg.Data; PresenceUpdateMessage data = msg.Data;
auto cur = m_store.GetUser(data.User.at("id").get<Snowflake>()); auto cur = m_store.GetUser(data.User.at("id").get<Snowflake>());
User::update_from_json(data.User, *cur); if (cur != nullptr)
User::update_from_json(data.User, *cur);
} }
void DiscordClient::HandleGatewayMessageUpdate(const GatewayMessage &msg) { void DiscordClient::HandleGatewayMessageUpdate(const GatewayMessage &msg) {

2
discord/objects.cpp
View File

@@ -150,7 +150,7 @@ void from_json(const nlohmann::json &j, ClientStatus &m) {
void from_json(const nlohmann::json &j, PresenceUpdateMessage &m) { void from_json(const nlohmann::json &j, PresenceUpdateMessage &m) {
m.User = j.at("user"); m.User = j.at("user");
JS_D("guild_id", m.GuildID); JS_O("guild_id", m.GuildID);
JS_D("status", m.Status); JS_D("status", m.Status);
// JS_D("activities", m.Activities); // JS_D("activities", m.Activities);
JS_D("client_status", m.ClientStatus); JS_D("client_status", m.ClientStatus);

2
discord/objects.hpp
View File

@@ -213,7 +213,7 @@ struct ClientStatus {
struct PresenceUpdateMessage { struct PresenceUpdateMessage {
nlohmann::json User; // the client updates an existing object from this data nlohmann::json User; // the client updates an existing object from this data
Snowflake GuildID; Snowflake GuildID; // opt
std::string Status; std::string Status;
// std::vector<Activity> Activities; // std::vector<Activity> Activities;
ClientStatus ClientStatus; ClientStatus ClientStatus;