From a7eb06233d5666d02375bf8f756a023d4ac935cb Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Thu, 14 Apr 2016 06:00:40 +0200 Subject: [PATCH] added .cinfo, .sinfo, .uinfo, fixed ;sbl to take server names --- .../Administration/AdministrationModule.cs | 1 + .../Administration/Commands/InfoCommands.cs | 95 +++++ NadekoBot/Modules/Permissions.cs | 388 ++++++++++++------ NadekoBot/NadekoBot.csproj | 1 + 4 files changed, 361 insertions(+), 124 deletions(-) create mode 100644 NadekoBot/Modules/Administration/Commands/InfoCommands.cs diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs index b2508fb2..89c36dee 100644 --- a/NadekoBot/Modules/Administration/AdministrationModule.cs +++ b/NadekoBot/Modules/Administration/AdministrationModule.cs @@ -27,6 +27,7 @@ namespace NadekoBot.Modules.Administration commands.Add(new CrossServerTextChannel(this)); commands.Add(new SelfAssignedRolesCommand(this)); commands.Add(new Remind(this)); + commands.Add(new InfoCommands(this)); } public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Administration; diff --git a/NadekoBot/Modules/Administration/Commands/InfoCommands.cs b/NadekoBot/Modules/Administration/Commands/InfoCommands.cs new file mode 100644 index 00000000..8ac14a05 --- /dev/null +++ b/NadekoBot/Modules/Administration/Commands/InfoCommands.cs @@ -0,0 +1,95 @@ +using Discord; +using Discord.Commands; +using NadekoBot.Commands; +using NadekoBot.Extensions; +using System; +using System.Linq; +using System.Text; + +namespace NadekoBot.Modules.Administration.Commands +{ + class InfoCommands : DiscordCommand + { + public InfoCommands(DiscordModule module) : base(module) + { + } + + internal override void Init(CommandGroupBuilder cgb) + { + cgb.CreateCommand(Module.Prefix + "sinfo") + .Alias(Module.Prefix + "serverinfo") + .Description($"Shows info about the server the bot is on. If no channel is supplied, it defaults to current one.\n**Usage**:{Module.Prefix}sinfo Some Server") + .Parameter("server", ParameterType.Optional) + .Do(async e => + { + var servText = e.GetArg("server")?.Trim(); + var server = string.IsNullOrWhiteSpace(servText) + ? e.Server + : NadekoBot.Client.FindServers(servText).FirstOrDefault(); + if (server == null) + return; + var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(server.Id >> 22); + var sb = new StringBuilder(); + sb.AppendLine($"`Name:` **#{server.Name}**"); + sb.AppendLine($"`Owner:` **{server.Owner}**"); + sb.AppendLine($"`Id:` **{server.Id}**"); + sb.AppendLine($"`Icon Url:` **{await server.IconUrl.ShortenUrl()}**"); + sb.AppendLine($"`TextChannels:` **{server.TextChannels.Count()}** `VoiceChannels:` **{server.VoiceChannels.Count()}**"); + sb.AppendLine($"`Members:` **{server.UserCount}** `Online:` **{server.Users.Count(u => u.Status == UserStatus.Online)}** (may be incorrect)"); + sb.AppendLine($"`Roles:` **{server.Roles.Count()}**"); + sb.AppendLine($"`Created At:` **{createdAt}**"); + if (server.CustomEmojis.Count() > 0) + sb.AppendLine($"`Custom Emojis:` **{string.Join(", ", server.CustomEmojis)}**"); + if (server.Features.Count() > 0) + sb.AppendLine($"`Features:` **{string.Join(", ", server.Features)}**"); + if (!string.IsNullOrWhiteSpace(server.SplashId)) + sb.AppendLine($"`Region:` **{server.Region.Name}**"); + await e.Channel.SendMessage(sb.ToString()); + }); + + cgb.CreateCommand(Module.Prefix + "cinfo") + .Alias(Module.Prefix + "channelinfo") + .Description($"Shows info about the channel. If no channel is supplied, it defaults to current one.\n**Usage**:{Module.Prefix}cinfo #some-channel") + .Parameter("channel", ParameterType.Optional) + .Do(async e => + { + var chText = e.GetArg("channel")?.Trim(); + var ch = string.IsNullOrWhiteSpace(chText) + ? e.Channel + : e.Server.FindChannels(chText, Discord.ChannelType.Text).FirstOrDefault(); + if (ch == null) + return; + var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(ch.Id >> 22); + var sb = new StringBuilder(); + sb.AppendLine($"`Name:` **#{ch.Name}**"); + sb.AppendLine($"`Id:` **{ch.Id}**"); + sb.AppendLine($"`Created At:` **{createdAt}**"); + sb.AppendLine($"`Topic:` **{ch.Topic}**"); + sb.AppendLine($"`Users:` **{ch.Users.Count()}**"); + await e.Channel.SendMessage(sb.ToString()); + }); + + cgb.CreateCommand(Module.Prefix + "uinfo") + .Alias(Module.Prefix + "userinfo") + .Description($"Shows info about the user. If no user is supplied, it defaults a user running the command.\n**Usage**:{Module.Prefix}uinfo @SomeUser") + .Parameter("user", ParameterType.Optional) + .Do(async e => + { + var userText = e.GetArg("user")?.Trim(); + var user = string.IsNullOrWhiteSpace(userText) + ? e.User + : e.Server.FindUsers(userText).FirstOrDefault(); + if (user == null) + return; + var sb = new StringBuilder(); + sb.AppendLine($"`Name#Discrim:` **#{user.Name}#{user.Discriminator}**"); + sb.AppendLine($"`Id:` **{user.Id}**"); + sb.AppendLine($"`Current Game:` **{(string.IsNullOrWhiteSpace(user.CurrentGame) ? "-" : user.CurrentGame)}**"); + sb.AppendLine($"`Joined At:` **{user.JoinedAt}**"); + sb.AppendLine($"`Roles:` **({user.Roles.Count()}) - {string.Join(", ", user.Roles.Select(r => r.Name))}**"); + sb.AppendLine($"`AvatarUrl:` **{await user.AvatarUrl.ShortenUrl()}**"); + await e.Channel.SendMessage(sb.ToString()); + }); + } + } +} diff --git a/NadekoBot/Modules/Permissions.cs b/NadekoBot/Modules/Permissions.cs index 2a7eb988..ff2db533 100644 --- a/NadekoBot/Modules/Permissions.cs +++ b/NadekoBot/Modules/Permissions.cs @@ -1,25 +1,30 @@ -using System; +using Discord.Commands; using Discord.Modules; -using Discord.Commands; -using PermsHandler = NadekoBot.Classes.Permissions.PermissionsHandler; -using System.Linq; -using System.Threading.Tasks; using NadekoBot.Classes.JSONModels; using NadekoBot.Classes.Permissions; using NadekoBot.Commands; using NadekoBot.Extensions; +using System; +using System.Linq; +using System.Threading.Tasks; +using PermsHandler = NadekoBot.Classes.Permissions.PermissionsHandler; -namespace NadekoBot.Modules { - internal class PermissionModule : DiscordModule { +namespace NadekoBot.Modules +{ + internal class PermissionModule : DiscordModule + { public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Permissions; - public PermissionModule() { + public PermissionModule() + { commands.Add(new FilterInvitesCommand(this)); commands.Add(new FilterWords(this)); } - public override void Install(ModuleManager manager) { - manager.CreateCommands("", cgb => { + public override void Install(ModuleManager manager) + { + manager.CreateCommands("", cgb => + { cgb.AddCheck(PermissionChecker.Instance); @@ -29,17 +34,22 @@ namespace NadekoBot.Modules { .Alias(Prefix + "pr") .Description("Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'.") .Parameter("role", ParameterType.Unparsed) - .Do(async e => { - if (string.IsNullOrWhiteSpace(e.GetArg("role"))) { + .Do(async e => + { + if (string.IsNullOrWhiteSpace(e.GetArg("role"))) + { await e.Channel.SendMessage($"Current permissions role is `{PermsHandler.GetServerPermissionsRoleName(e.Server)}`"); return; } var arg = e.GetArg("role"); Discord.Role role = null; - try { + try + { role = PermissionHelper.ValidateRole(e.Server, arg); - } catch (Exception ex) { + } + catch (Exception ex) + { Console.WriteLine(ex.Message); await e.Channel.SendMessage($"Role `{arg}` probably doesn't exist. Create the role with that name first."); return; @@ -52,7 +62,8 @@ namespace NadekoBot.Modules { .Alias(Prefix + "v") .Description("Sets whether to show when a command/module is blocked.\n**Usage**: ;verbose true") .Parameter("arg", ParameterType.Required) - .Do(async e => { + .Do(async e => + { var arg = e.GetArg("arg"); var val = PermissionHelper.ValidateBool(arg); PermsHandler.SetVerbosity(e.Server, val); @@ -62,7 +73,8 @@ namespace NadekoBot.Modules { cgb.CreateCommand(Prefix + "serverperms") .Alias(Prefix + "sp") .Description("Shows banned permissions for this server.") - .Do(async e => { + .Do(async e => + { var perms = PermsHandler.GetServerPermissions(e.Server); if (string.IsNullOrWhiteSpace(perms?.ToString())) await e.Channel.SendMessage("No permissions set for this server."); @@ -73,13 +85,17 @@ namespace NadekoBot.Modules { .Alias(Prefix + "rp") .Description("Shows banned permissions for a certain role. No argument means for everyone.\n**Usage**: ;rp AwesomeRole") .Parameter("role", ParameterType.Unparsed) - .Do(async e => { + .Do(async e => + { var arg = e.GetArg("role"); var role = e.Server.EveryoneRole; if (!string.IsNullOrWhiteSpace(arg)) - try { + try + { role = PermissionHelper.ValidateRole(e.Server, arg); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("💢 Error: " + ex.Message); return; } @@ -95,13 +111,17 @@ namespace NadekoBot.Modules { .Alias(Prefix + "cp") .Description("Shows banned permissions for a certain channel. No argument means for this channel.\n**Usage**: ;cp #dev") .Parameter("channel", ParameterType.Unparsed) - .Do(async e => { + .Do(async e => + { var arg = e.GetArg("channel"); var channel = e.Channel; if (!string.IsNullOrWhiteSpace(arg)) - try { + try + { channel = PermissionHelper.ValidateChannel(e.Server, arg); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("💢 Error: " + ex.Message); return; } @@ -116,12 +136,16 @@ namespace NadekoBot.Modules { .Alias(Prefix + "up") .Description("Shows banned permissions for a certain user. No argument means for yourself.\n**Usage**: ;up Kwoth") .Parameter("user", ParameterType.Unparsed) - .Do(async e => { + .Do(async e => + { var user = e.User; if (!string.IsNullOrWhiteSpace(e.GetArg("user"))) - try { + try + { user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user")); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("💢 Error: " + ex.Message); return; } @@ -136,16 +160,22 @@ namespace NadekoBot.Modules { .Parameter("module", ParameterType.Required) .Parameter("bool", ParameterType.Required) .Description("Sets a module's permission at the server level.\n**Usage**: ;sm [module_name] enable") - .Do(async e => { - try { + .Do(async e => + { + try + { var module = PermissionHelper.ValidateModule(e.GetArg("module")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); PermsHandler.SetServerModulePermission(e.Server, module, state); await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** on this server."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -154,16 +184,22 @@ namespace NadekoBot.Modules { .Parameter("command", ParameterType.Required) .Parameter("bool", ParameterType.Required) .Description("Sets a command's permission at the server level.\n**Usage**: ;sc [command_name] disable") - .Do(async e => { - try { + .Do(async e => + { + try + { var command = PermissionHelper.ValidateCommand(e.GetArg("command")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); PermsHandler.SetServerCommandPermission(e.Server, command, state); await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** on this server."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -173,25 +209,35 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("role", ParameterType.Unparsed) .Description("Sets a module's permission at the role level.\n**Usage**: ;rm [module_name] enable [role_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var module = PermissionHelper.ValidateModule(e.GetArg("module")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); - if (e.GetArg("role")?.ToLower() == "all") { - foreach (var role in e.Server.Roles) { + if (e.GetArg("role")?.ToLower() == "all") + { + foreach (var role in e.Server.Roles) + { PermsHandler.SetRoleModulePermission(role, module, state); } await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for **ALL** roles."); - } else { + } + else + { var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role")); PermsHandler.SetRoleModulePermission(role, module, state); await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for **{role.Name}** role."); } - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -201,25 +247,35 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("role", ParameterType.Unparsed) .Description("Sets a command's permission at the role level.\n**Usage**: ;rc [command_name] disable [role_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var command = PermissionHelper.ValidateCommand(e.GetArg("command")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); - if (e.GetArg("role")?.ToLower() == "all") { - foreach (var role in e.Server.Roles) { + if (e.GetArg("role")?.ToLower() == "all") + { + foreach (var role in e.Server.Roles) + { PermsHandler.SetRoleCommandPermission(role, command, state); } await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** for **ALL** roles."); - } else { + } + else + { var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role")); PermsHandler.SetRoleCommandPermission(role, command, state); await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** for **{role.Name}** role."); } - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -229,25 +285,35 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("channel", ParameterType.Unparsed) .Description("Sets a module's permission at the channel level.\n**Usage**: ;cm [module_name] enable [channel_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var module = PermissionHelper.ValidateModule(e.GetArg("module")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); - if (e.GetArg("channel")?.ToLower() == "all") { - foreach (var channel in e.Server.TextChannels) { + if (e.GetArg("channel")?.ToLower() == "all") + { + foreach (var channel in e.Server.TextChannels) + { PermsHandler.SetChannelModulePermission(channel, module, state); } await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** on **ALL** channels."); - } else { + } + else + { var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); PermsHandler.SetChannelModulePermission(channel, module, state); await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for **{channel.Name}** channel."); } - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -257,25 +323,35 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("channel", ParameterType.Unparsed) .Description("Sets a command's permission at the channel level.\n**Usage**: ;cc [command_name] enable [channel_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var command = PermissionHelper.ValidateCommand(e.GetArg("command")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); - if (e.GetArg("channel")?.ToLower() == "all") { - foreach (var channel in e.Server.TextChannels) { + if (e.GetArg("channel")?.ToLower() == "all") + { + foreach (var channel in e.Server.TextChannels) + { PermsHandler.SetChannelCommandPermission(channel, command, state); } await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** on **ALL** channels."); - } else { + } + else + { var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); PermsHandler.SetChannelCommandPermission(channel, command, state); await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** for **{channel.Name}** channel."); } - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -285,17 +361,23 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("user", ParameterType.Unparsed) .Description("Sets a module's permission at the user level.\n**Usage**: ;um [module_name] enable [user_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var module = PermissionHelper.ValidateModule(e.GetArg("module")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user")); PermsHandler.SetUserModulePermission(user, module, state); await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for user **{user.Name}**."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -305,17 +387,23 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("user", ParameterType.Unparsed) .Description("Sets a command's permission at the user level.\n**Usage**: ;uc [command_name] enable [user_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var command = PermissionHelper.ValidateCommand(e.GetArg("command")); var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user")); PermsHandler.SetUserCommandPermission(user, command, state); await e.Channel.SendMessage($"Command **{command}** has been **{(state ? "enabled" : "disabled")}** for user **{user.Name}**."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -323,17 +411,24 @@ namespace NadekoBot.Modules { cgb.CreateCommand(Prefix + "asm").Alias(Prefix + "allservermodules") .Parameter("bool", ParameterType.Required) .Description("Sets permissions for all modules at the server level.\n**Usage**: ;asm [enable/disable]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); - foreach (var module in NadekoBot.Client.GetService().Modules) { + foreach (var module in NadekoBot.Client.GetService().Modules) + { PermsHandler.SetServerModulePermission(e.Server, module.Name, state); } await e.Channel.SendMessage($"All modules have been **{(state ? "enabled" : "disabled")}** on this server."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -342,18 +437,25 @@ namespace NadekoBot.Modules { .Parameter("module", ParameterType.Required) .Parameter("bool", ParameterType.Required) .Description("Sets permissions for all commands from a certain module at the server level.\n**Usage**: ;asc [module_name] [enable/disable]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var module = PermissionHelper.ValidateModule(e.GetArg("module")); - foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) { + foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) + { PermsHandler.SetServerCommandPermission(e.Server, command.Text, state); } await e.Channel.SendMessage($"All commands from the **{module}** module have been **{(state ? "enabled" : "disabled")}** on this server."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -362,18 +464,25 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("channel", ParameterType.Unparsed) .Description("Sets permissions for all modules at the channel level.\n**Usage**: ;acm [enable/disable] [channel_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); - foreach (var module in NadekoBot.Client.GetService().Modules) { + foreach (var module in NadekoBot.Client.GetService().Modules) + { PermsHandler.SetChannelModulePermission(channel, module.Name, state); } await e.Channel.SendMessage($"All modules have been **{(state ? "enabled" : "disabled")}** for **{channel.Name}** channel."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -383,18 +492,25 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("channel", ParameterType.Unparsed) .Description("Sets permissions for all commands from a certain module at the channel level.\n**Usage**: ;acc [module_name] [enable/disable] [channel_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var module = PermissionHelper.ValidateModule(e.GetArg("module")); var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); - foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) { + foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) + { PermsHandler.SetChannelCommandPermission(channel, command.Text, state); } await e.Channel.SendMessage($"All commands from the **{module}** module have been **{(state ? "enabled" : "disabled")}** for **{channel.Name}** channel."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -403,18 +519,25 @@ namespace NadekoBot.Modules { .Parameter("bool", ParameterType.Required) .Parameter("role", ParameterType.Unparsed) .Description("Sets permissions for all modules at the role level.\n**Usage**: ;arm [enable/disable] [role_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role")); - foreach (var module in NadekoBot.Client.GetService().Modules) { + foreach (var module in NadekoBot.Client.GetService().Modules) + { PermsHandler.SetRoleModulePermission(role, module.Name, state); } await e.Channel.SendMessage($"All modules have been **{(state ? "enabled" : "disabled")}** for **{role.Name}** role."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -424,18 +547,25 @@ namespace NadekoBot.Modules { .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] [role_name]") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var module = PermissionHelper.ValidateModule(e.GetArg("module")); var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("channel")); - foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) { + foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module)) + { PermsHandler.SetRoleCommandPermission(role, command.Text, state); } await e.Channel.SendMessage($"All commands from the **{module}** module have been **{(state ? "enabled" : "disabled")}** for **{role.Name}** role."); - } catch (ArgumentException exArg) { + } + catch (ArgumentException exArg) + { await e.Channel.SendMessage(exArg.Message); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage("Something went terribly wrong - " + ex.Message); } }); @@ -444,8 +574,10 @@ namespace NadekoBot.Modules { .Description("Blacklists a mentioned user.\n**Usage**: ;ubl [user_mention]") .Parameter("user", ParameterType.Unparsed) .AddCheck(SimpleCheckers.OwnerOnly()) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { if (!e.Message.MentionedUsers.Any()) return; var usr = e.Message.MentionedUsers.First(); NadekoBot.Config.UserBlacklist.Add(usr.Id); @@ -458,15 +590,20 @@ namespace NadekoBot.Modules { .Description($"Unblacklists a mentioned user.\n**Usage**: {Prefix}uubl [user_mention]") .Parameter("user", ParameterType.Unparsed) .AddCheck(SimpleCheckers.OwnerOnly()) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { if (!e.Message.MentionedUsers.Any()) return; var usr = e.Message.MentionedUsers.First(); - if (NadekoBot.Config.UserBlacklist.Contains(usr.Id)) { + if (NadekoBot.Config.UserBlacklist.Contains(usr.Id)) + { NadekoBot.Config.UserBlacklist.Remove(usr.Id); ConfigHandler.SaveConfig(); await e.Channel.SendMessage($"`Sucessfully unblacklisted user {usr.Name}`"); - } else { + } + else + { await e.Channel.SendMessage($"`{usr.Name} was not in blacklist`"); } }); @@ -475,8 +612,10 @@ namespace NadekoBot.Modules { cgb.CreateCommand(Prefix + "cbl") .Description("Blacklists a mentioned channel (#general for example).\n**Usage**: ;ubl [channel_mention]") .Parameter("channel", ParameterType.Unparsed) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { if (!e.Message.MentionedChannels.Any()) return; var ch = e.Message.MentionedChannels.First(); NadekoBot.Config.UserBlacklist.Add(ch.Id); @@ -488,8 +627,10 @@ namespace NadekoBot.Modules { cgb.CreateCommand(Prefix + "cubl") .Description("Unblacklists a mentioned channel (#general for example).\n**Usage**: ;cubl [channel_mention]") .Parameter("channel", ParameterType.Unparsed) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { if (!e.Message.MentionedChannels.Any()) return; var ch = e.Message.MentionedChannels.First(); NadekoBot.Config.UserBlacklist.Remove(ch.Id); @@ -502,31 +643,30 @@ namespace NadekoBot.Modules { .Description("Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY**\n**Usage**: ;usl [servername/serverid]") .Parameter("server", ParameterType.Unparsed) .AddCheck(SimpleCheckers.OwnerOnly()) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { var arg = e.GetArg("server")?.Trim(); if (string.IsNullOrWhiteSpace(arg)) return; - ulong serverId; - if (!ulong.TryParse(arg, out serverId)) { - await e.Channel.SendMessage("Not a valid Id"); - return; - } var server = NadekoBot.Client.Servers.FirstOrDefault(s => s.Id.ToString() == arg) ?? NadekoBot.Client.FindServers(arg.Trim()).FirstOrDefault(); + if (server == null) + { + await e.Channel.SendMessage("Cannot find that server"); + return; + } + var serverId = server.Id; NadekoBot.Config.ServerBlacklist.Add(serverId); ConfigHandler.SaveConfig(); //cleanup trivias and typeracing Classes.Trivia.TriviaGame trivia; - Commands.Trivia.RunningTrivias.TryRemove(serverId, out trivia); - Commands.TypingGame typeracer; - Commands.SpeedTyping.RunningContests.TryRemove(serverId, out typeracer); + Trivia.RunningTrivias.TryRemove(serverId, out trivia); + TypingGame typeracer; + SpeedTyping.RunningContests.TryRemove(serverId, out typeracer); - if (server == null) { - await e.Channel.SendMessage("Cannot find that server"); - } else { - await e.Channel.SendMessage($"`Sucessfully blacklisted server {server.Name}`"); - } + await e.Channel.SendMessage($"`Sucessfully blacklisted server {server.Name}`"); }); }); }); diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj index e7b3eb06..59d6a718 100644 --- a/NadekoBot/NadekoBot.csproj +++ b/NadekoBot/NadekoBot.csproj @@ -163,6 +163,7 @@ +