github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Channel.GetUser

Browse Source
This commit is contained in:
RogueException
2016-02-16 16:40:24 -04:00
parent c6af9fa70d
commit 41125c41db
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Discord.Net/Models/Channel.cs
View File

@@ -547,35 +547,31 @@ namespace Discord
}
public User GetUser(ulong id)
{
if (!Client.Config.UsePermissionsCache)
if (IsPrivate)
{
if (Server != null)
if (id == Recipient.Id)
return Recipient;
else if (id == Client.PrivateUser.Id)
return Client.PrivateUser;
}
else if (!Client.Config.UsePermissionsCache)
{
var user = Server.GetUser(id);
if (user != null)
{
var user = Server.GetUser(id);
if (user != null)
{
ChannelPermissions perms = new ChannelPermissions();
UpdatePermissions(user, ref perms);
if (perms.ReadMessages)
return user;
}
ChannelPermissions perms = new ChannelPermissions();
UpdatePermissions(user, ref perms);
if (perms.ReadMessages)
return user;
}
else
{
if (id == Recipient.Id)
return Recipient;
else if (id == Client.PrivateUser.Id)
return Client.PrivateUser;
}
return null;
}
else
{
Member result;
if (_users.TryGetValue(id, out result))
return result.User;
return null;
}
return null;
}
#endregion