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

improve MESSAGE_UPDATE handling (hopefully)

Browse Source
This commit is contained in:
ouwou
2020-09-20 01:12:54 -04:00
parent 83b480742b
commit 4b7cdbd129
10 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
discord/discord.cpp
View File

@@ -387,18 +387,16 @@ void DiscordClient::HandleGatewayMessageDelete(const GatewayMessage &msg) {
}
void DiscordClient::HandleGatewayMessageUpdate(const GatewayMessage &msg) {
// less than stellar way of doing this probably
Message data;
data.from_json_edited(msg.Data);
Snowflake id = msg.Data.at("id");
auto *current = m_store.GetMessage(data.ID);
auto *current = m_store.GetMessage(id);
if (current == nullptr)
return;
if (data.Content != current->Content) {
current->SetEdited(data.Content);
m_signal_message_update.emit(data.ID, data.ChannelID);
}
current->from_json_edited(msg.Data);
current->SetEdited();
m_signal_message_update.emit(id, current->ChannelID);
}
void DiscordClient::HandleGatewayGuildMemberListUpdate(const GatewayMessage &msg) {

7
discord/message.cpp
View File

@@ -79,6 +79,8 @@ void from_json(const nlohmann::json &j, Message &m) {
JS_D("content", m.Content);
JS_D("timestamp", m.Timestamp);
JS_N("edited_timestamp", m.EditedTimestamp);
if (!j.at("edited_timestamp").is_null())
m.SetEdited();
JS_D("tts", m.IsTTS);
JS_D("mention_everyone", m.DoesMentionEveryone);
JS_D("mentions", m.Mentions);
@@ -97,7 +99,6 @@ void from_json(const nlohmann::json &j, Message &m) {
JS_O("flags", m.Flags);
}
// probably gonna need to return present keys
void Message::from_json_edited(const nlohmann::json &j) {
JS_D("id", ID);
JS_D("channel_id", ChannelID);
@@ -109,6 +110,7 @@ void Message::from_json_edited(const nlohmann::json &j) {
JS_O("tts", IsTTS);
JS_O("mention_everyone", DoesMentionEveryone);
JS_O("mentions", Mentions);
JS_O("embeds", Embeds);
JS_O("nonce", Nonce);
JS_O("pinned", IsPinned);
JS_O("webhook_id", WebhookID);
@@ -120,9 +122,8 @@ void Message::SetDeleted() {
m_deleted = true;
}
void Message::SetEdited(std::string new_content) {
void Message::SetEdited() {
m_edited = true;
Content = new_content;
}
bool Message::IsDeleted() const {

2
discord/message.hpp
View File

@@ -150,7 +150,7 @@ struct Message {
// custom fields to track changes
void SetDeleted();
void SetEdited(std::string new_content);
void SetEdited();
bool IsDeleted() const;
bool IsEdited() const;