add MESSAGE_DELETE handling

This commit is contained in:
ouwou
2020-08-29 01:14:07 -04:00
parent 4e7ae1af1d
commit 299ecc71d9
12 changed files with 73 additions and 0 deletions

View File

@@ -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>");
}

View File

@@ -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;

View File

@@ -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();

View File

@@ -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;