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

Merge branch 'master' into friends

Browse Source
This commit is contained in:
ouwou
2021-05-08 23:37:52 -04:00
parent 78d3c5b679 469053a144
commit abd2b9c71e
6 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
discord/discord.cpp
View File

@@ -1039,6 +1039,9 @@ void DiscordClient::HandleGatewayMessage(std::string str) {
case GatewayEvent::GUILD_JOIN_REQUEST_DELETE: {
HandleGatewayGuildJoinRequestDelete(m);
} break;
case GatewayEvent::RELATIONSHIP_REMOVE: {
HandleGatewayRelationshipRemove(m);
} break;
}
} break;
default:
@@ -1480,6 +1483,12 @@ void DiscordClient::HandleGatewayGuildJoinRequestDelete(const GatewayMessage &ms
m_signal_guild_join_request_delete.emit(data);
}
void DiscordClient::HandleGatewayRelationshipRemove(const GatewayMessage &msg) {
RelationshipRemoveData data = msg.Data;
m_user_relationships.erase(data.ID);
m_signal_relationship_remove.emit(data.ID, data.Type);
}
void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) {
ReadySupplementalData data = msg.Data;
for (const auto &p : data.MergedPresences.Friends) {
@@ -1815,6 +1824,7 @@ void DiscordClient::LoadEventMap() {
m_event_map["GUILD_JOIN_REQUEST_CREATE"] = GatewayEvent::GUILD_JOIN_REQUEST_CREATE;
m_event_map["GUILD_JOIN_REQUEST_UPDATE"] = GatewayEvent::GUILD_JOIN_REQUEST_UPDATE;
m_event_map["GUILD_JOIN_REQUEST_DELETE"] = GatewayEvent::GUILD_JOIN_REQUEST_DELETE;
m_event_map["RELATIONSHIP_REMOVE"] = GatewayEvent::RELATIONSHIP_REMOVE;
}
DiscordClient::type_signal_gateway_ready DiscordClient::signal_gateway_ready() {
@@ -1937,6 +1947,10 @@ DiscordClient::type_signal_guild_join_request_delete DiscordClient::signal_guild
return m_signal_guild_join_request_delete;
}
DiscordClient::type_signal_relationship_remove DiscordClient::signal_relationship_remove() {
return m_signal_relationship_remove;
}
DiscordClient::type_signal_message_sent DiscordClient::signal_message_sent() {
return m_signal_message_sent;
}