From af39acfe038eac6c06d9ce73d8a9d201a6706608 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 31 Jan 2019 11:52:08 +0100 Subject: [PATCH] General cleanup --- DeukBot4/APIHandlers/CatPicHandler.cs | 1 - DeukBot4/Database/DatabaseConnection.cs | 1 - DeukBot4/DeukBot4.csproj | 1 + DeukBot4/Logger.cs | 1 - DeukBot4/MessageHandlers/Attributes/CommandAttribute.cs | 2 ++ .../CommandHandler/CommandContainerBase.cs | 2 -- DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs | 2 -- .../CommandHandler/Commands/GeneralCommands.cs | 8 ++------ .../CommandHandler/Commands/JokeControlCommands.cs | 1 + .../CommandHandler/Commands/ModeratorCommands.cs | 7 ++++++- .../CommandHandler/Commands/OwnerCommands.cs | 6 ++---- DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs | 1 - DeukBot4/MessageHandlers/ImageBackupHandler.cs | 1 - DeukBot4/MessageHandlers/JokeHandling/DadJoke.cs | 1 - DeukBot4/MessageHandlers/JokeHandling/DeltaJoke.cs | 1 - DeukBot4/MessageHandlers/JokeHandling/IJokeController.cs | 3 ++- DeukBot4/MessageHandlers/JokeHandling/JokeHandler.cs | 1 - DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs | 1 - .../MessageHandlers/Permissions/PermissionValidator.cs | 2 -- DeukBot4/MessageHandlers/PointsMessageHandler.cs | 1 - DeukBot4/MessageHandlers/ReminderHandler.cs | 1 - DeukBot4/Program.cs | 2 -- DeukBot4/Settings.cs | 3 +-- DeukBot4/Utilities/BotOpinions.cs | 1 - 24 files changed, 17 insertions(+), 34 deletions(-) diff --git a/DeukBot4/APIHandlers/CatPicHandler.cs b/DeukBot4/APIHandlers/CatPicHandler.cs index d092b38..00c4c4b 100644 --- a/DeukBot4/APIHandlers/CatPicHandler.cs +++ b/DeukBot4/APIHandlers/CatPicHandler.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; using System.Web; -using Discord; namespace DeukBot4.APIHandlers { diff --git a/DeukBot4/Database/DatabaseConnection.cs b/DeukBot4/Database/DatabaseConnection.cs index f9372fa..18b11a7 100644 --- a/DeukBot4/Database/DatabaseConnection.cs +++ b/DeukBot4/Database/DatabaseConnection.cs @@ -1,5 +1,4 @@ using System; -using DeukBot4.MessageHandlers.Permissions; using Npgsql; namespace DeukBot4.Database diff --git a/DeukBot4/DeukBot4.csproj b/DeukBot4/DeukBot4.csproj index 00b2ba0..857cfc3 100644 --- a/DeukBot4/DeukBot4.csproj +++ b/DeukBot4/DeukBot4.csproj @@ -6,6 +6,7 @@ + diff --git a/DeukBot4/Logger.cs b/DeukBot4/Logger.cs index c74fab8..258b61a 100644 --- a/DeukBot4/Logger.cs +++ b/DeukBot4/Logger.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Threading.Tasks; using Discord; diff --git a/DeukBot4/MessageHandlers/Attributes/CommandAttribute.cs b/DeukBot4/MessageHandlers/Attributes/CommandAttribute.cs index 643b6a9..4c6b3ca 100644 --- a/DeukBot4/MessageHandlers/Attributes/CommandAttribute.cs +++ b/DeukBot4/MessageHandlers/Attributes/CommandAttribute.cs @@ -1,9 +1,11 @@ using System; using DeukBot4.MessageHandlers.Permissions; +using JetBrains.Annotations; namespace DeukBot4.MessageHandlers { [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] + [MeansImplicitUse] public class CommandAttribute : Attribute { public string Command { get; } diff --git a/DeukBot4/MessageHandlers/CommandHandler/CommandContainerBase.cs b/DeukBot4/MessageHandlers/CommandHandler/CommandContainerBase.cs index 55cdc7d..13011f0 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/CommandContainerBase.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/CommandContainerBase.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using System.Linq; -using System.Reflection.Metadata.Ecma335; -using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; namespace DeukBot4.MessageHandlers.CommandHandler { diff --git a/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs b/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs index ecbdde0..25f8cfd 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using DeukBot4.MessageHandlers.Permissions; using DeukBot4.Utilities; using Discord; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers.CommandHandler { diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs index 00943e3..1a07307 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/GeneralCommands.cs @@ -1,20 +1,16 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Net; using System.Text; -using System.Threading; using System.Threading.Tasks; -using System.Web; using DeukBot4.APIHandlers; using DeukBot4.Database; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using DeukBot4.MessageHandlers.Permissions; using DeukBot4.Utilities; using Discord; -using Discord.Rest; using Discord.WebSocket; +#pragma warning disable 4014 namespace DeukBot4.MessageHandlers.CommandHandler { @@ -259,7 +255,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler } if (sb.Length > 0) - eb.AddField("Roles", sb.ToString(), false); + eb.AddField("Roles", sb.ToString()); } diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/JokeControlCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/JokeControlCommands.cs index 701804f..a07956f 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/JokeControlCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/JokeControlCommands.cs @@ -5,6 +5,7 @@ using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using DeukBot4.MessageHandlers.JokeHandling; using DeukBot4.MessageHandlers.Permissions; using Discord; +#pragma warning disable 4014 namespace DeukBot4.MessageHandlers.CommandHandler { diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs index 7827bfd..cfa4b3d 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/ModeratorCommands.cs @@ -7,6 +7,7 @@ using DeukBot4.MessageHandlers.Permissions; using DeukBot4.Utilities; using Discord; using Discord.WebSocket; +#pragma warning disable 4014 namespace DeukBot4.MessageHandlers.CommandHandler { @@ -222,12 +223,16 @@ namespace DeukBot4.MessageHandlers.CommandHandler } } - private async Task SilenceUser(IGuildUser user, TimeSpan span) + private static async Task SilenceUser(IGuildUser user, TimeSpan span) { if (user.Id == Program.BotId) { return "Stop trying to mute me."; } + + if (span.TotalHours > 24) + return "Can't mute for that long."; + var silencedRoleId = ServerSettingHandler.GetSettings(user.GuildId).MutedRoleId; if (silencedRoleId == 0) { diff --git a/DeukBot4/MessageHandlers/CommandHandler/Commands/OwnerCommands.cs b/DeukBot4/MessageHandlers/CommandHandler/Commands/OwnerCommands.cs index 9885656..b724001 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/Commands/OwnerCommands.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/Commands/OwnerCommands.cs @@ -1,8 +1,6 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using DeukBot4.MessageHandlers.Permissions; -using DeukBot4.Utilities; using Discord; namespace DeukBot4.MessageHandlers.CommandHandler @@ -33,7 +31,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler [Command("dm", PermissionLevel.BotCreator)] [CommandParameters(ParameterMatcher.ParameterType.Number, ParameterMatcher.ParameterType.Remainder)] - public async Task DMMessage(CommandRequest request) + public async Task DmMessage(CommandRequest request) { if (request.Parameters.Length < 2) return; diff --git a/DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs b/DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs index ec94cce..4771182 100644 --- a/DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs +++ b/DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/DeukBot4/MessageHandlers/ImageBackupHandler.cs b/DeukBot4/MessageHandlers/ImageBackupHandler.cs index 1583db4..d1521c9 100644 --- a/DeukBot4/MessageHandlers/ImageBackupHandler.cs +++ b/DeukBot4/MessageHandlers/ImageBackupHandler.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using Discord; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers { diff --git a/DeukBot4/MessageHandlers/JokeHandling/DadJoke.cs b/DeukBot4/MessageHandlers/JokeHandling/DadJoke.cs index e6a280c..3658df0 100644 --- a/DeukBot4/MessageHandlers/JokeHandling/DadJoke.cs +++ b/DeukBot4/MessageHandlers/JokeHandling/DadJoke.cs @@ -1,7 +1,6 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using Discord; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers.JokeHandling { diff --git a/DeukBot4/MessageHandlers/JokeHandling/DeltaJoke.cs b/DeukBot4/MessageHandlers/JokeHandling/DeltaJoke.cs index bf0fa9b..391c32d 100644 --- a/DeukBot4/MessageHandlers/JokeHandling/DeltaJoke.cs +++ b/DeukBot4/MessageHandlers/JokeHandling/DeltaJoke.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Threading.Tasks; using DeukBot4.APIHandlers; using DeukBot4.Utilities; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers.JokeHandling { diff --git a/DeukBot4/MessageHandlers/JokeHandling/IJokeController.cs b/DeukBot4/MessageHandlers/JokeHandling/IJokeController.cs index 0886e81..811f4d0 100644 --- a/DeukBot4/MessageHandlers/JokeHandling/IJokeController.cs +++ b/DeukBot4/MessageHandlers/JokeHandling/IJokeController.cs @@ -1,8 +1,9 @@ using System.Threading.Tasks; -using Discord.WebSocket; +using JetBrains.Annotations; namespace DeukBot4.MessageHandlers.JokeHandling { + [UsedImplicitly] public interface IJokeController { string Id { get; } diff --git a/DeukBot4/MessageHandlers/JokeHandling/JokeHandler.cs b/DeukBot4/MessageHandlers/JokeHandling/JokeHandler.cs index ae6e8b2..d4341ed 100644 --- a/DeukBot4/MessageHandlers/JokeHandling/JokeHandler.cs +++ b/DeukBot4/MessageHandlers/JokeHandling/JokeHandler.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using DeukBot4.Database.ServerSettings; using Discord; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers.JokeHandling { diff --git a/DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs b/DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs index e3e6343..fed42df 100644 --- a/DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs +++ b/DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs @@ -1,6 +1,5 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers.JokeHandling { diff --git a/DeukBot4/MessageHandlers/Permissions/PermissionValidator.cs b/DeukBot4/MessageHandlers/Permissions/PermissionValidator.cs index 477b056..e715d07 100644 --- a/DeukBot4/MessageHandlers/Permissions/PermissionValidator.cs +++ b/DeukBot4/MessageHandlers/Permissions/PermissionValidator.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using DeukBot4.Database; -using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using Discord; using Discord.WebSocket; diff --git a/DeukBot4/MessageHandlers/PointsMessageHandler.cs b/DeukBot4/MessageHandlers/PointsMessageHandler.cs index 0dc1986..3920c3c 100644 --- a/DeukBot4/MessageHandlers/PointsMessageHandler.cs +++ b/DeukBot4/MessageHandlers/PointsMessageHandler.cs @@ -6,7 +6,6 @@ using DeukBot4.Database; using DeukBot4.MessageHandlers.CommandHandler; using DeukBot4.MessageHandlers.Permissions; using Discord; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers { diff --git a/DeukBot4/MessageHandlers/ReminderHandler.cs b/DeukBot4/MessageHandlers/ReminderHandler.cs index 2accf71..5e90f35 100644 --- a/DeukBot4/MessageHandlers/ReminderHandler.cs +++ b/DeukBot4/MessageHandlers/ReminderHandler.cs @@ -3,7 +3,6 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using DeukBot4.MessageHandlers.CommandHandler; using DeukBot4.Utilities; -using Discord.WebSocket; namespace DeukBot4.MessageHandlers { diff --git a/DeukBot4/Program.cs b/DeukBot4/Program.cs index eb7fb13..786655a 100644 --- a/DeukBot4/Program.cs +++ b/DeukBot4/Program.cs @@ -6,9 +6,7 @@ using DeukBot4.MessageHandlers; using DeukBot4.MessageHandlers.CommandHandler; using DeukBot4.MessageHandlers.JokeHandling; using Discord; -using Discord.Commands.Builders; using Discord.WebSocket; -using StackExchange.Redis; using ReminderHandler = DeukBot4.Database.ReminderHandler; namespace DeukBot4 diff --git a/DeukBot4/Settings.cs b/DeukBot4/Settings.cs index 3a128af..cbeef5f 100644 --- a/DeukBot4/Settings.cs +++ b/DeukBot4/Settings.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using DeukBot4.MessageHandlers; using Newtonsoft.Json; diff --git a/DeukBot4/Utilities/BotOpinions.cs b/DeukBot4/Utilities/BotOpinions.cs index dc15da6..bba35f7 100644 --- a/DeukBot4/Utilities/BotOpinions.cs +++ b/DeukBot4/Utilities/BotOpinions.cs @@ -1,5 +1,4 @@ using System; -using System.Threading.Tasks; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; namespace DeukBot4.Utilities