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

Calculate permissions for private channels

Browse Source
This commit is contained in:
RogueException
2015-10-25 03:03:38 -03:00
parent b7ad4f603d
commit 84bfaa82e7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net/Models/User.cs
View File

@@ -207,14 +207,14 @@ namespace Discord
if (_roles == null) return; // We don't have all our data processed yet, this will be called again soon if (_roles == null) return; // We don't have all our data processed yet, this will be called again soon
var server = Server; var server = Server;
if (server == null || channel.Server != server) return; if (server != null && channel.Server != server) throw new InvalidOperationException();
ChannelPermissions permissions; ChannelPermissions permissions;
if (!_permissions.TryGetValue(channel.Id, out permissions)) return; if (!_permissions.TryGetValue(channel.Id, out permissions)) return;
uint newPermissions = _serverPermissions.RawValue; uint newPermissions = _serverPermissions.RawValue;
uint oldPermissions = permissions.RawValue; uint oldPermissions = permissions.RawValue;
if (server.Owner == this) if (server != null && server.Owner == this)
newPermissions = ChannelPermissions.All(channel).RawValue; newPermissions = ChannelPermissions.All(channel).RawValue;
else else
{ {
@@ -248,12 +248,11 @@ namespace Discord
if (_roles == null) return; // We don't have all our data processed yet, this will be called again soon if (_roles == null) return; // We don't have all our data processed yet, this will be called again soon
var server = Server; var server = Server;
if (server == null) return;
uint newPermissions = 0x0; uint newPermissions = 0x0;
uint oldPermissions = _serverPermissions.RawValue; uint oldPermissions = _serverPermissions.RawValue;
if (server.Owner == this) if (server != null && server.Owner == this)
newPermissions = ServerPermissions.All.RawValue; newPermissions = ServerPermissions.All.RawValue;
else else
{ {