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

Fix null channel being passed in RequirePermission preconditions (#886)

Browse Source 
* Fix null channel being passed in RequirePermission preconditions

* c#7 pattern matching
This commit is contained in:
Christopher F
2017-11-21 16:33:46 -05:00
committed by GitHub
parent b4bf046ad4
commit e5dfb6c3e5
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs
View File

@@ -57,13 +57,11 @@ namespace Discord.Commands
if (ChannelPermission.HasValue) if (ChannelPermission.HasValue)
{ {
var guildChannel = context.Channel as IGuildChannel;
ChannelPermissions perms; ChannelPermissions perms;
if (guildChannel != null) if (context.Channel is IGuildChannel guildChannel)
perms = guildUser.GetPermissions(guildChannel); perms = guildUser.GetPermissions(guildChannel);
else else
perms = ChannelPermissions.All(guildChannel); perms = ChannelPermissions.All(context.Channel);
if (!perms.Has(ChannelPermission.Value)) if (!perms.Has(ChannelPermission.Value))
return PreconditionResult.FromError($"Bot requires channel permission {ChannelPermission.Value}"); return PreconditionResult.FromError($"Bot requires channel permission {ChannelPermission.Value}");

6
src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs
View File

@@ -56,13 +56,11 @@ namespace Discord.Commands
if (ChannelPermission.HasValue) if (ChannelPermission.HasValue)
{ {
var guildChannel = context.Channel as IGuildChannel;
ChannelPermissions perms; ChannelPermissions perms;
if (guildChannel != null) if (context.Channel is IGuildChannel guildChannel)
perms = guildUser.GetPermissions(guildChannel); perms = guildUser.GetPermissions(guildChannel);
else else
perms = ChannelPermissions.All(guildChannel); perms = ChannelPermissions.All(context.Channel);
if (!perms.Has(ChannelPermission.Value)) if (!perms.Has(ChannelPermission.Value))
return Task.FromResult(PreconditionResult.FromError($"User requires channel permission {ChannelPermission.Value}")); return Task.FromResult(PreconditionResult.FromError($"User requires channel permission {ChannelPermission.Value}"));