diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-02-21 01:47:21 -0500 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-02-21 01:47:21 -0500 |
| commit | 5209d495d25a59fed0dfe49a6d547d26c2540820 (patch) | |
| tree | 83e95b17222ceb8cf4a1173faf07735308297c91 /components | |
| parent | c5bc3455b1bfd2d643f31f66ec61f2098a4d3ba9 (diff) | |
| download | abaddon-portaudio-5209d495d25a59fed0dfe49a6d547d26c2540820.tar.gz abaddon-portaudio-5209d495d25a59fed0dfe49a6d547d26c2540820.zip | |
some refactorage
Diffstat (limited to 'components')
| -rw-r--r-- | components/chatmessage.cpp | 16 | ||||
| -rw-r--r-- | components/completer.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index dbbf679..4f6477b 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -553,7 +553,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) // clang-format off lbl->set_markup( "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" - + Glib::Markup::escape_text(author->Username + "#" + author->Discriminator) + + author->GetEscapedString() + "</span></b>: " + text ); @@ -564,7 +564,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data) } const auto author = discord.GetUser(referenced.Author.ID); - lbl->set_markup("<b>" + Glib::Markup::escape_text(author->Username + "#" + author->Discriminator) + "</b>: " + text); + lbl->set_markup(author->GetEscapedBoldString<false>()); } } else { lbl->set_markup("<i>reply unavailable</i>"); @@ -615,14 +615,14 @@ void ChatMessageItemContainer::HandleUserMentions(Glib::RefPtr<Gtk::TextBuffer> Glib::ustring replacement; if (channel->Type == ChannelType::DM || channel->Type == ChannelType::GROUP_DM) - replacement = "<b>@" + Glib::Markup::escape_text(user->Username) + "#" + user->Discriminator + "</b>"; + replacement = user->GetEscapedBoldString<true>(); else { const auto role_id = user->GetHoistedRole(*channel->GuildID, true); const auto role = discord.GetRole(role_id); if (!role.has_value()) - replacement = "<b>@" + Glib::Markup::escape_text(user->Username) + "#" + user->Discriminator + "</b>"; + replacement = user->GetEscapedBoldString<true>(); else - replacement = "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">@" + Glib::Markup::escape_text(user->Username) + "#" + user->Discriminator + "</span></b>"; + replacement = "<span color=\"#" + IntToCSSColor(role->Color) + "\">" + user->GetEscapedBoldString<true>() + "</span>"; } // regex returns byte positions and theres no straightforward way in the c++ bindings to deal with that :( @@ -991,7 +991,7 @@ ChatMessageHeader::ChatMessageHeader(const Message *data) { m_avatar->set_valign(Gtk::ALIGN_START); m_avatar->set_margin_right(10); - m_author->set_markup("<span weight='bold'>" + Glib::Markup::escape_text(data->Author.Username) + "</span>"); + 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); @@ -1091,9 +1091,9 @@ void ChatMessageHeader::UpdateNameColor() { std::string md; if (role.has_value()) - md = "<span weight='bold' color='#" + IntToCSSColor(role->Color) + "'>" + Glib::Markup::escape_text(user->Username) + "</span>"; + md = "<span weight='bold' color='#" + IntToCSSColor(role->Color) + "'>" + user->GetEscapedName() + "</span>"; else - md = "<span weight='bold' color='#eeeeee'>" + Glib::Markup::escape_text(user->Username) + "</span>"; + md = "<span weight='bold' color='#eeeeee'>" + user->GetEscapedName() + "</span>"; m_author->set_markup(md); } diff --git a/components/completer.cpp b/components/completer.cpp index 5767853..3ecb972 100644 --- a/components/completer.cpp +++ b/components/completer.cpp @@ -328,7 +328,7 @@ CompleterEntry::CompleterEntry(const Glib::ustring &completion, int index) void CompleterEntry::SetTextColor(int color) { if (m_text == nullptr) return; const auto cur = m_text->get_text(); - m_text->set_markup("<span color=\"#" + IntToCSSColor(color) + "\">" + Glib::Markup::escape_text(cur) + "</span>"); + m_text->set_markup("<span color='#" + IntToCSSColor(color) + "'>" + Glib::Markup::escape_text(cur) + "</span>"); } void CompleterEntry::SetText(const Glib::ustring &text) { |