User mention/username changes

nwjgit · Jul 13, 2024 · 57a20ca · 57a20ca
1 parent 100e60f
commit 57a20ca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/lib/MUser.ts b/src/lib/MUser.ts
@@ -1,4 +1,4 @@
-import { mentionCommand } from '@oldschoolgg/toolkit';
+import { cleanUsername, mentionCommand } from '@oldschoolgg/toolkit';
 import { UserError } from '@oldschoolgg/toolkit';
 import type { GearSetupType, Prisma, User, UserStats, xp_gains_skill_enum } from '@prisma/client';
 import { userMention } from 'discord.js';
@@ -221,11 +221,11 @@ export class MUserClass {
 	}
 
 	get rawUsername() {
-		return globalClient.users.cache.get(this.id)?.username ?? this.user.username ?? 'Unknown';
+		return cleanUsername(this.user.username ?? globalClient.users.cache.get(this.id)?.username ?? 'Unknown');
 	}
 
 	get usernameOrMention() {
-		return this.user.username ?? this.mention;
+		return this.rawUsername;
 	}
 
 	get badgedUsername() {