Skip to content

Commit 2815978

Browse files
committed
Fix: Correct my mistaken formatting
1 parent 9a5843f commit 2815978

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

DiscordBot/Extensions/UserExtensions.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,35 @@ public static bool HasRoleGroup(this IUser user, ulong roleId)
2020

2121
public static bool IsNickAndNameEqual(this IUser user)
2222
{
23-
return user is SocketGuildUser guildUser && string.Equals(guildUser.Nickname, guildUser.Username, StringComparison.CurrentCultureIgnoreCase);
23+
var guildUser = user as SocketGuildUser;
24+
if (guildUser == null)
25+
return true;
26+
return string.Equals(guildUser.Nickname, guildUser.Username, StringComparison.CurrentCultureIgnoreCase);
2427
}
2528

2629
// Returns a simple string formatted as: "**user.Username** (aka **user.Nickname**)"
2730
// Nickname is only included if it's different from the username
2831
public static string UserNameReferenceForEmbed(this IUser user)
2932
{
30-
var reference = $"**{user.Username}**";
33+
var reference = $"**{user.GetNickName()}**!";
3134
if (!user.IsNickAndNameEqual())
32-
reference += $" (aka **{user}**)";
35+
reference += $" (aka **{user.Username}**)";
3336
return reference;
3437
}
3538

3639
// Returns a simple string formatted as: "user.Username (aka user.Nickname)"
3740
// Nickname is only included if it's different from the username
3841
public static string UserNameReference(this IUser user)
3942
{
40-
var reference = $"{user.Username}";
43+
var reference = $"{user.GetNickName()}!";
4144
if (!user.IsNickAndNameEqual())
42-
reference += $" (aka {user})";
45+
reference += $" (aka {user.Username})";
4346
return reference;
4447
}
48+
49+
// Returns the nickname of the user if the IUser can be cast to it exists, otherwise returns the username
50+
public static string GetNickName(this IUser user)
51+
{
52+
return (user as SocketGuildUser)?.Nickname ?? user.Username;
53+
}
4554
}

0 commit comments

Comments
 (0)