Browse Source

Minor Cleanup

pull/22/merge
RogueException 9 years ago
parent
commit
62822daa1c
2 changed files with 9 additions and 5 deletions
  1. +3
    -2
      src/Discord.Net/DiscordClient.cs
  2. +6
    -3
      src/Discord.Net/Models/Server.cs

+ 3
- 2
src/Discord.Net/DiscordClient.cs View File

@@ -926,8 +926,9 @@ namespace Discord
//Logger.Verbose($"Presence Updated: {server.Name}/{user.Name}"); //Logger.Verbose($"Presence Updated: {server.Name}/{user.Name}");
OnUserPresenceUpdated(user); OnUserPresenceUpdated(user);
} }
else
Logger.Warning("PRESENCE_UPDATE referenced an unknown user.");
/*else
Logger.Warning("PRESENCE_UPDATE referenced an unknown user.");*/
//This happens when users leave a server
} }
break; break;
case "TYPING_START": case "TYPING_START":


+ 6
- 3
src/Discord.Net/Models/Server.cs View File

@@ -409,16 +409,19 @@ namespace Discord
{ {
foreach (var channel in AllChannels) foreach (var channel in AllChannels)
channel.RemoveUser(id); channel.RemoveUser(id);
return member.User;
} }
return member.User;
return null;
} }


/// <summary> Gets the user with the provided id and is a member of this server, or null if not found. </summary> /// <summary> Gets the user with the provided id and is a member of this server, or null if not found. </summary>
public User GetUser(ulong id) public User GetUser(ulong id)
{ {
Member result; Member result;
_users.TryGetValue(id, out result);
return result.User;
if (_users.TryGetValue(id, out result))
return result.User;
else
return null;
} }
/// <summary> Gets the user with the provided username and discriminator, that is a member of this server, or null if not found. </summary> /// <summary> Gets the user with the provided username and discriminator, that is a member of this server, or null if not found. </summary>
public User GetUser(string name, ushort discriminator) public User GetUser(string name, ushort discriminator)


Loading…
Cancel
Save