add MESSAGE_DELETE handling

abaddon.cpp

@@ -83,6 +83,10 @@ void Abaddon::DiscordNotifyMessageCreate(Snowflake id) {
     m_main_window->UpdateChatNewMessage(id);
 }
 
+void Abaddon::DiscordNotifyMessageDelete(Snowflake id, Snowflake channel_id) {
+    m_main_window->UpdateChatMessageDeleted(id, channel_id);
+}
+
 void Abaddon::ActionConnect() {
     if (!m_discord.IsStarted())
         StartDiscord();

abaddon.hpp

@@ -35,6 +35,7 @@ public:
     void DiscordNotifyReady();
     void DiscordNotifyChannelListFullRefresh();
     void DiscordNotifyMessageCreate(Snowflake id);
+    void DiscordNotifyMessageDelete(Snowflake id, Snowflake channel_id);
 
 private:
     DiscordClient m_discord;

components/chatmessage.cpp

@@ -62,3 +62,10 @@ void ChatMessageTextItem::PrependNewContent(std::string content) {
     auto buf = m_text->get_buffer();
     buf->set_text(content + "\n" + buf->get_text());
 }
+
+void ChatMessageTextItem::MarkAsDeleted() {
+    auto buf = m_text->get_buffer();
+    Gtk::TextBuffer::iterator start, end;
+    buf->get_bounds(start, end);
+    buf->insert_markup(end, "<span color='#ff0000'> [deleted]</span>");
+}

components/chatmessage.hpp

@@ -11,6 +11,8 @@ class ChatMessageItem : public Gtk::ListBoxRow {
 public:
     Snowflake ID;
     ChatDisplayType MessageType;
+
+    virtual void MarkAsDeleted() = 0;
 };
 
 class ChatMessageTextItem : public ChatMessageItem {
@@ -18,6 +20,7 @@ public:
     ChatMessageTextItem(const MessageData *data);
     void AppendNewContent(std::string content);
     void PrependNewContent(std::string content);
+    virtual void MarkAsDeleted();
 
 protected:
     Gtk::Box *m_main_box;

components/chatwindow.cpp

@@ -6,6 +6,7 @@ ChatWindow::ChatWindow() {
     m_message_set_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::SetMessagesInternal));
     m_new_message_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::AddNewMessageInternal));
     m_new_history_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::AddNewHistoryInternal));
+    m_message_delete_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::DeleteMessageInternal));
 
     m_main = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
     m_listbox = Gtk::manage(new Gtk::ListBox);
@@ -188,6 +189,12 @@ void ChatWindow::AddNewHistory(const std::vector<MessageData> &msgs) {
     m_new_history_dispatch.emit();
 }
 
+void ChatWindow::DeleteMessage(Snowflake id) {
+    std::scoped_lock<std::mutex> guard(m_update_mutex);
+    m_message_delete_queue.push(id);
+    m_message_delete_dispatch.emit();
+}
+
 void ChatWindow::ClearMessages() {
     std::scoped_lock<std::mutex> guard(m_update_mutex);
     m_message_set_queue.push(std::unordered_set<const MessageData *>());
@@ -230,6 +237,31 @@ void ChatWindow::AddNewHistoryInternal() {
     }
 }
 
+void ChatWindow::DeleteMessageInternal() {
+    Snowflake id;
+    {
+        std::scoped_lock<std::mutex> guard(m_update_mutex);
+        id = m_message_delete_queue.front();
+        m_message_delete_queue.pop();
+    }
+
+    ChatMessageItem *row = nullptr;
+    for (const auto &child : m_listbox->get_children()) {
+        ChatMessageItem *tmp = dynamic_cast<ChatMessageItem *>(child);
+        if (tmp == nullptr) continue;
+        if (tmp->ID == id) {
+            row = tmp;
+            break;
+        }
+    }
+
+    if (row == nullptr) return;
+
+    // todo actually delete it when it becomes setting
+
+    row->MarkAsDeleted();
+}
+
 void ChatWindow::SetMessagesInternal() {
     auto children = m_listbox->get_children();
     auto it = children.begin();

components/chatwindow.hpp

@@ -17,6 +17,7 @@ public:
     void SetMessages(std::unordered_set<const MessageData *> msgs);
     void AddNewMessage(Snowflake id);
     void AddNewHistory(const std::vector<MessageData> &msgs);
+    void DeleteMessage(Snowflake id);
     void ClearMessages();
 
 protected:
@@ -24,6 +25,7 @@ protected:
     void SetMessagesInternal();
     void AddNewMessageInternal();
     void AddNewHistoryInternal();
+    void DeleteMessageInternal();
     ChatDisplayType GetMessageDisplayType(const MessageData *data);
     ChatMessageItem *CreateChatEntryComponentText(const MessageData *data);
     ChatMessageItem *CreateChatEntryComponent(const MessageData *data);
@@ -41,6 +43,8 @@ protected:
     std::queue<Snowflake> m_new_message_queue;
     Glib::Dispatcher m_new_history_dispatch;
     std::queue<std::vector<Snowflake>> m_new_history_queue;
+    Glib::Dispatcher m_message_delete_dispatch;
+    std::queue<Snowflake> m_message_delete_queue;
     std::mutex m_update_mutex;
 
     Snowflake m_active_channel;

discord/discord.cpp

@@ -243,6 +243,9 @@ void DiscordClient::HandleGatewayMessage(std::string str) {
                 case GatewayEvent::MESSAGE_CREATE: {
                     HandleGatewayMessageCreate(m);
                 } break;
+                case GatewayEvent::MESSAGE_DELETE: {
+                    HandleGatewayMessageDelete(m);
+                } break;
             }
         } break;
         default:
