Browse Source

feature: Handle bidirectional usernames (#1943)

* Initial implementation

* Update summary
tags/3.0.0
Quin Lynch GitHub 3 years ago
parent
commit
10afd96e6e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
  1. +10
    -0
      src/Discord.Net.Core/Format.cs
  2. +2
    -2
      src/Discord.Net.Rest/Entities/Users/RestUser.cs
  3. +2
    -2
      src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

+ 10
- 0
src/Discord.Net.Core/Format.cs View File

@@ -104,5 +104,15 @@ namespace Discord
var newText = Regex.Replace(text, @"(\*|_|`|~|>|\\)", "");
return newText;
}

/// <summary>
/// Formats a user's username + discriminator while maintaining bidirectional unicode
/// </summary>
/// <param name="user">The user whos username and discriminator to format</param>
/// <returns>The username + discriminator</returns>
public static string UsernameAndDiscriminator(IUser user)
{
return $"\u2066{user.Username}\u2069#{user.Discriminator}";
}
}
}

+ 2
- 2
src/Discord.Net.Rest/Entities/Users/RestUser.cs View File

@@ -128,8 +128,8 @@ namespace Discord.Rest
/// <returns>
/// A string that resolves to Username#Discriminator of the user.
/// </returns>
public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
public override string ToString() => Format.UsernameAndDiscriminator(this);
private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this)} ({Id}{(IsBot ? ", Bot" : "")})";
#endregion

#region IUser


+ 2
- 2
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs View File

@@ -109,8 +109,8 @@ namespace Discord.WebSocket
/// <returns>
/// The full name of the user.
/// </returns>
public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
public override string ToString() => Format.UsernameAndDiscriminator(this);
private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this)} ({Id}{(IsBot ? ", Bot" : "")})";
internal SocketUser Clone() => MemberwiseClone() as SocketUser;
}
}

Loading…
Cancel
Save