Browse Source

Respond to feedback

pull/1124/head
Joe4evr 7 years ago
parent
commit
67cb52a1ff
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs
  2. +2
    -2
      src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs

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

@@ -12,7 +12,7 @@ namespace Discord.Commands
public GuildPermission? GuildPermission { get; }
public ChannelPermission? ChannelPermission { get; }
public override string ErrorMessage { get; set; }
public string NotAGuild { get; set; }
public string NotAGuildErrorMessage { get; set; }

/// <summary>
/// Require that the bot account has a specified GuildPermission
@@ -52,7 +52,7 @@ namespace Discord.Commands
if (GuildPermission.HasValue)
{
if (guildUser == null)
return PreconditionResult.FromError(NotAGuild ?? "Command must be used in a guild channel");
return PreconditionResult.FromError(NotAGuildErrorMessage ?? "Command must be used in a guild channel");
if (!guildUser.GuildPermissions.Has(GuildPermission.Value))
return PreconditionResult.FromError(ErrorMessage ?? $"Bot requires guild permission {GuildPermission.Value}");
}


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

@@ -12,7 +12,7 @@ namespace Discord.Commands
public GuildPermission? GuildPermission { get; }
public ChannelPermission? ChannelPermission { get; }
public override string ErrorMessage { get; set; }
public string NotAGuild { get; set; }
public string NotAGuildErrorMessage { get; set; }

/// <summary>
/// Require that the user invoking the command has a specified GuildPermission
@@ -51,7 +51,7 @@ namespace Discord.Commands
if (GuildPermission.HasValue)
{
if (guildUser == null)
return Task.FromResult(PreconditionResult.FromError(NotAGuild ?? "Command must be used in a guild channel"));
return Task.FromResult(PreconditionResult.FromError(NotAGuildErrorMessage ?? "Command must be used in a guild channel"));
if (!guildUser.GuildPermissions.Has(GuildPermission.Value))
return Task.FromResult(PreconditionResult.FromError(ErrorMessage ?? $"User requires guild permission {GuildPermission.Value}"));
}


Loading…
Cancel
Save