Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle mute/unmute for dms

Browse Source
This commit is contained in:
ouwou
2022-01-08 18:35:46 -05:00
parent 9d0c7691d8
commit 4e0b22375f
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/discord/discord.cpp
View File

@@ -1527,6 +1527,7 @@ void DiscordClient::HandleGatewayReady(const GatewayMessage &msg) {
m_store.BeginTransaction(); m_store.BeginTransaction();
for (const auto &dm : data.PrivateChannels) { for (const auto &dm : data.PrivateChannels) {
m_guild_to_channels[Snowflake::Invalid].insert(dm.ID);
m_store.SetChannel(dm.ID, dm); m_store.SetChannel(dm.ID, dm);
if (dm.Recipients.has_value()) if (dm.Recipients.has_value())
for (const auto &recipient : *dm.Recipients) for (const auto &recipient : *dm.Recipients)
@@ -1944,27 +1945,31 @@ void DiscordClient::HandleGatewayMessageAck(const GatewayMessage &msg) {
void DiscordClient::HandleGatewayUserGuildSettingsUpdate(const GatewayMessage &msg) { void DiscordClient::HandleGatewayUserGuildSettingsUpdate(const GatewayMessage &msg) {
UserGuildSettingsUpdateData data = msg.Data; UserGuildSettingsUpdateData data = msg.Data;
const auto channels = GetChannelsInGuild(data.Settings.GuildID); const bool for_dms = !data.Settings.GuildID.IsValid();
const auto channels = for_dms ? GetPrivateChannels() : GetChannelsInGuild(data.Settings.GuildID);
std::set<Snowflake> now_muted_channels; std::set<Snowflake> now_muted_channels;
const auto now = Snowflake::FromNow(); const auto now = Snowflake::FromNow();
const bool was_muted = IsGuildMuted(data.Settings.GuildID); if (!for_dms) {
bool now_muted = false; const bool was_muted = IsGuildMuted(data.Settings.GuildID);
if (data.Settings.Muted) { bool now_muted = false;
if (data.Settings.MuteConfig.EndTime.has_value()) { if (data.Settings.Muted) {
const auto end = Snowflake::FromISO8601(*data.Settings.MuteConfig.EndTime); if (data.Settings.MuteConfig.EndTime.has_value()) {
if (end.IsValid() && end > now) const auto end = Snowflake::FromISO8601(*data.Settings.MuteConfig.EndTime);
if (end.IsValid() && end > now)
now_muted = true;
} else {
now_muted = true; now_muted = true;
} else { }
now_muted = true; }
if (was_muted && !now_muted) {
m_muted_guilds.erase(data.Settings.GuildID);
m_signal_guild_unmuted.emit(data.Settings.GuildID);
} else if (!was_muted && now_muted) {
m_muted_guilds.insert(data.Settings.GuildID);
m_signal_guild_muted.emit(data.Settings.GuildID);
} }
}
if (was_muted && !now_muted) {
m_muted_guilds.erase(data.Settings.GuildID);
m_signal_guild_unmuted.emit(data.Settings.GuildID);
} else if (!was_muted && now_muted) {
m_muted_guilds.insert(data.Settings.GuildID);
m_signal_guild_muted.emit(data.Settings.GuildID);
} }
for (const auto &override : data.Settings.ChannelOverrides) { for (const auto &override : data.Settings.ChannelOverrides) {
@@ -2178,15 +2183,9 @@ void DiscordClient::AddUserToGuild(Snowflake user_id, Snowflake guild_id) {
} }
std::set<Snowflake> DiscordClient::GetPrivateChannels() const { std::set<Snowflake> DiscordClient::GetPrivateChannels() const {
auto ret = std::set<Snowflake>(); if (const auto iter = m_guild_to_channels.find(Snowflake::Invalid); iter != m_guild_to_channels.end())
return iter->second;
for (const auto &id : m_store.GetChannels()) { return {};
const auto chan = m_store.GetChannel(id);
if (chan->Type == ChannelType::DM || chan->Type == ChannelType::GROUP_DM)
ret.insert(id);
}
return ret;
} }
EPremiumType DiscordClient::GetSelfPremiumType() const { EPremiumType DiscordClient::GetSelfPremiumType() const {
@@ -2413,6 +2412,12 @@ void DiscordClient::HandleReadyGuildSettings(const ReadyEventData &data) {
} }
} }
void DiscordClient::HandleUserGuildSettingsUpdateForDMs(const UserGuildSettingsUpdateData &data) {
const auto channels = GetPrivateChannels();
std::set<Snowflake> now_muted_channels;
const auto now = Snowflake::FromNow();
}
void DiscordClient::LoadEventMap() { void DiscordClient::LoadEventMap() {
m_event_map["READY"] = GatewayEvent::READY; m_event_map["READY"] = GatewayEvent::READY;
m_event_map["MESSAGE_CREATE"] = GatewayEvent::MESSAGE_CREATE; m_event_map["MESSAGE_CREATE"] = GatewayEvent::MESSAGE_CREATE;

2
src/discord/discord.hpp
View File

@@ -277,6 +277,8 @@ private:
void HandleReadyReadState(const ReadyEventData &data); void HandleReadyReadState(const ReadyEventData &data);
void HandleReadyGuildSettings(const ReadyEventData &data); void HandleReadyGuildSettings(const ReadyEventData &data);
void HandleUserGuildSettingsUpdateForDMs(const UserGuildSettingsUpdateData &data);
std::string m_token; std::string m_token;
void AddUserToGuild(Snowflake user_id, Snowflake guild_id); void AddUserToGuild(Snowflake user_id, Snowflake guild_id);