2 files changed, 24 insertions, 20 deletions
diff --git a/src/discord/user.cpp b/src/discord/user.cpp
index 38157e7..1d5d15a 100644
--- a/src/discord/user.cpp
+++ b/src/discord/user.cpp
@@ -89,6 +89,14 @@ std::string UserData::GetDisplayName() const {
     return Username;
 }
 
+std::string UserData::GetDisplayNameEscaped() const {
+    return Glib::Markup::escape_text(GetDisplayName());
+}
+
+std::string UserData::GetDisplayNameEscapedBold() const {
+    return "<b>" + Glib::Markup::escape_text(GetDisplayName()) + "</b>";
+}
+
 std::string UserData::GetUsername() const {
     if (IsPomelo()) {
         return Username;
@@ -97,19 +105,26 @@ std::string UserData::GetUsername() const {
     return Username + "#" + Discriminator;
 }
 
-std::string UserData::GetDisplayNameEscaped() const {
-    return Glib::Markup::escape_text(GetDisplayName());
+std::string UserData::GetUsernameEscaped() const {
+    if (IsPomelo()) {
+        return Glib::Markup::escape_text(Username);
+    }
+
+    return Glib::Markup::escape_text(Username) + "#" + Discriminator;
 }
 
-std::string UserData::GetDisplayNameEscapedBold() const {
-    return "<b>" + Glib::Markup::escape_text(GetDisplayName()) + "</b>";
+std::string UserData::GetUsernameEscapedBold() const {
+    if (IsPomelo()) {
+        return "<b>" + Glib::Markup::escape_text(Username) + "</b>";
+    }
+    return "<b>" + Glib::Markup::escape_text(Username) + "</b>#" + Discriminator;
 }
 
-std::string UserData::GetUsernameEscaped() const {
+std::string UserData::GetUsernameEscapedBoldAt() const {
     if (IsPomelo()) {
-        return GetDisplayNameEscaped();
+        return "<b>@" + Glib::Markup::escape_text(Username) + "</b>";
     }
-    return Glib::Markup::escape_text(GetDisplayName()) + "#" + Discriminator;
+    return "<b>@" + Glib::Markup::escape_text(Username) + "</b>#" + Discriminator;
 }
 
 void from_json(const nlohmann::json &j, UserData &m) {
diff --git a/src/discord/user.hpp b/src/discord/user.hpp
index d2c1002..19a0bf9 100644
--- a/src/discord/user.hpp
+++ b/src/discord/user.hpp
@@ -84,17 +84,6 @@ struct UserData {
     [[nodiscard]] std::string GetDisplayNameEscapedBold() const;
     [[nodiscard]] std::string GetUsername() const;
     [[nodiscard]] std::string GetUsernameEscaped() const;
-    template<bool with_at>
-    [[nodiscard]] inline std::string GetUsernameEscapedBold() const {
-        // stupid microoptimization (nanooptimization) that shouldnt exist
-        if constexpr (with_at) {
-            std::string r = "<b>@" + Glib::Markup::escape_text(Username) + "</b>";
-            if (!IsPomelo()) r += "#" + Discriminator;
-            return r;
-        } else {
-            std::string r = "<b>" + Glib::Markup::escape_text(Username) + "</b>";
-            if (!IsPomelo()) r += "#" + Discriminator;
-            return r;
-        }
-    }
+    [[nodiscard]] std::string GetUsernameEscapedBold() const;
+    [[nodiscard]] std::string GetUsernameEscapedBoldAt() const;
 };