@@ -269,6 +272,10 @@ void DiscordClient::HandleGatewayMessageCreate(const GatewayMessage &msg) {
     StoreMessage(data.ID, data);
     m_abaddon->DiscordNotifyMessageCreate(data.ID);
 }
+void DiscordClient::HandleGatewayMessageDelete(const GatewayMessage &msg) {
+    MessageDeleteData data = msg.Data;
+    m_abaddon->DiscordNotifyMessageDelete(data.ID, data.ChannelID);
+}
 
 void DiscordClient::StoreGuild(Snowflake id, const GuildData &g) {
     assert(id.IsValid() && id == g.ID);
@@ -315,4 +322,5 @@ void DiscordClient::SendIdentify() {
 void DiscordClient::LoadEventMap() {
     m_event_map["READY"] = GatewayEvent::READY;
     m_event_map["MESSAGE_CREATE"] = GatewayEvent::MESSAGE_CREATE;
+    m_event_map["MESSAGE_DELETE"] = GatewayEvent::MESSAGE_DELETE;
 }

discord/discord.hpp

@@ -85,6 +85,7 @@ private:
     void HandleGatewayMessage(std::string str);
     void HandleGatewayReady(const GatewayMessage &msg);
     void HandleGatewayMessageCreate(const GatewayMessage &msg);
+    void HandleGatewayMessageDelete(const GatewayMessage &msg);
     void HeartbeatThread();
     void SendIdentify();
 

discord/objects.cpp

@@ -155,6 +155,12 @@ void from_json(const nlohmann::json &j, MessageData &m) {
     JS_O("flags", m.Flags);
 }
 
+void from_json(const nlohmann::json &j, MessageDeleteData &m) {
+    JS_D("id", m.ID);
+    JS_D("channel_id", m.ChannelID);
+    JS_O("guild_id", m.GuildID);
+}
+
 void from_json(const nlohmann::json &j, ReadyEventData &m) {
     JS_D("v", m.GatewayVersion);
     JS_D("user", m.User);

discord/objects.hpp

@@ -62,6 +62,7 @@ enum class GatewayOp : int {
 enum class GatewayEvent : int {
     READY,
     MESSAGE_CREATE,
+    MESSAGE_DELETE,
 };
 
 struct GatewayMessage {

windows/mainwindow.cpp

@@ -110,6 +110,11 @@ void MainWindow::UpdateChatNewMessage(Snowflake id) {
         m_chat.AddNewMessage(id);
 }
 
+void MainWindow::UpdateChatMessageDeleted(Snowflake id, Snowflake channel_id) {
+    if (channel_id == GetChatActiveChannel())
+        m_chat.DeleteMessage(id);
+}
+
 void MainWindow::UpdateChatPrependHistory(const std::vector<MessageData> &msgs) {
     m_chat.AddNewHistory(msgs);
 }

windows/mainwindow.hpp

@@ -16,6 +16,7 @@ public:
     void UpdateChatActiveChannel(Snowflake id);
     Snowflake GetChatActiveChannel() const;
     void UpdateChatNewMessage(Snowflake id);
+    void UpdateChatMessageDeleted(Snowflake id, Snowflake channel_id);
     void UpdateChatPrependHistory(const std::vector<MessageData> &msgs);
 
 protected: