celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-27 16:16:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

show @ in reply markup if reply is a mention

Browse Source
This commit is contained in:
ouwou
2023-12-04 01:50:16 -05:00
parent 6b436918f8
commit 260fc2a745
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/chatmessage.cpp
View File

@@ -661,7 +661,12 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
if (role.has_value()) { if (role.has_value()) {
const auto author = discord.GetUser(author_id); const auto author = discord.GetUser(author_id);
if (author.has_value()) { if (author.has_value()) {
return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetDisplayNameEscaped(guild_id) + "</span></b>"; const auto is_mention = !data.Interaction.has_value() && data.DoesMention(author_id);
if (is_mention) {
return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">@" + author->GetDisplayNameEscaped(guild_id) + "</span></b>";
} else {
return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetDisplayNameEscaped(guild_id) + "</span></b>";
}
} }
} }
} }
@@ -717,16 +722,12 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
HandleChannelMentions(buf); HandleChannelMentions(buf);
text = Glib::Markup::escape_text(buf->get_text()); text = Glib::Markup::escape_text(buf->get_text());
} }
// getting markup out of a textbuffer seems like something that to me should be really simple
// but actually is horribly annoying. replies won't have mention colors because you can't do this if (referenced.GuildID.has_value()) {
// also no emojis because idk how to make a textview act like a label
// which of course would not be an issue if i could figure out how to get fonts to work on this god-forsaken framework
// oh well
// but ill manually get colors for the user who is being replied to
if (referenced.GuildID.has_value())
lbl->set_markup(get_author_markup(referenced.Author.ID, *referenced.GuildID) + ": " + text); lbl->set_markup(get_author_markup(referenced.Author.ID, *referenced.GuildID) + ": " + text);
else } else {
lbl->set_markup(get_author_markup(referenced.Author.ID) + ": " + text); lbl->set_markup(get_author_markup(referenced.Author.ID) + ": " + text);
}
} }
} else { } else {
lbl->set_markup("<i>reply unavailable</i>"); lbl->set_markup("<i>reply unavailable</i>");