Browse Source

Fix null channel being passed in RequirePermission preconditions

pull/886/head
Christopher F 7 years ago
parent
commit
0899ed18de
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs
  2. +1
    -1
      src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs

+ 1
- 1
src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs View File

@@ -63,7 +63,7 @@ namespace Discord.Commands
if (guildChannel != null) if (guildChannel != null)
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}");


+ 1
- 1
src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs View File

@@ -62,7 +62,7 @@ namespace Discord.Commands
if (guildChannel != null) if (guildChannel != null)
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}"));


Loading…
Cancel
Save