colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into voice

Browse Source
This commit is contained in:
ouwou
2023-05-18 20:23:00 -04:00
parent d0fa9cc289 38c3b0c2aa
commit 15aa875857
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/discord/discord.cpp
View File

@@ -2305,7 +2305,8 @@ void DiscordClient::HandleGatewayVoiceServerUpdate(const GatewayMessage &msg) {
void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) { void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) {
ReadySupplementalData data = msg.Data; ReadySupplementalData data = msg.Data;
for (const auto &p : data.MergedPresences.Friends) {
const auto handle_presence = [this](const MergedPresence &p) {
const auto user = GetUser(p.UserID); const auto user = GetUser(p.UserID);
if (!user.has_value()) return; // should be sent in READY's `users` if (!user.has_value()) return; // should be sent in READY's `users`
const auto s = p.Presence.Status; const auto s = p.Presence.Status;
@@ -2318,6 +2319,15 @@ void DiscordClient::HandleGatewayReadySupplemental(const GatewayMessage &msg) {
else if (s == "dnd") else if (s == "dnd")
m_user_to_status[p.UserID] = PresenceStatus::DND; m_user_to_status[p.UserID] = PresenceStatus::DND;
m_signal_presence_update.emit(*user, m_user_to_status.at(p.UserID)); m_signal_presence_update.emit(*user, m_user_to_status.at(p.UserID));
};
for (const auto &p : data.MergedPresences.Friends) {
handle_presence(p);
}
for (const auto &g : data.MergedPresences.Guilds) {
for (const auto &p : g) {
handle_presence(p);
}
} }
#ifdef WITH_VOICE #ifdef WITH_VOICE
for (const auto &g : data.Guilds) { for (const auto &g : data.Guilds) {