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

MessageData -> Message (whoops)

Browse Source
This commit is contained in:
ouwou
2020-09-09 23:59:40 -04:00
parent 51cf8fd2df
commit 6ae9cc915d
10 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/chatmessage.cpp
View File

@@ -4,7 +4,7 @@
#include "../abaddon.hpp"
#include "../util.hpp"
ChatMessageContainer::ChatMessageContainer(const MessageData *data) {
ChatMessageContainer::ChatMessageContainer(const Message *data) {
UserID = data->Author.ID;
ChannelID = data->ChannelID;
@@ -141,7 +141,7 @@ void ChatMessageItem::AddMenuItem(Gtk::MenuItem *item) {
m_menu.append(*item);
}
ChatMessageTextItem::ChatMessageTextItem(const MessageData *data) {
ChatMessageTextItem::ChatMessageTextItem(const Message *data) {
m_content = data->Content;
get_style_context()->add_class("message-text");
@@ -196,7 +196,7 @@ void ChatMessageTextItem::UpdateAttributes() {
}
}
ChatMessageEmbedItem::ChatMessageEmbedItem(const MessageData *data) {
ChatMessageEmbedItem::ChatMessageEmbedItem(const Message *data) {
m_embed = data->Embeds[0];
DoLayout();

7
components/chatmessage.hpp
View File

@@ -8,6 +8,7 @@ enum class ChatDisplayType {
Unknown,
Text,
Embed,
Image,
};
// contains the username and timestamp, chat items get stuck into its box
@@ -16,7 +17,7 @@ public:
Snowflake UserID;
Snowflake ChannelID;
ChatMessageContainer(const MessageData *data);
ChatMessageContainer(const Message *data);
void AddNewContent(Gtk::Widget *widget, bool prepend = false);
void Update();
@@ -68,7 +69,7 @@ class ChatMessageTextItem
: public Gtk::TextView // oh well
, public ChatMessageItem {
public:
ChatMessageTextItem(const MessageData *data);
ChatMessageTextItem(const Message *data);
void EditContent(std::string content);
@@ -92,7 +93,7 @@ class ChatMessageEmbedItem
: public Gtk::EventBox
, public ChatMessageItem {
public:
ChatMessageEmbedItem(const MessageData *data);
ChatMessageEmbedItem(const Message *data);
virtual void MarkAsDeleted();
virtual void MarkAsEdited();

6
components/chatwindow.cpp
View File

@@ -82,7 +82,7 @@ Snowflake ChatWindow::GetActiveChannel() const {
return m_active_channel;
}
ChatDisplayType ChatWindow::GetMessageDisplayType(const MessageData *data) {
ChatDisplayType ChatWindow::GetMessageDisplayType(const Message *data) {
if (data->Type == MessageType::DEFAULT && data->Content.size() > 0)
return ChatDisplayType::Text;
else if (data->Type == MessageType::DEFAULT && data->Embeds.size() > 0)
@@ -91,7 +91,7 @@ ChatDisplayType ChatWindow::GetMessageDisplayType(const MessageData *data) {
return ChatDisplayType::Unknown;
}
void ChatWindow::ProcessMessage(const MessageData *data, bool prepend) {
void ChatWindow::ProcessMessage(const Message *data, bool prepend) {
if (!Abaddon::Get().GetDiscordClient().IsStarted()) return;
ChatMessageContainer *last_row = nullptr;
@@ -307,7 +307,7 @@ void ChatWindow::SetMessagesInternal() {
}
// sort
std::map<Snowflake, const MessageData *> sorted_messages;
std::map<Snowflake, const Message *> sorted_messages;
for (const auto id : *msgs)
sorted_messages[id] = Abaddon::Get().GetDiscordClient().GetMessage(id);

4
components/chatwindow.hpp
View File

@@ -29,8 +29,8 @@ protected:
void AddNewHistoryInternal();
void DeleteMessageInternal();
void UpdateMessageContentInternal();
ChatDisplayType GetMessageDisplayType(const MessageData *data);
void ProcessMessage(const MessageData *data, bool prepend = false);
ChatDisplayType GetMessageDisplayType(const Message *data);
void ProcessMessage(const Message *data, bool prepend = false);
int m_num_rows = 0; // youd think thered be a Gtk::ListBox::get_row_count or something but nope
std::unordered_map<Snowflake, ChatMessageItem *> m_id_to_widget;