summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/chatmessage.cpp32
-rw-r--r--components/chatmessage.hpp15
-rw-r--r--components/chatwindow.cpp6
-rw-r--r--discord/discord.cpp7
-rw-r--r--discord/message.cpp17
-rw-r--r--discord/message.hpp10
-rw-r--r--discord/store.cpp45
-rw-r--r--discord/store.hpp6
8 files changed, 101 insertions, 37 deletions
diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp
index d6b0cad..c3f4dae 100644
--- a/components/chatmessage.cpp
+++ b/components/chatmessage.cpp
@@ -183,19 +183,15 @@ void ChatMessageTextItem::on_menu_copy_content() {
Gtk::Clipboard::get()->set_text(m_content);
}
-void ChatMessageTextItem::MarkAsDeleted() {
- m_was_deleted = true;
- UpdateAttributes();
-}
-
-void ChatMessageTextItem::MarkAsEdited() {
- m_was_edited = true;
+void ChatMessageTextItem::Update() {
UpdateAttributes();
}
void ChatMessageTextItem::UpdateAttributes() {
- bool deleted = m_was_deleted;
- bool edited = m_was_edited && !m_was_deleted;
+ const auto *data = Abaddon::Get().GetDiscordClient().GetMessage(ID);
+ if (data == nullptr) return;
+ bool deleted = data->IsDeleted();
+ bool edited = data->IsEdited();
auto buf = get_buffer();
buf->set_text(m_content);
@@ -334,14 +330,16 @@ void ChatMessageEmbedItem::DoLayout() {
}
void ChatMessageEmbedItem::UpdateAttributes() {
- bool deleted = m_was_deleted;
- bool edited = m_was_edited && !m_was_deleted;
+ const auto *data = Abaddon::Get().GetDiscordClient().GetMessage(ID);
+ if (data == nullptr) return;
+ bool deleted = data->IsDeleted();
+ bool edited = data->IsEdited();
if (m_attrib_label == nullptr) {
m_attrib_label = Gtk::manage(new Gtk::Label);
m_attrib_label->set_use_markup(true);
m_attrib_label->show();
- m_main->pack_end(*m_attrib_label);
+ m_main->pack_start(*m_attrib_label);
}
if (deleted)
@@ -350,12 +348,6 @@ void ChatMessageEmbedItem::UpdateAttributes() {
m_attrib_label->set_markup(" <span color='#999999'> [edited]</span>");
}
-void ChatMessageEmbedItem::MarkAsDeleted() {
- m_was_deleted = true;
- // UpdateAttributes(); untested
-}
-
-void ChatMessageEmbedItem::MarkAsEdited() {
- m_was_edited = true;
- // UpdateAttributes();
+void ChatMessageEmbedItem::Update() {
+ UpdateAttributes();
}
diff --git a/components/chatmessage.hpp b/components/chatmessage.hpp
index 3c3e29e..e7202a5 100644
--- a/components/chatmessage.hpp
+++ b/components/chatmessage.hpp
@@ -40,8 +40,7 @@ public:
virtual void ShowMenu(const GdkEvent *event);
void AddMenuItem(Gtk::MenuItem *item);
- virtual void MarkAsDeleted() = 0;
- virtual void MarkAsEdited() = 0;
+ virtual void Update() = 0;
protected:
void AttachMenuHandler(Gtk::Widget *widget);
@@ -74,17 +73,13 @@ public:
void EditContent(std::string content);
- virtual void MarkAsDeleted();
- virtual void MarkAsEdited();
+ virtual void Update();
protected:
void UpdateAttributes();
std::string m_content;
- bool m_was_deleted = false;
- bool m_was_edited = false;
-
void on_menu_copy_content();
Gtk::MenuItem *m_menu_copy_content;
Gtk::MenuItem *m_menu_delete_message;
@@ -96,16 +91,12 @@ class ChatMessageEmbedItem
public:
ChatMessageEmbedItem(const Message *data);
- virtual void MarkAsDeleted();
- virtual void MarkAsEdited();
+ virtual void Update();
protected:
void DoLayout();
void UpdateAttributes();
- bool m_was_deleted = false;
- bool m_was_edited = false;
-
EmbedData m_embed;
Gtk::Box *m_main;
Gtk::Label *m_attrib_label = nullptr;
diff --git a/components/chatwindow.cpp b/components/chatwindow.cpp
index 42e0a2c..d8ae2b7 100644
--- a/components/chatwindow.cpp
+++ b/components/chatwindow.cpp
@@ -129,12 +129,14 @@ void ChatWindow::ProcessMessage(const Message *data, bool prepend) {
text->signal_action_message_edit().connect([this](Snowflake channel_id, Snowflake id) {
m_signal_action_message_edit.emit(channel_id, id);
});
+ text->Update();
container->AddNewContent(text, prepend);
m_id_to_widget[data->ID] = text;
} else if (type == ChatDisplayType::Embed) {
auto *widget = Gtk::manage(new ChatMessageEmbedItem(data));
widget->ID = data->ID;
widget->ChannelID = m_active_channel;
+ widget->Update();
container->AddNewContent(widget, prepend);
m_id_to_widget[data->ID] = widget;
}
@@ -266,7 +268,7 @@ void ChatWindow::DeleteMessageInternal() {
// todo actually delete it when it becomes setting
auto *item = m_id_to_widget.at(id);
- item->MarkAsDeleted();
+ item->Update();
}
void ChatWindow::UpdateMessageContentInternal() {
@@ -284,7 +286,7 @@ void ChatWindow::UpdateMessageContentInternal() {
auto *item = dynamic_cast<ChatMessageTextItem *>(m_id_to_widget.at(id));
if (item != nullptr) {
item->EditContent(msg->Content);
- item->MarkAsEdited();
+ item->Update();
}
}
diff --git a/discord/discord.cpp b/discord/discord.cpp
index 470088b..cb997cf 100644
--- a/discord/discord.cpp
+++ b/discord/discord.cpp
@@ -373,6 +373,9 @@ void DiscordClient::HandleGatewayMessageCreate(const GatewayMessage &msg) {
void DiscordClient::HandleGatewayMessageDelete(const GatewayMessage &msg) {
MessageDeleteData data = msg.Data;
m_signal_message_delete.emit(data.ID, data.ChannelID);
+ auto *cur = m_store.GetMessage(data.ID);
+ if (cur != nullptr)
+ cur->SetDeleted();
}
void DiscordClient::HandleGatewayMessageUpdate(const GatewayMessage &msg) {
@@ -385,9 +388,7 @@ void DiscordClient::HandleGatewayMessageUpdate(const GatewayMessage &msg) {
return;
if (data.Content != current->Content) {
- auto copy = *current;
- copy.Content = data.Content;
- m_store.SetMessage(copy.ID, copy);
+ current->SetEdited(data.Content);
m_signal_message_update.emit(data.ID, data.ChannelID);
}
}
diff --git a/discord/message.cpp b/discord/message.cpp
index a622207..044c2e5 100644
--- a/discord/message.cpp
+++ b/discord/message.cpp
@@ -115,3 +115,20 @@ void Message::from_json_edited(const nlohmann::json &j) {
JS_O("type", Type);
JS_O("flags", Flags);
}
+
+void Message::SetDeleted() {
+ m_deleted = true;
+}
+
+void Message::SetEdited(std::string new_content) {
+ m_edited = true;
+ Content = new_content;
+}
+
+bool Message::IsDeleted() const {
+ return m_deleted;
+}
+
+bool Message::IsEdited() const {
+ return m_edited;
+}
diff --git a/discord/message.hpp b/discord/message.hpp
index de312de..2c8fc3d 100644
--- a/discord/message.hpp
+++ b/discord/message.hpp
@@ -147,4 +147,14 @@ struct Message {
friend void from_json(const nlohmann::json &j, Message &m);
void from_json_edited(const nlohmann::json &j); // for MESSAGE_UPDATE
+
+ // custom fields to track changes
+ void SetDeleted();
+ void SetEdited(std::string new_content);
+ bool IsDeleted() const;
+ bool IsEdited() const;
+
+private:
+ bool m_deleted = false;
+ bool m_edited = false;
};
diff --git a/discord/store.cpp b/discord/store.cpp
index 270f16c..fb0bec1 100644
--- a/discord/store.cpp
+++ b/discord/store.cpp
@@ -24,6 +24,13 @@ void Store::SetGuildMemberData(Snowflake guild_id, Snowflake user_id, const Guil
m_members[guild_id][user_id] = data;
}
+User *Store::GetUser(Snowflake id) {
+ auto it = m_users.find(id);
+ if (it == m_users.end())
+ return nullptr;
+ return &it->second;
+}
+
const User *Store::GetUser(Snowflake id) const {
auto it = m_users.find(id);
if (it == m_users.end())
@@ -31,6 +38,13 @@ const User *Store::GetUser(Snowflake id) const {
return &it->second;
}
+Channel *Store::GetChannel(Snowflake id) {
+ auto it = m_channels.find(id);
+ if (it == m_channels.end())
+ return nullptr;
+ return &it->second;
+}
+
const Channel *Store::GetChannel(Snowflake id) const {
auto it = m_channels.find(id);
if (it == m_channels.end())
@@ -38,6 +52,13 @@ const Channel *Store::GetChannel(Snowflake id) const {
return &it->second;
}
+Guild *Store::GetGuild(Snowflake id) {
+ auto it = m_guilds.find(id);
+ if (it == m_guilds.end())
+ return nullptr;
+ return &it->second;
+}
+
const Guild *Store::GetGuild(Snowflake id) const {
auto it = m_guilds.find(id);
if (it == m_guilds.end())
@@ -45,6 +66,13 @@ const Guild *Store::GetGuild(Snowflake id) const {
return &it->second;
}
+Role *Store::GetRole(Snowflake id) {
+ auto it = m_roles.find(id);
+ if (it == m_roles.end())
+ return nullptr;
+ return &it->second;
+}
+
const Role *Store::GetRole(Snowflake id) const {
auto it = m_roles.find(id);
if (it == m_roles.end())
@@ -52,6 +80,13 @@ const Role *Store::GetRole(Snowflake id) const {
return &it->second;
}
+Message *Store::GetMessage(Snowflake id) {
+ auto it = m_messages.find(id);
+ if (it == m_messages.end())
+ return nullptr;
+ return &it->second;
+}
+
const Message *Store::GetMessage(Snowflake id) const {
auto it = m_messages.find(id);
if (it == m_messages.end())
@@ -59,6 +94,16 @@ const Message *Store::GetMessage(Snowflake id) const {
return &it->second;
}
+GuildMember *Store::GetGuildMemberData(Snowflake guild_id, Snowflake user_id) {
+ auto git = m_members.find(guild_id);
+ if (git == m_members.end())
+ return nullptr;
+ auto mit = git->second.find(user_id);
+ if (mit == git->second.end())
+ return nullptr;
+ return &mit->second;
+}
+
const GuildMember *Store::GetGuildMemberData(Snowflake guild_id, Snowflake user_id) const {
auto git = m_members.find(guild_id);
if (git == m_members.end())
diff --git a/discord/store.hpp b/discord/store.hpp
index 398b725..45b1c41 100644
--- a/discord/store.hpp
+++ b/discord/store.hpp
@@ -16,6 +16,12 @@ public:
void SetMessage(Snowflake id, const Message &message);
void SetGuildMemberData(Snowflake guild_id, Snowflake user_id, const GuildMember &data);
+ User *GetUser(Snowflake id);
+ Channel *GetChannel(Snowflake id);
+ Guild *GetGuild(Snowflake id);
+ Role *GetRole(Snowflake id);
+ Message *GetMessage(Snowflake id);
+ GuildMember *GetGuildMemberData(Snowflake guild_id, Snowflake user_id);
const User *GetUser(Snowflake id) const;
const Channel *GetChannel(Snowflake id) const;
const Guild *GetGuild(Snowflake id) const;
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-24 04:51:14 +0000