summaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/channels.cpp55
-rw-r--r--src/components/channels.hpp4
-rw-r--r--src/components/channelscellrenderer.cpp95
-rw-r--r--src/components/chatmessage.cpp114
-rw-r--r--src/components/chatmessage.hpp7
5 files changed, 229 insertions, 46 deletions
diff --git a/src/components/channels.cpp b/src/components/channels.cpp
index 28eb288..99bd07b 100644
--- a/src/components/channels.cpp
+++ b/src/components/channels.cpp
@@ -22,7 +22,8 @@ ChannelList::ChannelList()
, m_menu_thread_copy_id("_Copy ID", true)
, m_menu_thread_leave("_Leave", true)
, m_menu_thread_archive("_Archive", true)
- , m_menu_thread_unarchive("_Unarchive", true) {
+ , m_menu_thread_unarchive("_Unarchive", true)
+ , m_menu_thread_mark_as_read("Mark as _Read", true) {
get_style_context()->add_class("channel-list");
// todo: move to method
@@ -161,6 +162,15 @@ ChannelList::ChannelList()
else if (Abaddon::Get().ShowConfirm("Are you sure you want to leave this group DM?"))
Abaddon::Get().GetDiscordClient().CloseDM(id);
});
+ m_menu_dm_toggle_mute.signal_activate().connect([this] {
+ const auto id = static_cast<Snowflake>((*m_model->get_iter(m_path_for_menu))[m_columns.m_id]);
+ auto &discord = Abaddon::Get().GetDiscordClient();
+ if (discord.IsChannelMuted(id))
+ discord.UnmuteChannel(id, NOOP_CALLBACK);
+ else
+ discord.MuteChannel(id, NOOP_CALLBACK);
+ });
+ m_menu_dm.append(m_menu_dm_toggle_mute);
m_menu_dm.append(m_menu_dm_close);
m_menu_dm.append(m_menu_dm_copy_id);
m_menu_dm.show_all();
@@ -178,15 +188,29 @@ ChannelList::ChannelList()
m_menu_thread_unarchive.signal_activate().connect([this] {
Abaddon::Get().GetDiscordClient().UnArchiveThread(static_cast<Snowflake>((*m_model->get_iter(m_path_for_menu))[m_columns.m_id]), [](...) {});
});
- m_menu_thread.append(m_menu_thread_copy_id);
+ m_menu_thread_mark_as_read.signal_activate().connect([this] {
+ Abaddon::Get().GetDiscordClient().MarkChannelAsRead(static_cast<Snowflake>((*m_model->get_iter(m_path_for_menu))[m_columns.m_id]), NOOP_CALLBACK);
+ });
+ m_menu_thread_toggle_mute.signal_activate().connect([this] {
+ const auto id = static_cast<Snowflake>((*m_model->get_iter(m_path_for_menu))[m_columns.m_id]);
+ auto &discord = Abaddon::Get().GetDiscordClient();
+ if (discord.IsChannelMuted(id))
+ discord.UnmuteThread(id, NOOP_CALLBACK);
+ else
+ discord.MuteThread(id, NOOP_CALLBACK);
+ });
+ m_menu_thread.append(m_menu_thread_mark_as_read);
+ m_menu_thread.append(m_menu_thread_toggle_mute);
m_menu_thread.append(m_menu_thread_leave);
m_menu_thread.append(m_menu_thread_archive);
m_menu_thread.append(m_menu_thread_unarchive);
+ m_menu_thread.append(m_menu_thread_copy_id);
m_menu_thread.show_all();
m_menu_guild.signal_popped_up().connect(sigc::mem_fun(*this, &ChannelList::OnGuildSubmenuPopup));
m_menu_category.signal_popped_up().connect(sigc::mem_fun(*this, &ChannelList::OnCategorySubmenuPopup));
m_menu_channel.signal_popped_up().connect(sigc::mem_fun(*this, &ChannelList::OnChannelSubmenuPopup));
+ m_menu_dm.signal_popped_up().connect(sigc::mem_fun(*this, &ChannelList::OnDMSubmenuPopup));
m_menu_thread.signal_popped_up().connect(sigc::mem_fun(*this, &ChannelList::OnThreadSubmenuPopup));
auto &discord = Abaddon::Get().GetDiscordClient();
@@ -728,7 +752,13 @@ void ChannelList::AddPrivateChannels() {
else if (dm->Type == ChannelType::GROUP_DM)
row[m_columns.m_name] = std::to_string(recipients.size()) + " members";
- if (top_recipient.has_value()) {
+ if (dm->HasIcon()) {
+ const auto cb = [this, iter](const Glib::RefPtr<Gdk::Pixbuf> &pb) {
+ if (iter)
+ (*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR);
+ };
+ img.LoadFromURL(dm->GetIconURL(), sigc::track_obj(cb, *this));
+ } else if (top_recipient.has_value()) {
const auto cb = [this, iter](const Glib::RefPtr<Gdk::Pixbuf> &pb) {
if (iter)
(*iter)[m_columns.m_icon] = pb->scale_simple(DMIconSize, DMIconSize, Gdk::INTERP_BILINEAR);
@@ -887,6 +917,16 @@ void ChannelList::OnChannelSubmenuPopup(const Gdk::Rectangle *flipped_rect, cons
m_menu_channel_toggle_mute.set_label("Mute");
}
+void ChannelList::OnDMSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y) {
+ auto iter = m_model->get_iter(m_path_for_menu);
+ if (!iter) return;
+ const auto id = static_cast<Snowflake>((*iter)[m_columns.m_id]);
+ if (Abaddon::Get().GetDiscordClient().IsChannelMuted(id))
+ m_menu_dm_toggle_mute.set_label("Unmute");
+ else
+ m_menu_dm_toggle_mute.set_label("Mute");
+}
+
void ChannelList::OnThreadSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y) {
m_menu_thread_archive.set_visible(false);
m_menu_thread_unarchive.set_visible(false);
@@ -894,7 +934,14 @@ void ChannelList::OnThreadSubmenuPopup(const Gdk::Rectangle *flipped_rect, const
auto &discord = Abaddon::Get().GetDiscordClient();
auto iter = m_model->get_iter(m_path_for_menu);
if (!iter) return;
- auto channel = discord.GetChannel(static_cast<Snowflake>((*iter)[m_columns.m_id]));
+ const auto id = static_cast<Snowflake>((*iter)[m_columns.m_id]);
+
+ if (discord.IsChannelMuted(id))
+ m_menu_thread_toggle_mute.set_label("Unmute");
+ else
+ m_menu_thread_toggle_mute.set_label("Mute");
+
+ auto channel = discord.GetChannel(id);
if (!channel.has_value() || !channel->ThreadMetadata.has_value()) return;
if (!discord.HasGuildPermission(discord.GetUserData().ID, *channel->GuildID, Permission::MANAGE_THREADS)) return;
diff --git a/src/components/channels.hpp b/src/components/channels.hpp
index ba75be8..a2553fd 100644
--- a/src/components/channels.hpp
+++ b/src/components/channels.hpp
@@ -124,16 +124,20 @@ protected:
Gtk::Menu m_menu_dm;
Gtk::MenuItem m_menu_dm_copy_id;
Gtk::MenuItem m_menu_dm_close;
+ Gtk::MenuItem m_menu_dm_toggle_mute;
Gtk::Menu m_menu_thread;
Gtk::MenuItem m_menu_thread_copy_id;
Gtk::MenuItem m_menu_thread_leave;
Gtk::MenuItem m_menu_thread_archive;
Gtk::MenuItem m_menu_thread_unarchive;
+ Gtk::MenuItem m_menu_thread_mark_as_read;
+ Gtk::MenuItem m_menu_thread_toggle_mute;
void OnGuildSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
void OnCategorySubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
void OnChannelSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
+ void OnDMSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
void OnThreadSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y);
bool m_updating_listing = false;
diff --git a/src/components/channelscellrenderer.cpp b/src/components/channelscellrenderer.cpp
index 16fd25f..141556a 100644
--- a/src/components/channelscellrenderer.cpp
+++ b/src/components/channelscellrenderer.cpp
@@ -214,6 +214,8 @@ void CellRendererChannels::render_vfunc_guild(const Cairo::RefPtr<Cairo::Context
Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
+ m_renderer_text.property_foreground_rgba() = color;
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
const bool hover_only = Abaddon::Get().GetSettings().AnimatedGuildHoverOnly;
@@ -247,6 +249,7 @@ void CellRendererChannels::render_vfunc_guild(const Cairo::RefPtr<Cairo::Context
}
// unread
+ if (!Abaddon::Get().GetSettings().Unreads) return;
const auto id = m_property_id.get_value();
@@ -255,7 +258,8 @@ void CellRendererChannels::render_vfunc_guild(const Cairo::RefPtr<Cairo::Context
const auto has_unread = discord.GetUnreadStateForGuild(id, total_mentions);
if (has_unread && !discord.IsGuildMuted(id)) {
- cr->set_source_rgb(1.0, 1.0, 1.0);
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
+ cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
const auto x = background_area.get_x();
const auto y = background_area.get_y();
const auto w = background_area.get_width();
@@ -327,9 +331,16 @@ void CellRendererChannels::render_vfunc_category(const Cairo::RefPtr<Cairo::Cont
Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
- static Gdk::RGBA muted_color("#7f7f7f");
- if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value()))
- m_renderer_text.property_foreground_rgba() = muted_color;
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
+ if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value())) {
+ auto muted = color;
+ muted.set_red(muted.get_red() * 0.5);
+ muted.set_green(muted.get_green() * 0.5);
+ muted.set_blue(muted.get_blue() * 0.5);
+ m_renderer_text.property_foreground_rgba() = muted;
+ } else {
+ m_renderer_text.property_foreground_rgba() = color;
+ }
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
m_renderer_text.property_foreground_set() = false;
}
@@ -367,10 +378,10 @@ void CellRendererChannels::render_vfunc_channel(const Cairo::RefPtr<Cairo::Conte
const auto id = m_property_id.get_value();
const bool is_muted = discord.IsChannelMuted(id);
- // move to style in msys?
- static Gdk::RGBA sfw_unmuted("#FFFFFF");
+ static const auto sfw_unmuted = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
- const auto nsfw_color = Gdk::RGBA(Abaddon::Get().GetSettings().NSFWChannelColor);
+ m_renderer_text.property_sensitive() = false;
+ static const auto nsfw_color = Gdk::RGBA(Abaddon::Get().GetSettings().NSFWChannelColor);
if (m_property_nsfw.get_value())
m_renderer_text.property_foreground_rgba() = nsfw_color;
else
@@ -387,12 +398,14 @@ void CellRendererChannels::render_vfunc_channel(const Cairo::RefPtr<Cairo::Conte
m_renderer_text.property_foreground_set() = false;
// unread
+ if (!Abaddon::Get().GetSettings().Unreads) return;
const auto unread_state = discord.GetUnreadStateForChannel(id);
if (unread_state < 0) return;
if (!is_muted) {
- cr->set_source_rgb(1.0, 1.0, 1.0);
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
+ cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
const auto x = background_area.get_x();
const auto y = background_area.get_y();
const auto w = background_area.get_width();
@@ -438,7 +451,48 @@ void CellRendererChannels::render_vfunc_thread(const Cairo::RefPtr<Cairo::Contex
const int text_h = natural_size.height;
Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
+
+ auto &discord = Abaddon::Get().GetDiscordClient();
+ const auto id = m_property_id.get_value();
+ const bool is_muted = discord.IsChannelMuted(id);
+
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
+ if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value())) {
+ auto muted = color;
+ muted.set_red(muted.get_red() * 0.5);
+ muted.set_green(muted.get_green() * 0.5);
+ muted.set_blue(muted.get_blue() * 0.5);
+ m_renderer_text.property_foreground_rgba() = muted;
+ } else {
+ m_renderer_text.property_foreground_rgba() = color;
+ }
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
+ m_renderer_text.property_foreground_set() = false;
+
+ // unread
+ if (!Abaddon::Get().GetSettings().Unreads) return;
+
+ const auto unread_state = discord.GetUnreadStateForChannel(id);
+ if (unread_state < 0) return;
+
+ if (!is_muted) {
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
+ cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
+ const auto x = background_area.get_x();
+ const auto y = background_area.get_y();
+ const auto w = background_area.get_width();
+ const auto h = background_area.get_height();
+ cr->rectangle(x, y, 3, h);
+ cr->fill();
+ }
+
+ if (unread_state < 1) return;
+ auto *paned = static_cast<Gtk::Paned *>(widget.get_ancestor(Gtk::Paned::get_type()));
+ if (paned != nullptr) {
+ const auto edge = std::min(paned->get_position(), cell_area.get_width());
+
+ unread_render_mentions(cr, widget, unread_state, edge, cell_area);
+ }
}
// dm header
@@ -466,6 +520,8 @@ void CellRendererChannels::render_vfunc_dmheader(const Cairo::RefPtr<Cairo::Cont
cell_area.get_width(), cell_area.get_height());
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
+ if (!Abaddon::Get().GetSettings().Unreads) return;
+
auto *paned = static_cast<Gtk::Paned *>(widget.get_ancestor(Gtk::Paned::get_type()));
if (paned != nullptr) {
const auto edge = std::min(paned->get_position(), background_area.get_width());
@@ -537,8 +593,16 @@ void CellRendererChannels::render_vfunc_dm(const Cairo::RefPtr<Cairo::Context> &
const auto id = m_property_id.get_value();
const bool is_muted = discord.IsChannelMuted(id);
- if (is_muted)
- m_renderer_text.property_foreground() = "#7f7f7f";
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
+ if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value())) {
+ auto muted = color;
+ muted.set_red(muted.get_red() * 0.5);
+ muted.set_green(muted.get_green() * 0.5);
+ muted.set_blue(muted.get_blue() * 0.5);
+ m_renderer_text.property_foreground_rgba() = muted;
+ } else {
+ m_renderer_text.property_foreground_rgba() = color;
+ }
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
m_renderer_text.property_foreground_set() = false;
@@ -547,12 +611,14 @@ void CellRendererChannels::render_vfunc_dm(const Cairo::RefPtr<Cairo::Context> &
cr->fill();
// unread
+ if (!Abaddon::Get().GetSettings().Unreads) return;
const auto unread_state = discord.GetUnreadStateForChannel(id);
if (unread_state < 0) return;
if (!is_muted) {
- cr->set_source_rgb(1.0, 1.0, 1.0);
+ static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
+ cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
const auto x = background_area.get_x();
const auto y = background_area.get_y();
const auto w = background_area.get_width();
@@ -585,12 +651,15 @@ void CellRendererChannels::unread_render_mentions(const Cairo::RefPtr<Cairo::Con
int width, height;
layout->get_pixel_size(width, height);
{
+ static const auto bg = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeColor);
+ static const auto text = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeTextColor);
+
const auto x = cell_area.get_x() + edge - width - MentionsRightPad;
const auto y = cell_area.get_y() + cell_area.get_height() / 2.0 - height / 2.0 - 1;
cairo_path_rounded_rect(cr, x - 4, y + 2, width + 8, height, 5);
- cr->set_source_rgb(184.0 / 255.0, 37.0 / 255.0, 37.0 / 255.0);
+ cr->set_source_rgb(bg.get_red(), bg.get_green(), bg.get_blue());
cr->fill();
- cr->set_source_rgb(1.0, 1.0, 1.0);
+ cr->set_source_rgb(text.get_red(), text.get_green(), text.get_blue());
cr->move_to(x, y);
layout->show_in_cairo_context(cr);
}
diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp
index ef972bb..823aaa6 100644
--- a/src/components/chatmessage.cpp
+++ b/src/components/chatmessage.cpp
@@ -1,7 +1,7 @@
-#include "chatmessage.hpp"
#include "abaddon.hpp"
-#include "util.hpp"
+#include "chatmessage.hpp"
#include "lazyimage.hpp"
+#include "util.hpp"
#include <unordered_map>
constexpr static int EmojiSize = 24; // settings eventually
@@ -44,18 +44,9 @@ ChatMessageItemContainer *ChatMessageItemContainer::FromMessage(const Message &d
}
}
- // there should only ever be 1 embed (i think?)
- if (data.Embeds.size() == 1) {
- const auto &embed = data.Embeds[0];
- if (IsEmbedImageOnly(embed)) {
- auto *widget = container->CreateImageComponent(*embed.Thumbnail->ProxyURL, *embed.Thumbnail->URL, *embed.Thumbnail->Width, *embed.Thumbnail->Height);
- container->AttachEventHandlers(*widget);
- container->m_main.add(*widget);
- } else {
- container->m_embed_component = container->CreateEmbedComponent(embed);
- container->AttachEventHandlers(*container->m_embed_component);
- container->m_main.add(*container->m_embed_component);
- }
+ if (!data.Embeds.empty()) {
+ container->m_embed_component = container->CreateEmbedsComponent(data.Embeds);
+ container->m_main.add(*container->m_embed_component);
}
// i dont think attachments can be edited
@@ -108,10 +99,11 @@ void ChatMessageItemContainer::UpdateContent() {
m_embed_component = nullptr;
}
- if (data->Embeds.size() == 1) {
- m_embed_component = CreateEmbedComponent(data->Embeds[0]);
+ if (!data->Embeds.empty()) {
+ m_embed_component = CreateEmbedsComponent(data->Embeds);
AttachEventHandlers(*m_embed_component);
m_main.add(*m_embed_component);
+ m_embed_component->show_all();
}
}
@@ -199,6 +191,7 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
case MessageType::DEFAULT:
case MessageType::INLINE_REPLY:
b->insert(s, data->Content);
+ HandleRoleMentions(b);
HandleUserMentions(b);
HandleLinks(*tv);
HandleChannelMentions(tv);
@@ -298,6 +291,24 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
}
}
+Gtk::Widget *ChatMessageItemContainer::CreateEmbedsComponent(const std::vector<EmbedData> &embeds) {
+ auto *box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ for (const auto &embed : embeds) {
+ if (IsEmbedImageOnly(embed)) {
+ auto *widget = CreateImageComponent(*embed.Thumbnail->ProxyURL, *embed.Thumbnail->URL, *embed.Thumbnail->Width, *embed.Thumbnail->Height);
+ widget->show();
+ AttachEventHandlers(*widget);
+ box->add(*widget);
+ } else {
+ auto *widget = CreateEmbedComponent(embed);
+ widget->show();
+ AttachEventHandlers(*widget);
+ box->add(*widget);
+ }
+ }
+ return box;
+}
+
Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &embed) {
Gtk::EventBox *ev = Gtk::manage(new Gtk::EventBox);
ev->set_can_focus(true);
@@ -530,6 +541,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateStickersComponent(const std::vector
if (sticker.FormatType != StickerFormatType::PNG && sticker.FormatType != StickerFormatType::APNG) continue;
auto *ev = Gtk::manage(new Gtk::EventBox);
auto *img = Gtk::manage(new LazyImage(sticker.GetURL(), StickerComponentSize, StickerComponentSize, false));
+ img->set_halign(Gtk::ALIGN_START);
img->set_size_request(StickerComponentSize, StickerComponentSize); // should this go in LazyImage ?
img->show();
ev->show();
@@ -732,7 +744,47 @@ bool ChatMessageItemContainer::IsEmbedImageOnly(const EmbedData &data) {
return data.Thumbnail->ProxyURL.has_value() && data.Thumbnail->URL.has_value() && data.Thumbnail->Width.has_value() && data.Thumbnail->Height.has_value();
}
-void ChatMessageItemContainer::HandleUserMentions(Glib::RefPtr<Gtk::TextBuffer> buf) {
+void ChatMessageItemContainer::HandleRoleMentions(const Glib::RefPtr<Gtk::TextBuffer> &buf) {
+ constexpr static const auto mentions_regex = R"(<@&(\d+)>)";
+
+ static auto rgx = Glib::Regex::create(mentions_regex);
+
+ Glib::ustring text = GetText(buf);
+ const auto &discord = Abaddon::Get().GetDiscordClient();
+
+ int startpos = 0;
+ Glib::MatchInfo match;
+ while (rgx->match(text, startpos, match)) {
+ int mstart, mend;
+ if (!match.fetch_pos(0, mstart, mend)) break;
+ const Glib::ustring role_id = match.fetch(1);
+ const auto role = discord.GetRole(role_id);
+ if (!role.has_value()) {
+ startpos = mend;
+ continue;
+ }
+
+ Glib::ustring replacement;
+ if (role->HasColor()) {
+ replacement = "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">@" + role->GetEscapedName() + "</span></b>";
+ } else {
+ replacement = "<b>@" + role->GetEscapedName() + "</b>";
+ }
+
+ const auto chars_start = g_utf8_pointer_to_offset(text.c_str(), text.c_str() + mstart);
+ const auto chars_end = g_utf8_pointer_to_offset(text.c_str(), text.c_str() + mend);
+ const auto start_it = buf->get_iter_at_offset(chars_start);
+ const auto end_it = buf->get_iter_at_offset(chars_end);
+
+ auto it = buf->erase(start_it, end_it);
+ buf->insert_markup(it, replacement);
+
+ text = GetText(buf);
+ startpos = 0;
+ }
+}
+
+void ChatMessageItemContainer::HandleUserMentions(const Glib::RefPtr<Gtk::TextBuffer> &buf) {
constexpr static const auto mentions_regex = R"(<@!?(\d+)>)";
static auto rgx = Glib::Regex::create(mentions_regex);
@@ -1064,11 +1116,11 @@ ChatMessageHeader::ChatMessageHeader(const Message &data)
};
img.LoadFromURL(author->GetAvatarURL(data.GuildID), sigc::track_obj(cb, *this));
- if (author->HasAnimatedAvatar()) {
+ if (author->HasAnimatedAvatar(data.GuildID)) {
auto cb = [this](const Glib::RefPtr<Gdk::PixbufAnimation> &pb) {
m_anim_avatar = pb;
};
- img.LoadAnimationFromURL(author->GetAvatarURL("gif"), AvatarSize, AvatarSize, sigc::track_obj(cb, *this));
+ img.LoadAnimationFromURL(author->GetAvatarURL(data.GuildID, "gif"), AvatarSize, AvatarSize, sigc::track_obj(cb, *this));
}
get_style_context()->add_class("message-container");
@@ -1079,11 +1131,10 @@ ChatMessageHeader::ChatMessageHeader(const Message &data)
m_avatar.set_valign(Gtk::ALIGN_START);
m_avatar.set_margin_right(10);
- m_author.set_markup(data.Author.GetEscapedBoldName());
m_author.set_single_line_mode(true);
m_author.set_line_wrap(false);
m_author.set_ellipsize(Pango::ELLIPSIZE_END);
- m_author.set_xalign(0.f);
+ m_author.set_xalign(0.0F);
m_author.set_can_focus(false);
m_meta_ev.signal_button_press_event().connect(sigc::mem_fun(*this, &ChatMessageHeader::on_author_button_press));
@@ -1160,30 +1211,32 @@ ChatMessageHeader::ChatMessageHeader(const Message &data)
show_all();
auto &discord = Abaddon::Get().GetDiscordClient();
- auto role_update_cb = [this](...) { UpdateNameColor(); };
+ auto role_update_cb = [this](...) { UpdateName(); };
discord.signal_role_update().connect(sigc::track_obj(role_update_cb, *this));
- auto guild_member_update_cb = [this](const auto &, const auto &) { UpdateNameColor(); };
+ auto guild_member_update_cb = [this](const auto &, const auto &) { UpdateName(); };
discord.signal_guild_member_update().connect(sigc::track_obj(guild_member_update_cb, *this));
- UpdateNameColor();
+ UpdateName();
AttachUserMenuHandler(m_meta_ev);
AttachUserMenuHandler(m_avatar_ev);
}
-void ChatMessageHeader::UpdateNameColor() {
+void ChatMessageHeader::UpdateName() {
const auto &discord = Abaddon::Get().GetDiscordClient();
const auto user = discord.GetUser(UserID);
if (!user.has_value()) return;
const auto chan = discord.GetChannel(ChannelID);
bool is_guild = chan.has_value() && chan->GuildID.has_value();
if (is_guild) {
+ const auto member = discord.GetMember(UserID, *chan->GuildID);
const auto role_id = discord.GetMemberHoistedRole(*chan->GuildID, UserID, true);
const auto role = discord.GetRole(role_id);
+ const auto name = GetEscapedDisplayName(*user, member);
std::string md;
if (role.has_value())
- m_author.set_markup("<span weight='bold' color='#" + IntToCSSColor(role->Color) + "'>" + user->GetEscapedName() + "</span>");
+ m_author.set_markup("<span weight='bold' color='#" + IntToCSSColor(role->Color) + "'>" + name + "</span>");
else
- m_author.set_markup("<span weight='bold'>" + user->GetEscapedName() + "</span>");
+ m_author.set_markup("<span weight='bold'>" + name + "</span>");
} else
m_author.set_markup("<span weight='bold'>" + user->GetEscapedName() + "</span>");
}
@@ -1207,6 +1260,13 @@ void ChatMessageHeader::AttachUserMenuHandler(Gtk::Widget &widget) {
});
}
+Glib::ustring ChatMessageHeader::GetEscapedDisplayName(const UserData &user, const std::optional<GuildMember> &member) {
+ if (member.has_value() && !member->Nickname.empty())
+ return Glib::Markup::escape_text(member->Nickname);
+ else
+ return Glib::Markup::escape_text(user.GetEscapedName());
+}
+
bool ChatMessageHeader::on_author_button_press(GdkEventButton *ev) {
if (ev->button == GDK_BUTTON_PRIMARY && (ev->state & GDK_SHIFT_MASK)) {
m_signal_action_insert_mention.emit();
diff --git a/src/components/chatmessage.hpp b/src/components/chatmessage.hpp
index 8b69117..5e213ee 100644
--- a/src/components/chatmessage.hpp
+++ b/src/components/chatmessage.hpp
@@ -22,6 +22,7 @@ protected:
void AddClickHandler(Gtk::Widget *widget, std::string);
Gtk::TextView *CreateTextComponent(const Message &data); // Message.Content
void UpdateTextComponent(Gtk::TextView *tv);
+ Gtk::Widget *CreateEmbedsComponent(const std::vector<EmbedData> &embeds);
Gtk::Widget *CreateEmbedComponent(const EmbedData &data); // Message.Embeds[0]
Gtk::Widget *CreateImageComponent(const std::string &proxy_url, const std::string &url, int inw, int inh);
Gtk::Widget *CreateAttachmentComponent(const AttachmentData &data); // non-image attachments
@@ -34,7 +35,8 @@ protected:
static bool IsEmbedImageOnly(const EmbedData &data);
- void HandleUserMentions(Glib::RefPtr<Gtk::TextBuffer> buf);
+ void HandleRoleMentions(const Glib::RefPtr<Gtk::TextBuffer> &buf);
+ void HandleUserMentions(const Glib::RefPtr<Gtk::TextBuffer> &buf);
void HandleStockEmojis(Gtk::TextView &tv);
void HandleCustomEmojis(Gtk::TextView &tv);
void HandleEmojis(Gtk::TextView &tv);
@@ -89,11 +91,12 @@ public:
ChatMessageHeader(const Message &data);
void AddContent(Gtk::Widget *widget, bool prepend);
- void UpdateNameColor();
+ void UpdateName();
std::vector<Gtk::Widget *> GetChildContent();
protected:
void AttachUserMenuHandler(Gtk::Widget &widget);
+ static Glib::ustring GetEscapedDisplayName(const UserData &user, const std::optional<GuildMember> &member);
bool on_author_button_press(GdkEventButton *ev);
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-23 21:35:33 +0000