summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2023-06-13 20:20:59 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2023-06-13 20:20:59 -0400
commitbfc5b0e682852173e03d703b1098530fd65a0dd4 (patch)
tree172d5f53926f04c8a162fb21a9769276b4added5 /src
parent26973f1b1470b4d381e493ad10da0d5daea8d982 (diff)
downloadabaddon-portaudio-bfc5b0e682852173e03d703b1098530fd65a0dd4.tar.gz
abaddon-portaudio-bfc5b0e682852173e03d703b1098530fd65a0dd4.zip
show pomelo names in member list
Diffstat (limited to 'src')
-rw-r--r--src/components/memberlist.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp
index 19b4fb8..a477832 100644
--- a/src/components/memberlist.cpp
+++ b/src/components/memberlist.cpp
@@ -37,9 +37,17 @@ MemberListUserRow::MemberListUserRow(const std::optional<GuildData> &guild, cons
m_label->set_single_line_mode(true);
m_label->set_ellipsize(Pango::ELLIPSIZE_END);
- std::string display = data.Username;
- if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators)
- display += "#" + data.Discriminator;
+ // todo remove after migration complete
+ std::string display;
+ if (data.IsPomelo()) {
+ display = data.GetName();
+ } else {
+ display = data.Username;
+ if (Abaddon::Get().GetSettings().ShowMemberListDiscriminators) {
+ display += "#" + data.Discriminator;
+ }
+ }
+
if (guild.has_value()) {
if (const auto col_id = data.GetHoistedRole(guild->ID, true); col_id.IsValid()) {
auto color = Abaddon::Get().GetDiscordClient().GetRole(col_id)->Color;