From 6f1bd0014cad37f2f0b43a9b83733d9f65a91406 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Tue, 13 Jun 2023 21:28:18 -0400
Subject: refactor, update user mention handling
---
src/components/channels.cpp | 2 +-
src/components/chatmessage.cpp | 22 +++++++++++-----------
src/components/chatwindow.cpp | 2 +-
src/components/friendslist.cpp | 2 +-
src/components/memberlist.cpp | 2 +-
src/dialogs/friendpicker.cpp | 2 +-
src/discord/user.cpp | 16 ++++++++--------
src/discord/user.hpp | 24 +++++++++++++++---------
src/misc/chatutil.cpp | 8 ++++----
src/windows/guildsettings/auditlogpane.cpp | 18 +++++++++---------
src/windows/guildsettings/memberspane.cpp | 4 ++--
src/windows/profile/mutualfriendspane.cpp | 2 +-
src/windows/profilewindow.cpp | 2 +-
13 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/src/components/channels.cpp b/src/components/channels.cpp
index 0e97837..15a8348 100644
--- a/src/components/channels.cpp
+++ b/src/components/channels.cpp
@@ -863,7 +863,7 @@ Gtk::TreeModel::iterator ChannelList::CreateVoiceParticipantRow(const UserData &
auto row = *m_model->append(parent);
row[m_columns.m_type] = RenderType::VoiceParticipant;
row[m_columns.m_id] = user.ID;
- row[m_columns.m_name] = user.GetEscapedName();
+ row[m_columns.m_name] = user.GetDisplayNameEscaped();
const auto voice_state = Abaddon::Get().GetDiscordClient().GetVoiceState(user.ID);
if (voice_state.has_value()) {
diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp
index 4b2e748..2f3a86d 100644
--- a/src/components/chatmessage.cpp
+++ b/src/components/chatmessage.cpp
@@ -234,23 +234,23 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
} break;
case MessageType::CHANNEL_NAME_CHANGE: {
const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID);
- b->insert_markup(s, "" + author->GetEscapedBoldName() + " changed the name to " + Glib::Markup::escape_text(data->Content) + "");
+ b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " changed the name to " + Glib::Markup::escape_text(data->Content) + "");
} break;
case MessageType::CHANNEL_ICON_CHANGE: {
const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID);
- b->insert_markup(s, "" + author->GetEscapedBoldName() + " changed the channel icon");
+ b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " changed the channel icon");
} break;
case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1:
case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2:
case MessageType::USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3: {
const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID);
const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(*data->GuildID);
- b->insert_markup(s, "" + author->GetEscapedBoldName() + " just boosted the server " + Glib::Markup::escape_text(data->Content) + " times! " +
+ b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " just boosted the server " + Glib::Markup::escape_text(data->Content) + " times! " +
Glib::Markup::escape_text(guild->Name) + " has achieved Level " + std::to_string(static_cast(data->Type) - 8) + "!"); // oo cheeky me !!!
} break;
case MessageType::CHANNEL_FOLLOW_ADD: {
const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID);
- b->insert_markup(s, "" + author->GetEscapedBoldName() + " has added " + Glib::Markup::escape_text(data->Content) + " to this channel. Its most important updates will show up here.");
+ b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " has added " + Glib::Markup::escape_text(data->Content) + " to this channel. Its most important updates will show up here.");
} break;
case MessageType::CALL: {
b->insert_markup(s, "[started a call]");
@@ -270,13 +270,13 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
case MessageType::THREAD_CREATED: {
const auto author = Abaddon::Get().GetDiscordClient().GetUser(data->Author.ID);
if (data->MessageReference.has_value() && data->MessageReference->ChannelID.has_value()) {
- auto iter = b->insert_markup(s, "" + author->GetEscapedBoldName() + " started a thread: ");
+ auto iter = b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " started a thread: ");
auto tag = b->create_tag();
tag->property_weight() = Pango::WEIGHT_BOLD;
m_channel_tagmap[tag] = *data->MessageReference->ChannelID;
b->insert_with_tag(iter, data->Content, tag);
} else {
- b->insert_markup(s, "" + author->GetEscapedBoldName() + " started a thread: " + Glib::Markup::escape_text(data->Content) + "");
+ b->insert_markup(s, "" + author->GetDisplayNameEscapedBold() + " started a thread: " + Glib::Markup::escape_text(data->Content) + "");
}
} break;
default: break;
@@ -656,7 +656,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
if (role.has_value()) {
const auto author = discord.GetUser(author_id);
if (author.has_value()) {
- return "Color) + "\">" + author->GetEscapedString() + "";
+ return "Color) + "\">" + author->GetUsernameEscaped() + "";
}
}
}
@@ -664,7 +664,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
const auto author = discord.GetUser(author_id);
if (author.has_value()) {
- return author->GetEscapedBoldString();
+ return author->GetUsernameEscapedBold();
}
return "Unknown User";
@@ -685,7 +685,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
Glib::Markup::escape_text(data.Interaction->Name) +
"");
} else if (const auto user = discord.GetUser(data.Interaction->User.ID); user.has_value()) {
- lbl->set_markup(user->GetEscapedBoldString());
+ lbl->set_markup(user->GetUsernameEscapedBold());
} else {
lbl->set_markup("Unknown User");
}
@@ -1043,7 +1043,7 @@ void ChatMessageHeader::UpdateName() {
else
m_author.set_markup("" + name + "");
} else
- m_author.set_markup("" + user->GetEscapedName() + "");
+ m_author.set_markup("" + user->GetDisplayNameEscaped() + "");
}
std::vector ChatMessageHeader::GetChildContent() {
@@ -1069,7 +1069,7 @@ Glib::ustring ChatMessageHeader::GetEscapedDisplayName(const UserData &user, con
if (member.has_value() && !member->Nickname.empty())
return Glib::Markup::escape_text(member->Nickname);
else
- return Glib::Markup::escape_text(user.GetEscapedName());
+ return Glib::Markup::escape_text(user.GetDisplayNameEscaped());
}
bool ChatMessageHeader::on_author_button_press(GdkEventButton *ev) {
diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp
index 1565d0c..8f59944 100644
--- a/src/components/chatwindow.cpp
+++ b/src/components/chatwindow.cpp
@@ -301,7 +301,7 @@ void ChatWindow::StartReplying(Snowflake message_id) {
m_is_replying = true;
m_input->StartReplying();
if (author.has_value())
- m_input_indicator->SetCustomMarkup("Replying to " + author->GetEscapedBoldString());
+ m_input_indicator->SetCustomMarkup("Replying to " + author->GetUsernameEscapedBold());
else
m_input_indicator->SetCustomMarkup("Replying...");
}
diff --git a/src/components/friendslist.cpp b/src/components/friendslist.cpp
index d8a566f..5839b65 100644
--- a/src/components/friendslist.cpp
+++ b/src/components/friendslist.cpp
@@ -265,7 +265,7 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData
img->SetURL(data.GetAvatarURL("png", "32"));
}
- namelbl->set_markup(data.GetEscapedBoldName());
+ namelbl->set_markup(data.GetDisplayNameEscapedBold());
UpdatePresenceLabel();
diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp
index a477832..9450548 100644
--- a/src/components/memberlist.cpp
+++ b/src/components/memberlist.cpp
@@ -40,7 +40,7 @@ MemberListUserRow::MemberListUserRow(const std::optional &guild, cons
// todo remove after migration complete
std::string display;
if (data.IsPomelo()) {
- display = data.GetName();
+ display = data.GetDisplayName();
} else {
display = data.Username;
if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) {
diff --git a/src/dialogs/friendpicker.cpp b/src/dialogs/friendpicker.cpp
index c70a9e9..873ddbd 100644
--- a/src/dialogs/friendpicker.cpp
+++ b/src/dialogs/friendpicker.cpp
@@ -62,7 +62,7 @@ FriendPickerDialogItem::FriendPickerDialogItem(Snowflake user_id)
, m_layout(Gtk::ORIENTATION_HORIZONTAL) {
auto user = *Abaddon::Get().GetDiscordClient().GetUser(user_id);
- m_name.set_markup(user.GetEscapedBoldString());
+ m_name.set_markup(user.GetUsernameEscapedBold());
m_name.set_single_line_mode(true);
m_avatar.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32);
diff --git a/src/discord/user.cpp b/src/discord/user.cpp
index 06073ad..38157e7 100644
--- a/src/discord/user.cpp
+++ b/src/discord/user.cpp
@@ -81,7 +81,7 @@ std::string UserData::GetMention() const {
return "<@" + std::to_string(ID) + ">";
}
-std::string UserData::GetName() const {
+std::string UserData::GetDisplayName() const {
if (IsPomelo() && GlobalName.has_value()) {
return *GlobalName;
}
@@ -97,19 +97,19 @@ std::string UserData::GetUsername() const {
return Username + "#" + Discriminator;
}
-std::string UserData::GetEscapedName() const {
- return Glib::Markup::escape_text(GetName());
+std::string UserData::GetDisplayNameEscaped() const {
+ return Glib::Markup::escape_text(GetDisplayName());
}
-std::string UserData::GetEscapedBoldName() const {
- return "" + Glib::Markup::escape_text(GetName()) + "";
+std::string UserData::GetDisplayNameEscapedBold() const {
+ return "" + Glib::Markup::escape_text(GetDisplayName()) + "";
}
-std::string UserData::GetEscapedString() const {
+std::string UserData::GetUsernameEscaped() const {
if (IsPomelo()) {
- return GetEscapedName();
+ return GetDisplayNameEscaped();
}
- return Glib::Markup::escape_text(GetName()) + "#" + Discriminator;
+ return Glib::Markup::escape_text(GetDisplayName()) + "#" + Discriminator;
}
void from_json(const nlohmann::json &j, UserData &m) {
diff --git a/src/discord/user.hpp b/src/discord/user.hpp
index 05acd05..d2c1002 100644
--- a/src/discord/user.hpp
+++ b/src/discord/user.hpp
@@ -79,16 +79,22 @@ struct UserData {
[[nodiscard]] std::string GetDefaultAvatarURL() const;
[[nodiscard]] Snowflake GetHoistedRole(Snowflake guild_id, bool with_color = false) const;
[[nodiscard]] std::string GetMention() const;
- [[nodiscard]] std::string GetName() const;
+ [[nodiscard]] std::string GetDisplayName() const;
+ [[nodiscard]] std::string GetDisplayNameEscaped() const;
+ [[nodiscard]] std::string GetDisplayNameEscapedBold() const;
[[nodiscard]] std::string GetUsername() const;
- [[nodiscard]] std::string GetEscapedName() const;
- [[nodiscard]] std::string GetEscapedBoldName() const;
- [[nodiscard]] std::string GetEscapedString() const;
+ [[nodiscard]] std::string GetUsernameEscaped() const;
template
- [[nodiscard]] inline std::string GetEscapedBoldString() const {
- if constexpr (with_at)
- return "@" + Glib::Markup::escape_text(Username) + "#" + Discriminator;
- else
- return "" + Glib::Markup::escape_text(Username) + "#" + Discriminator;
+ [[nodiscard]] inline std::string GetUsernameEscapedBold() const {
+ // stupid microoptimization (nanooptimization) that shouldnt exist
+ if constexpr (with_at) {
+ std::string r = "@" + Glib::Markup::escape_text(Username) + "";
+ if (!IsPomelo()) r += "#" + Discriminator;
+ return r;
+ } else {
+ std::string r = "" + Glib::Markup::escape_text(Username) + "";
+ if (!IsPomelo()) r += "#" + Discriminator;
+ return r;
+ }
}
};
diff --git a/src/misc/chatutil.cpp b/src/misc/chatutil.cpp
index a87df00..b5917ca 100644
--- a/src/misc/chatutil.cpp
+++ b/src/misc/chatutil.cpp
@@ -74,17 +74,17 @@ void HandleUserMentions(const Glib::RefPtr &buf, Snowflake chan
if (channel->Type == ChannelType::DM || channel->Type == ChannelType::GROUP_DM || !channel->GuildID.has_value() || plain) {
if (plain) {
- replacement = "@" + user->Username + "#" + user->Discriminator;
+ replacement = "@" + user->GetUsername();
} else {
- replacement = user->GetEscapedBoldString();
+ replacement = user->GetUsernameEscapedBold();
}
} else {
const auto role_id = user->GetHoistedRole(*channel->GuildID, true);
const auto role = discord.GetRole(role_id);
if (!role.has_value())
- replacement = user->GetEscapedBoldString();
+ replacement = user->GetUsernameEscapedBold();
else
- replacement = "Color) + "\">" + user->GetEscapedBoldString() + "";
+ replacement = "Color) + "\">" + user->GetUsernameEscapedBold() + "";
}
// regex returns byte positions and theres no straightforward way in the c++ bindings to deal with that :(
diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp
index 53bfd15..7402c55 100644
--- a/src/windows/guildsettings/auditlogpane.cpp
+++ b/src/windows/guildsettings/auditlogpane.cpp
@@ -38,7 +38,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
Glib::ustring user_markup = "Unknown User";
if (entry.UserID.has_value()) {
if (auto user = discord.GetUser(*entry.UserID); user.has_value())
- user_markup = discord.GetUser(*entry.UserID)->GetEscapedBoldString();
+ user_markup = discord.GetUser(*entry.UserID)->GetUsernameEscapedBold();
}
// spaghetti moment
@@ -177,7 +177,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" kicked " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
} break;
case AuditLogActionType::MEMBER_PRUNE: {
@@ -193,21 +193,21 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" banned " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
} break;
case AuditLogActionType::MEMBER_BAN_REMOVE: {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" removed the ban for " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
} break;
case AuditLogActionType::MEMBER_UPDATE: {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" updated " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
if (entry.Changes.has_value())
for (const auto &change : *entry.Changes) {
@@ -227,7 +227,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" updated roles for " +
- target_user->GetEscapedString() + "";
+ target_user->GetUsernameEscaped() + "";
if (entry.Changes.has_value())
for (const auto &change : *entry.Changes) {
if (change.Key == "$remove" && change.NewValue.has_value()) {
@@ -262,7 +262,7 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" added " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
" to the server";
} break;
case AuditLogActionType::ROLE_CREATE: {
@@ -450,14 +450,14 @@ void GuildSettingsAuditLogPane::OnAuditLogFetch(const AuditLogData &data) {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" pinned a message by " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
} break;
case AuditLogActionType::MESSAGE_UNPIN: {
const auto target_user = discord.GetUser(entry.TargetID);
markup = user_markup +
" unpinned a message by " +
- target_user->GetEscapedString() +
+ target_user->GetUsernameEscaped() +
"";
} break;
case AuditLogActionType::STAGE_INSTANCE_CREATE: {
diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp
index 64c28cb..ab4ec1a 100644
--- a/src/windows/guildsettings/memberspane.cpp
+++ b/src/windows/guildsettings/memberspane.cpp
@@ -150,9 +150,9 @@ void GuildSettingsMembersListItem::UpdateColor() {
const auto user = *discord.GetUser(UserID);
if (auto color_id = discord.GetMemberHoistedRole(GuildID, UserID, true); color_id.IsValid()) {
auto role = *discord.GetRole(color_id);
- m_name.set_markup("" + user.GetEscapedBoldString() + "");
+ m_name.set_markup("" + user.GetUsernameEscapedBold() + "");
} else
- m_name.set_markup(user.GetEscapedBoldString());
+ m_name.set_markup(user.GetUsernameEscapedBold());
}
GuildSettingsMembersPaneInfo::GuildSettingsMembersPaneInfo(Snowflake guild_id)
diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp
index e9f465b..2983fd5 100644
--- a/src/windows/profile/mutualfriendspane.cpp
+++ b/src/windows/profile/mutualfriendspane.cpp
@@ -22,7 +22,7 @@ MutualFriendItem::MutualFriendItem(const UserData &user)
img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this));
}
- m_name.set_markup(user.GetEscapedBoldString());
+ m_name.set_markup(user.GetUsernameEscapedBold());
m_name.set_valign(Gtk::ALIGN_CENTER);
add(m_avatar);
diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp
index 1469e49..ed8cd8a 100644
--- a/src/windows/profilewindow.cpp
+++ b/src/windows/profilewindow.cpp
@@ -64,7 +64,7 @@ ProfileWindow::ProfileWindow(Snowflake user_id)
img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this));
}
- m_displayname.set_markup(user.GetEscapedName());
+ m_displayname.set_markup(user.GetDisplayNameEscaped());
m_username.set_label(user.GetUsername());
m_switcher.set_stack(m_stack);
--
cgit v1.2.3