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

handle USER_GUILD_SETTINGS_UPDATE for notifications

Browse Source
This commit is contained in:
ouwou
2023-03-10 19:14:19 -05:00
parent 3889991e16
commit e3f6a1dcbd
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/discord/discord.cpp
View File

@@ -86,8 +86,8 @@ const UserGuildSettingsData &DiscordClient::GetUserGuildSettings() const {
}
std::optional<UserGuildSettingsEntry> DiscordClient::GetSettingsForGuild(Snowflake id) const {
for (const auto &entry : m_user_guild_settings.Entries) {
if (entry.GuildID == id) return entry;
if (const auto it = m_user_guild_settings.Entries.find(id); it != m_user_guild_settings.Entries.end()) {
return it->second;
}
return std::nullopt;
@@ -2049,6 +2049,8 @@ void DiscordClient::HandleGatewayMessageAck(const GatewayMessage &msg) {
void DiscordClient::HandleGatewayUserGuildSettingsUpdate(const GatewayMessage &msg) {
UserGuildSettingsUpdateData data = msg.Data;
m_user_guild_settings.Entries[data.Settings.GuildID] = data.Settings;
const bool for_dms = !data.Settings.GuildID.IsValid();
const auto channels = for_dms ? GetPrivateChannels() : GetChannelsInGuild(data.Settings.GuildID);
@@ -2543,7 +2545,7 @@ void DiscordClient::HandleReadyGuildSettings(const ReadyEventData &data) {
}
const auto now = Snowflake::FromNow();
for (const auto &entry : data.GuildSettings.Entries) {
for (const auto &[guild_id, entry] : data.GuildSettings.Entries) {
// even if muted is true a guild/channel can be unmuted if the current time passes mute_config.end_time
if (entry.Muted) {
if (entry.MuteConfig.EndTime.has_value()) {

10
src/discord/objects.cpp
View File

@@ -210,7 +210,15 @@ std::optional<UserGuildSettingsChannelOverride> UserGuildSettingsEntry::GetOverr
void from_json(const nlohmann::json &j, UserGuildSettingsData &m) {
JS_D("version", m.Version);
JS_D("partial", m.IsPartial);
JS_D("entries", m.Entries);
{
std::vector<UserGuildSettingsEntry> entries;
JS_D("entries", entries);
for (const auto &entry : entries) {
m.Entries[entry.GuildID] = entry;
}
}
}
void from_json(const nlohmann::json &j, ReadyEventData &m) {

2
src/discord/objects.hpp
View File

@@ -311,7 +311,7 @@ struct UserGuildSettingsEntry {
struct UserGuildSettingsData {
int Version;
bool IsPartial;
std::vector<UserGuildSettingsEntry> Entries;
std::map<Snowflake, UserGuildSettingsEntry> Entries;
friend void from_json(const nlohmann::json &j, UserGuildSettingsData &m);
};