From eaddf003ef5551c0ae399bbc61c7754ed67f1d48 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 23 Mar 2016 00:38:17 +0100 Subject: [PATCH] added channel unblacklist, server not coming, closes #113 --- NadekoBot/Modules/Permissions.cs | 48 +++++++++++++++++++------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/NadekoBot/Modules/Permissions.cs b/NadekoBot/Modules/Permissions.cs index 0ea7efd4..2a7eb988 100644 --- a/NadekoBot/Modules/Permissions.cs +++ b/NadekoBot/Modules/Permissions.cs @@ -455,27 +455,22 @@ namespace NadekoBot.Modules { }); cgb.CreateCommand(Prefix + "uubl") - .Alias(Prefix + "unblacklist") - .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 () => { - if (!e.Message.MentionedUsers.Any()) return; - var usr = e.Message.MentionedUsers.First(); - 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 - { - await e.Channel.SendMessage($"`{usr.Name} was not in blacklist`"); - } + .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 () => { + if (!e.Message.MentionedUsers.Any()) return; + var usr = e.Message.MentionedUsers.First(); + 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 { + await e.Channel.SendMessage($"`{usr.Name} was not in blacklist`"); + } + }); }); - }); cgb.CreateCommand(Prefix + "cbl") .Description("Blacklists a mentioned channel (#general for example).\n**Usage**: ;ubl [channel_mention]") @@ -490,6 +485,19 @@ 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 () => { + if (!e.Message.MentionedChannels.Any()) return; + var ch = e.Message.MentionedChannels.First(); + NadekoBot.Config.UserBlacklist.Remove(ch.Id); + ConfigHandler.SaveConfig(); + await e.Channel.SendMessage($"`Sucessfully blacklisted channel {ch.Name}`"); + }); + }); + cgb.CreateCommand(Prefix + "sbl") .Description("Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY**\n**Usage**: ;usl [servername/serverid]") .Parameter("server", ParameterType.Unparsed)