diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-06-25 05:53:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-25 05:53:59 +0000 |
| commit | 66101a25cbe4739ade20484c2a020b9130125ec3 (patch) | |
| tree | f1f3a2084677d90a37d1c4e3b17a19a606fe8d90 /src/components/memberlist.cpp | |
| parent | ba24e13419bfa6efd08a0d07f049a6981ff4cd28 (diff) | |
| parent | 19f7d55c8748e4fcd651540e299347689a2070ad (diff) | |
| download | abaddon-portaudio-66101a25cbe4739ade20484c2a020b9130125ec3.tar.gz abaddon-portaudio-66101a25cbe4739ade20484c2a020b9130125ec3.zip | |
Merge pull request #176 from uowuo/pomelo
pomelo support (and nicknames)
Diffstat (limited to 'src/components/memberlist.cpp')
| -rw-r--r-- | src/components/memberlist.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp index 19b4fb8..975b527 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.GetDisplayName(guild.has_value() ? guild->ID : Snowflake::Invalid); + } 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; |