From 7631fa540895695030ec4813c9c2c46bc8a49032 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 12 Mar 2016 21:11:35 +0100 Subject: [PATCH] fixed space at the end breaking permissions commands --- NadekoBot/Classes/Permissions/PermissionHelper.cs | 10 +++++----- NadekoBot/Modules/Permissions.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NadekoBot/Classes/Permissions/PermissionHelper.cs b/NadekoBot/Classes/Permissions/PermissionHelper.cs index f8991a7d..ee567822 100644 --- a/NadekoBot/Classes/Permissions/PermissionHelper.cs +++ b/NadekoBot/Classes/Permissions/PermissionHelper.cs @@ -37,7 +37,7 @@ namespace NadekoBot.Classes.Permissions { throw new ArgumentNullException(nameof(mod)); foreach (var m in NadekoBot.Client.GetService().Modules) { - if (m.Name.ToLower().Equals(mod.ToLower())) + if (m.Name.ToLower().Equals(mod.Trim().ToLower())) return m.Name; } throw new ArgumentException("That module does not exist."); @@ -48,7 +48,7 @@ namespace NadekoBot.Classes.Permissions { throw new ArgumentNullException(nameof(commandText)); foreach (var com in NadekoBot.Client.GetService().AllCommands) { - if (com.Text.ToLower().Equals(commandText.ToLower())) + if (com.Text.ToLower().Equals(commandText.Trim().ToLower())) return com.Text; } throw new NullReferenceException("That command does not exist."); @@ -60,7 +60,7 @@ namespace NadekoBot.Classes.Permissions { if (roleName.Trim() == "everyone") roleName = "@everyone"; - var role = server.FindRoles(roleName).FirstOrDefault(); + var role = server.FindRoles(roleName.Trim()).FirstOrDefault(); if (role == null) throw new NullReferenceException("That role does not exist."); return role; @@ -69,7 +69,7 @@ namespace NadekoBot.Classes.Permissions { internal static Channel ValidateChannel(Server server, string channelName) { if (string.IsNullOrWhiteSpace(channelName)) throw new ArgumentNullException(nameof(channelName)); - var channel = server.FindChannels(channelName, ChannelType.Text).FirstOrDefault(); + var channel = server.FindChannels(channelName.Trim(), ChannelType.Text).FirstOrDefault(); if (channel == null) throw new NullReferenceException("That channel does not exist."); return channel; @@ -78,7 +78,7 @@ namespace NadekoBot.Classes.Permissions { internal static User ValidateUser(Server server, string userName) { if (string.IsNullOrWhiteSpace(userName)) throw new ArgumentNullException(nameof(userName)); - var user = server.FindUsers(userName).FirstOrDefault(); + var user = server.FindUsers(userName.Trim()).FirstOrDefault(); if (user == null) throw new NullReferenceException("That user does not exist."); return user; diff --git a/NadekoBot/Modules/Permissions.cs b/NadekoBot/Modules/Permissions.cs index cfb2c3d3..9a929964 100644 --- a/NadekoBot/Modules/Permissions.cs +++ b/NadekoBot/Modules/Permissions.cs @@ -422,7 +422,7 @@ namespace NadekoBot.Modules { .Parameter("module", ParameterType.Required) .Parameter("bool", ParameterType.Required) .Parameter("channel", ParameterType.Unparsed) - .Description("Sets permissions for all commands from a certain module at the role level.\n**Usage**: ;arc [module_name] [enable/disable] [channel_name]") + .Description("Sets permissions for all commands from a certain module at the role level.\n**Usage**: ;arc [module_name] [enable/disable] [role_name]") .Do(async e => { try { var state = PermissionHelper.ValidateBool(e.GetArg("bool"));