From 9368066ec5fecd8e6da3eec713c2043a290d843a Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 23 Jan 2026 09:18:54 +0100
Subject: [PATCH] Port User.tag getter from pomelo as utility

---
 assets/openapi.json                  | Bin 890613 -> 890733 bytes
 assets/schemas.json                  | Bin 383086 -> 383174 bytes
 src/api/routes/auth/forgot.ts        |   2 +-
 src/api/routes/auth/verify/resend.ts |   2 +-
 src/util/entities/User.ts            |   9 ++++++++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index 298ad18ec33dd70984e6d7718832d4c52bec83f6..3c573188a8b4c66f065b72ec37b1e6b8d57b3d9e 100644
GIT binary patch
delta 102
zcmeym*6i&%vxXMN7N!>FEiCKQrr%0pGngKb%2qVF;ez}0ce_}nr~f;`D!sixokgE{
v^6nhz$qs8-rY{I)V{Kod#R9}2nhl8AftUk`If0l9h`E87XZs2*Uf&!5W(Oxh

delta 79
zcmaF6&g|=2vxXMN7N!>FEiCKQrXRS-<hngTon;O4WQVmZ)8#c7S=$w~S%4TsvjH(X
X5OV-AClGT1F*gwNY**0c_00hQNXi#-

diff --git a/assets/schemas.json b/assets/schemas.json
index a7d759fab2f7fed6f573e20383707480d3d6f2e0..46a36939bb19c24f6c05ed2d85a36daf53d6595b 100644
GIT binary patch
delta 63
zcmaF2LHyW8@rD-07N#xC`E8TAf)%DOc)_T)y`YU*o_Vr%l<@QmdMqr{3#Kr!PG1$r
TDAB&5lNpFvwr}WU-RB1Y6Lc6&

delta 50
zcmX@MQT*Ko@rD-07N#xC`EAoT{AKRmZr{#4m1+8i&CD#*3#Kr!wtwhk24a@&A39mD
G`2hexM;505

diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
index 26e1b353b..4ebb96545 100644
--- a/src/api/routes/auth/forgot.ts
+++ b/src/api/routes/auth/forgot.ts
@@ -68,7 +68,7 @@ router.post(
 
         if (user && user.email) {
             Email.sendResetPassword(user, user.email).catch((e) => {
-                console.error(`Failed to send password reset email to ${user.username}#${user.discriminator} (${user.id}): ${e}`);
+                console.error(`Failed to send password reset email to ${user.tag} (${user.id}): ${e}`);
             });
         }
     },
diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
index 4c0339bf6..453c616d0 100644
--- a/src/api/routes/auth/verify/resend.ts
+++ b/src/api/routes/auth/verify/resend.ts
@@ -56,7 +56,7 @@ router.post(
                 return res.sendStatus(204);
             })
             .catch((e) => {
-                console.error(`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`);
+                console.error(`Failed to send verification email to ${user.tag}: ${e}`);
                 throw new HTTPError("Failed to send verification email", 500);
             });
     },
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 84471e0d4..d3c01c1a3 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -245,6 +245,13 @@ export class User extends BaseClass {
         }
     }
 
+    public get tag(): string {
+        //const { uniqueUsernames } = Config.get().general;
+        const uniqueUsernames = false;
+
+        return uniqueUsernames ? this.username : `${this.username}#${this.discriminator}`;
+    }
+
     static async register({
         email,
         username,
@@ -310,7 +317,7 @@ export class User extends BaseClass {
         // send verification email if users aren't verified by default and we have an email
         if (!Config.get().defaults.user.verified && email) {
             await Email.sendVerifyEmail(user, email).catch((e) => {
-                console.error(`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`);
+                console.error(`Failed to send verification email to ${user.tag}: ${e}`);
             });
         }