mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed space at the end breaking permissions commands

Browse Source
This commit is contained in:
Master Kwoth 2016-03-12 21:11:35 +01:00
parent 379f902230
commit 7631fa5408
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NadekoBot/Classes/Permissions/PermissionHelper.cs
View File

@ -37,7 +37,7 @@ namespace NadekoBot.Classes.Permissions {
throw new ArgumentNullException(nameof(mod)); throw new ArgumentNullException(nameof(mod));
foreach (var m in NadekoBot.Client.GetService<ModuleService>().Modules) { foreach (var m in NadekoBot.Client.GetService<ModuleService>().Modules) {
if (m.Name.ToLower().Equals(mod.ToLower())) if (m.Name.ToLower().Equals(mod.Trim().ToLower()))
return m.Name; return m.Name;
} }
throw new ArgumentException("That module does not exist."); throw new ArgumentException("That module does not exist.");
@ -48,7 +48,7 @@ namespace NadekoBot.Classes.Permissions {
throw new ArgumentNullException(nameof(commandText)); throw new ArgumentNullException(nameof(commandText));
foreach (var com in NadekoBot.Client.GetService<CommandService>().AllCommands) { foreach (var com in NadekoBot.Client.GetService<CommandService>().AllCommands) {
if (com.Text.ToLower().Equals(commandText.ToLower())) if (com.Text.ToLower().Equals(commandText.Trim().ToLower()))
return com.Text; return com.Text;
} }
throw new NullReferenceException("That command does not exist."); throw new NullReferenceException("That command does not exist.");
@ -60,7 +60,7 @@ namespace NadekoBot.Classes.Permissions {
if (roleName.Trim() == "everyone") if (roleName.Trim() == "everyone")
roleName = "@everyone"; roleName = "@everyone";
var role = server.FindRoles(roleName).FirstOrDefault(); var role = server.FindRoles(roleName.Trim()).FirstOrDefault();
if (role == null) if (role == null)
throw new NullReferenceException("That role does not exist."); throw new NullReferenceException("That role does not exist.");
return role; return role;
@ -69,7 +69,7 @@ namespace NadekoBot.Classes.Permissions {
internal static Channel ValidateChannel(Server server, string channelName) { internal static Channel ValidateChannel(Server server, string channelName) {
if (string.IsNullOrWhiteSpace(channelName)) if (string.IsNullOrWhiteSpace(channelName))
throw new ArgumentNullException(nameof(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) if (channel == null)
throw new NullReferenceException("That channel does not exist."); throw new NullReferenceException("That channel does not exist.");
return channel; return channel;
@ -78,7 +78,7 @@ namespace NadekoBot.Classes.Permissions {
internal static User ValidateUser(Server server, string userName) { internal static User ValidateUser(Server server, string userName) {
if (string.IsNullOrWhiteSpace(userName)) if (string.IsNullOrWhiteSpace(userName))
throw new ArgumentNullException(nameof(userName)); throw new ArgumentNullException(nameof(userName));
var user = server.FindUsers(userName).FirstOrDefault(); var user = server.FindUsers(userName.Trim()).FirstOrDefault();
if (user == null) if (user == null)
throw new NullReferenceException("That user does not exist."); throw new NullReferenceException("That user does not exist.");
return user; return user;

2
NadekoBot/Modules/Permissions.cs
View File

@ -422,7 +422,7 @@ namespace NadekoBot.Modules {
.Parameter("module", ParameterType.Required) .Parameter("module", ParameterType.Required)
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("channel", ParameterType.Unparsed) .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 => { .Do(async e => {
try { try {
var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var state = PermissionHelper.ValidateBool(e.GetArg("bool"));