From 5912d220221f2ed78fe671d2dcfcd3f37ea8b6fb Mon Sep 17 00:00:00 2001
From: Quin Lynch <lynchquin@gmail.com>
Date: Sat, 26 Mar 2022 09:40:25 -0300
Subject: [PATCH] Update user entities to remove storage of the setting

---
 src/Discord.Net.Rest/Entities/Users/RestUser.cs        | 7 ++-----
 src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
index 8a7b21da7..dfdb53815 100644
--- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs
+++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
@@ -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
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
index 40d16594e..d70e61739 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
@@ -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;
     }
 }