General cleanup

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
 {

DeukBot4/Database/DatabaseConnection.cs

@@ -1,5 +1,4 @@
 using System;
-using DeukBot4.MessageHandlers.Permissions;
 using Npgsql;
 
 namespace DeukBot4.Database

DeukBot4/DeukBot4.csproj

@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Discord.Net" Version="2.0.0-beta2-01018" />
+    <PackageReference Include="JetBrains.Annotations" Version="2018.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Npgsql" Version="4.0.3" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.513" />

DeukBot4/Logger.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using Discord;
 

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; }

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
 {

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
 {

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());
             }
 
 

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
 {

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<string> SilenceUser(IGuildUser user, TimeSpan span)
+        private static async Task<string> 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)
             {

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;

DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

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
 {

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
 {

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
 {

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; }

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
 {

DeukBot4/MessageHandlers/JokeHandling/ThanksJoke.cs

@@ -1,6 +1,5 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Discord.WebSocket;
 
 namespace DeukBot4.MessageHandlers.JokeHandling
 {

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;
 

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
 {

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
 {

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

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;

DeukBot4/Utilities/BotOpinions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using DeukBot4.MessageHandlers.CommandHandler.RequestStructure;
 
 namespace DeukBot4.Utilities