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/discord/user.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/discord/user.cpp')

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 "<b>" + Glib::Markup::escape_text(GetName()) + "</b>";
+std::string UserData::GetDisplayNameEscapedBold() const {
+    return "<b>" + Glib::Markup::escape_text(GetDisplayName()) + "</b>";
 }
 
-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) {
-- 
cgit v1.2.3