From 1d5b7a2b0182e8fd01bec68281b33dfe4bd01029 Mon Sep 17 00:00:00 2001 From: RogueException Date: Mon, 13 Mar 2017 23:51:37 -0300 Subject: [PATCH] Removed Unknown status --- src/Discord.Net.Core/Entities/Users/UserStatus.cs | 3 +-- src/Discord.Net.Rest/Entities/Users/RestUser.cs | 2 +- src/Discord.Net.Rpc/Entities/Users/RpcUser.cs | 2 +- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 2 +- .../Entities/Users/SocketGlobalUser.cs | 6 ------ 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Discord.Net.Core/Entities/Users/UserStatus.cs b/src/Discord.Net.Core/Entities/Users/UserStatus.cs index d183c139d..74a52a0fa 100644 --- a/src/Discord.Net.Core/Entities/Users/UserStatus.cs +++ b/src/Discord.Net.Core/Entities/Users/UserStatus.cs @@ -2,12 +2,11 @@ { public enum UserStatus { - Unknown, + Offline, Online, Idle, AFK, DoNotDisturb, Invisible, - Offline } } diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs index b439fb886..a5322e0f3 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs @@ -18,7 +18,7 @@ namespace Discord.Rest public string Discriminator => DiscriminatorValue.ToString("D4"); public string Mention => MentionUtils.MentionUser(Id); public virtual Game? Game => null; - public virtual UserStatus Status => UserStatus.Unknown; + public virtual UserStatus Status => UserStatus.Offline; internal RestUser(BaseDiscordClient discord, ulong id) : base(discord, id) diff --git a/src/Discord.Net.Rpc/Entities/Users/RpcUser.cs b/src/Discord.Net.Rpc/Entities/Users/RpcUser.cs index e78aee008..8ddf08ab2 100644 --- a/src/Discord.Net.Rpc/Entities/Users/RpcUser.cs +++ b/src/Discord.Net.Rpc/Entities/Users/RpcUser.cs @@ -19,7 +19,7 @@ namespace Discord.Rpc public string Discriminator => DiscriminatorValue.ToString("D4"); public string Mention => MentionUtils.MentionUser(Id); public virtual Game? Game => null; - public virtual UserStatus Status => UserStatus.Unknown; + public virtual UserStatus Status => UserStatus.Offline; internal RpcUser(DiscordRpcClient discord, ulong id) : base(discord, id) diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs index 71ba813d5..4c713c956 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -1323,7 +1323,7 @@ namespace Discord.WebSocket guild.AddOrUpdateUser(data); } - var globalUser = State.GetUser(data.User.Id); + var globalUser = GetOrCreateUser(State, data.User); //TODO: Memory leak, users removed from friends list will never RemoveRef. var before = globalUser.Clone(); globalUser.Update(State, data); diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs index f0b23543e..4870937a1 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs @@ -47,11 +47,5 @@ namespace Discord.WebSocket } internal new SocketGlobalUser Clone() => MemberwiseClone() as SocketGlobalUser; - - //Updates are only ever called from the gateway thread, thus threadsafe - internal override void Update(ClientState state, Model model) - { - base.Update(state, model); - } } }