From fe6759108145e36d0904982dd32e25253ae8852c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Thu, 14 Apr 2016 23:20:47 +0200 Subject: [PATCH] fixy --- NadekoBot/Commands/FilterInvitesCommand.cs | 63 ++++++++++++-------- NadekoBot/Commands/PollCommand.cs | 67 ++++++++++++++-------- NadekoBot/NadekoBot.csproj | 2 +- 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/NadekoBot/Commands/FilterInvitesCommand.cs b/NadekoBot/Commands/FilterInvitesCommand.cs index fbcb4910..519f6b43 100644 --- a/NadekoBot/Commands/FilterInvitesCommand.cs +++ b/NadekoBot/Commands/FilterInvitesCommand.cs @@ -1,29 +1,31 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Discord; +using Discord; using Discord.Commands; using NadekoBot.Classes; using NadekoBot.Classes.Permissions; using NadekoBot.Modules; +using System; +using System.Text.RegularExpressions; using ServerPermissions = NadekoBot.Classes.Permissions.ServerPermissions; -namespace NadekoBot.Commands { - internal class FilterInvitesCommand : DiscordCommand { +namespace NadekoBot.Commands +{ + internal class FilterInvitesCommand : DiscordCommand + { private readonly Regex filterRegex = new Regex(@"(?:discord(?:\.gg|app\.com\/invite)\/(?([\w]{16}|(?:[\w]+-?){3})))"); - public FilterInvitesCommand(DiscordModule module) : base(module) { - NadekoBot.Client.MessageReceived += async (sender, args) => { + public FilterInvitesCommand(DiscordModule module) : base(module) + { + NadekoBot.Client.MessageReceived += async (sender, args) => + { if (args.Channel.IsPrivate || args.User.Id == NadekoBot.Client.CurrentUser.Id) return; - try { + try + { ServerPermissions serverPerms; if (!IsChannelOrServerFiltering(args.Channel, out serverPerms)) return; - if (filterRegex.IsMatch(args.Message.RawText)) { + if (filterRegex.IsMatch(args.Message.RawText)) + { await args.Message.Delete(); IncidentsHandler.Add(args.Server.Id, $"User [{args.User.Name}/{args.User.Id}] posted " + $"INVITE LINK in [{args.Channel.Name}/{args.Channel.Id}] channel. " + @@ -32,11 +34,13 @@ namespace NadekoBot.Commands { await args.Channel.SendMessage($"{args.User.Mention} Invite links are not " + $"allowed on this channel."); } - } catch { } + } + catch { } }; } - private static bool IsChannelOrServerFiltering(Channel channel, out ServerPermissions serverPerms) { + private static bool IsChannelOrServerFiltering(Channel channel, out ServerPermissions serverPerms) + { if (!PermissionsHandler.PermissionsDict.TryGetValue(channel.Server.Id, out serverPerms)) return false; if (serverPerms.Permissions.FilterInvites) @@ -46,7 +50,8 @@ namespace NadekoBot.Commands { return serverPerms.ChannelPermissions.TryGetValue(channel.Id, out perms) && perms.FilterInvites; } - internal override void Init(CommandGroupBuilder cgb) { + internal override void Init(CommandGroupBuilder cgb) + { cgb.CreateCommand(Module.Prefix + "cfi") .Alias(Module.Prefix + "channelfilterinvites") .Description("Enables or disables automatic deleting of invites on the channel." + @@ -54,12 +59,15 @@ namespace NadekoBot.Commands { "\n**Usage**: ;cfi enable #general-chat") .Parameter("bool") .Parameter("channel", ParameterType.Optional) - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); var chanStr = e.GetArg("channel"); - if (chanStr?.ToLowerInvariant().Trim() != "all") { + if (chanStr?.ToLowerInvariant().Trim() != "all") + { var chan = string.IsNullOrWhiteSpace(chanStr) ? e.Channel @@ -70,12 +78,15 @@ namespace NadekoBot.Commands { } //all channels - foreach (var curChannel in e.Server.TextChannels) { + foreach (var curChannel in e.Server.TextChannels) + { PermissionsHandler.SetChannelFilterInvitesPermission(curChannel, state); } await e.Channel.SendMessage($"Invite Filter has been **{(state ? "enabled" : "disabled")}** for **ALL** channels."); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage($"💢 Error: {ex.Message}"); } }); @@ -84,13 +95,17 @@ namespace NadekoBot.Commands { .Alias(Module.Prefix + "serverfilterinvites") .Description("Enables or disables automatic deleting of invites on the server.\n**Usage**: ;sfi disable") .Parameter("bool") - .Do(async e => { - try { + .Do(async e => + { + try + { var state = PermissionHelper.ValidateBool(e.GetArg("bool")); PermissionsHandler.SetServerFilterInvitesPermission(e.Server, state); await e.Channel.SendMessage($"Invite Filter has been **{(state ? "enabled" : "disabled")}** for this server."); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage($"💢 Error: {ex.Message}"); } }); diff --git a/NadekoBot/Commands/PollCommand.cs b/NadekoBot/Commands/PollCommand.cs index 4ae93a8c..42209c9a 100644 --- a/NadekoBot/Commands/PollCommand.cs +++ b/NadekoBot/Commands/PollCommand.cs @@ -1,28 +1,34 @@ -using System; +using Discord; +using Discord.Commands; +using NadekoBot.Modules; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Discord; -using Discord.Commands; -using NadekoBot.Modules; -namespace NadekoBot.Commands { - internal class PollCommand : DiscordCommand { +namespace NadekoBot.Commands +{ + internal class PollCommand : DiscordCommand + { public static ConcurrentDictionary ActivePolls = new ConcurrentDictionary(); - public Func DoFunc() { + public Func DoFunc() + { throw new NotImplementedException(); } - internal override void Init(CommandGroupBuilder cgb) { + internal override void Init(CommandGroupBuilder cgb) + { cgb.CreateCommand(Module.Prefix + "poll") .Description("Creates a poll, only person who has manage server permission can do it.\n**Usage**: >poll Question?;Answer1;Answ 2;A_3") .Parameter("allargs", ParameterType.Unparsed) - .Do(async e => { - await Task.Run(async () => { + .Do(async e => + { + await Task.Run(async () => + { if (!e.User.ServerPermissions.ManageChannels) return; if (ActivePolls.ContainsKey(e.Server)) @@ -35,14 +41,16 @@ namespace NadekoBot.Commands { return; var poll = new Poll(e, data[0], data.Skip(1)); - if (PollCommand.ActivePolls.TryAdd(e.Server, poll)) { + if (PollCommand.ActivePolls.TryAdd(e.Server, poll)) + { await poll.StartPoll(); } }); }); cgb.CreateCommand(Module.Prefix + "pollend") .Description("Stops active poll on this server and prints the results in this channel.") - .Do(async e => { + .Do(async e => + { if (!e.User.ServerPermissions.ManageChannels) return; if (!ActivePolls.ContainsKey(e.Server)) @@ -51,10 +59,11 @@ namespace NadekoBot.Commands { }); } - public PollCommand(DiscordModule module) : base(module) {} + public PollCommand(DiscordModule module) : base(module) { } } - internal class Poll { + internal class Poll + { private readonly CommandEventArgs e; private readonly string[] answers; private ConcurrentDictionary participants = new ConcurrentDictionary(); @@ -62,13 +71,15 @@ namespace NadekoBot.Commands { private DateTime started; private CancellationTokenSource pollCancellationSource = new CancellationTokenSource(); - public Poll(CommandEventArgs e, string question, IEnumerable enumerable) { + public Poll(CommandEventArgs e, string question, IEnumerable enumerable) + { this.e = e; this.question = question; this.answers = enumerable as string[] ?? enumerable.ToArray(); } - public async Task StartPoll() { + public async Task StartPoll() + { started = DateTime.Now; NadekoBot.Client.MessageReceived += Vote; var msgToSend = @@ -80,17 +91,20 @@ namespace NadekoBot.Commands { await e.Channel.SendMessage(msgToSend); } - public async Task StopPoll(Channel ch) { + public async Task StopPoll(Channel ch) + { NadekoBot.Client.MessageReceived -= Vote; Poll throwaway; PollCommand.ActivePolls.TryRemove(e.Server, out throwaway); - try { + try + { var results = participants.GroupBy(kvp => kvp.Value) .ToDictionary(x => x.Key, x => x.Sum(kvp => 1)) .OrderBy(kvp => kvp.Value); var totalVotesCast = results.Sum(kvp => kvp.Value); - if (totalVotesCast == 0) { + if (totalVotesCast == 0) + { await ch.SendMessage("📄 **No votes have been cast.**"); return; } @@ -98,16 +112,20 @@ namespace NadekoBot.Commands { $"📄 , here are the results:\n"; closeMessage = results.Aggregate(closeMessage, (current, kvp) => current + $"`{kvp.Key}.` **[{answers[kvp.Key - 1]}]**" + $" has {kvp.Value} votes." + - $"({kvp.Value*1.0f/totalVotesCast*100}%)\n"); + $"({kvp.Value * 1.0f / totalVotesCast * 100}%)\n"); await ch.SendMessage($"📄 **Total votes cast**: {totalVotesCast}\n{closeMessage}"); - } catch (Exception ex) { + } + catch (Exception ex) + { Console.WriteLine($"Error in poll game {ex}"); } } - private async void Vote(object sender, MessageEventArgs e) { - try { + private async void Vote(object sender, MessageEventArgs e) + { + try + { if (!e.Channel.IsPrivate) return; if (participants.ContainsKey(e.User)) @@ -117,7 +135,8 @@ namespace NadekoBot.Commands { if (!int.TryParse(e.Message.Text, out vote)) return; if (vote < 1 || vote > answers.Length) return; - if (participants.TryAdd(e.User, vote)) { + if (participants.TryAdd(e.User, vote)) + { await e.User.SendMessage($"Thanks for voting **{e.User.Name}**."); } } diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj index eb596fca..c1b36bd3 100644 --- a/NadekoBot/NadekoBot.csproj +++ b/NadekoBot/NadekoBot.csproj @@ -161,6 +161,7 @@ + @@ -185,7 +186,6 @@ -