From 67cb52a1ffe4ca5dbac10c7be18ee5d29d5941e4 Mon Sep 17 00:00:00 2001 From: Joe4evr Date: Sat, 1 Sep 2018 00:58:48 +0200 Subject: [PATCH] Respond to feedback --- .../Attributes/Preconditions/RequireBotPermissionAttribute.cs | 4 ++-- .../Preconditions/RequireUserPermissionAttribute.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs b/src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs index 258923e7f..22b369197 100644 --- a/src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs +++ b/src/Discord.Net.Commands/Attributes/Preconditions/RequireBotPermissionAttribute.cs @@ -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; } /// /// 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}"); } diff --git a/src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs b/src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs index eb37b2062..87a764f0e 100644 --- a/src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs +++ b/src/Discord.Net.Commands/Attributes/Preconditions/RequireUserPermissionAttribute.cs @@ -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; } /// /// 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}")); }