Browse Source

Removed Unknown status

tags/1.0-rc
RogueException 8 years ago
parent
commit
1d5b7a2b01
5 changed files with 4 additions and 11 deletions
  1. +1
    -2
      src/Discord.Net.Core/Entities/Users/UserStatus.cs
  2. +1
    -1
      src/Discord.Net.Rest/Entities/Users/RestUser.cs
  3. +1
    -1
      src/Discord.Net.Rpc/Entities/Users/RpcUser.cs
  4. +1
    -1
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  5. +0
    -6
      src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs

+ 1
- 2
src/Discord.Net.Core/Entities/Users/UserStatus.cs View File

@@ -2,12 +2,11 @@
{
public enum UserStatus
{
Unknown,
Offline,
Online,
Idle,
AFK,
DoNotDisturb,
Invisible,
Offline
}
}

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

@@ -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)


+ 1
- 1
src/Discord.Net.Rpc/Entities/Users/RpcUser.cs View File

@@ -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)


+ 1
- 1
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -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);



+ 0
- 6
src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs View File

@@ -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);
}
}
}

Loading…
Cancel
Save