Browse Source

Update user entities to remove storage of the setting

pull/2204/head
Quin Lynch 3 years ago
parent
commit
5912d22022
2 changed files with 4 additions and 9 deletions
  1. +2
    -5
      src/Discord.Net.Rest/Entities/Users/RestUser.cs
  2. +2
    -4
      src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

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

@@ -16,8 +16,6 @@ namespace Discord.Rest
public class RestUser : RestEntity<ulong>, IUser, IUpdateable
{
#region RestUser
private readonly bool _useBidirectionalUnicode;

/// <inheritdoc />
public bool IsBot { get; private set; }
/// <inheritdoc />
@@ -53,7 +51,6 @@ namespace Discord.Rest
internal RestUser(BaseDiscordClient discord, ulong id)
: base(discord, id)
{
_useBidirectionalUnicode = discord.FormatUsersInBidirectionalUnicode;
}
internal static RestUser Create(BaseDiscordClient discord, Model model)
=> Create(discord, null, model, null);
@@ -133,9 +130,9 @@ namespace Discord.Rest
/// A string that resolves to Username#Discriminator of the user.
/// </returns>
public override string ToString()
=> Format.UsernameAndDiscriminator(this, _useBidirectionalUnicode);
=> Format.UsernameAndDiscriminator(this, Discord.FormatUsersInBidirectionalUnicode);

private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this, _useBidirectionalUnicode)} ({Id}{(IsBot ? ", Bot" : "")})";
private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this, Discord.FormatUsersInBidirectionalUnicode)} ({Id}{(IsBot ? ", Bot" : "")})";
#endregion

#region IUser


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

@@ -17,7 +17,6 @@ namespace Discord.WebSocket
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public abstract class SocketUser : SocketEntity<ulong>, IUser
{
private readonly bool _useBidirectionalUnicode;
/// <inheritdoc />
public abstract bool IsBot { get; internal set; }
/// <inheritdoc />
@@ -57,7 +56,6 @@ namespace Discord.WebSocket
internal SocketUser(DiscordSocketClient discord, ulong id)
: base(discord, id)
{
_useBidirectionalUnicode = discord.FormatUsersInBidirectionalUnicode;
}
internal virtual bool Update(ClientState state, Model model)
{
@@ -119,8 +117,8 @@ namespace Discord.WebSocket
/// <returns>
/// The full name of the user.
/// </returns>
public override string ToString() => Format.UsernameAndDiscriminator(this, _useBidirectionalUnicode);
private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this, _useBidirectionalUnicode)} ({Id}{(IsBot ? ", Bot" : "")})";
public override string ToString() => Format.UsernameAndDiscriminator(this, Discord.FormatUsersInBidirectionalUnicode);
private string DebuggerDisplay => $"{Format.UsernameAndDiscriminator(this, Discord.FormatUsersInBidirectionalUnicode)} ({Id}{(IsBot ? ", Bot" : "")})";
internal SocketUser Clone() => MemberwiseClone() as SocketUser;
}
}

Loading…
Cancel
Save