From 1cb3f981d5c29349eeac3e4e133b3b4c101fa3ad Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 31 Mar 2018 18:50:06 +0200 Subject: [PATCH] Added some help text --- .../Commands/GeneralCommands.cs | 1 + .../Commands/ModeratorCommands.cs | 49 ++++++++++--------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs index 4b7a29a..9ca3e59 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs @@ -12,6 +12,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler public override string Name => "General"; [Command("info", PermissionLevel.Everyone)] + [CommandHelp("Gives basic info on the bot", "Gives basic info on the bot")] public async Task Info(CommandRequest request) { var embed = new EmbedBuilder diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs index 033d317..99a8cfb 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Threading.Tasks; using DeukBot4.Database.ServerSettings; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; @@ -106,6 +105,13 @@ namespace DeukBot4.MessageHandlers.CommandHandler [Command("mute", PermissionLevel.Helper)] [CommandParameters(ParameterMatcher.ParameterType.User, ParameterMatcher.ParameterType.Timespan)] [CommandParameters(ParameterMatcher.ParameterType.User, ParameterMatcher.ParameterType.Number)] + [CommandHelp("Silences a user for a set amount of time", + "Allows you to mute a user for a set amount of time.\n." + + "Usage:\n" + + "``mute {User Mention} {amount of minutes to silence}``\n" + + "``mute {User ID} {amount of minutes to silence}``\n" + + "``mute {User Mention} {Timespan (amount + time indicator: i.e. 5s, 10m, 3h, 1d)}``\n" + + "``mute {User ID} {Timespan (amount + time indicator: i.e. 5s, 10m, 3h, 1d)}``\n")] [BlockUsageInPm] public async Task SilenceUser(CommandRequest request) { @@ -140,30 +146,29 @@ namespace DeukBot4.MessageHandlers.CommandHandler await user.AddRoleAsync(silencedRole); TimeSpan span; - if (request.Parameters[1].Type == ParameterMatcher.ParameterType.Number) + switch (request.Parameters[1].Type) { - var minutes = request.Parameters[1].AsInt(); - if (!minutes.HasValue) - return; + case ParameterMatcher.ParameterType.Number: + var minutes = request.Parameters[1].AsInt(); + if (!minutes.HasValue) + return; - span = TimeSpan.FromMinutes(minutes.Value); - } - else if (request.Parameters[1].Type == ParameterMatcher.ParameterType.Timespan) - { - var sp = TimespanParser.Parse(request.Parameters[1].AsString()); - if (sp.HasValue) - { - span = sp.Value; - } - else - { - Console.WriteLine("this"); + span = TimeSpan.FromMinutes(minutes.Value); + break; + case ParameterMatcher.ParameterType.Timespan: + var sp = TimespanParser.Parse(request.Parameters[1].AsString()); + if (sp.HasValue) + { + span = sp.Value; + } + else + { + return; + } + + break; + default: return; - } - } - else - { - return; } await Task.Delay(span);