Implicit usings and more global usings

src/NadekoBot/Bot.cs

@@ -1,17 +1,9 @@
-using Discord;
+using Microsoft.Extensions.DependencyInjection;
-using Discord.Commands;
-using Discord.WebSocket;
-using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Common;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Net.Http;
 using System.Reflection;
-using System.Threading.Tasks;
-using Discord.Net;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.Configs;
 using NadekoBot.Db;
@@ -82,11 +74,11 @@ public sealed class Bot
     {
         var startingGuildIdList = GetCurrentGuildIds();
         var sw = Stopwatch.StartNew();
-        var _bot = Client.CurrentUser;
+        var bot = Client.CurrentUser;
 
         using (var uow = _db.GetDbContext())
         {
-            uow.EnsureUserCreated(_bot.Id, _bot.Username, _bot.Discriminator, _bot.AvatarId);
+            uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
             AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList).ToImmutableArray();
         }
             
@@ -199,7 +191,7 @@ public sealed class Bot
         }
         var filteredTypes = allTypes
             .Where(x => x.IsSubclassOf(typeof(TypeReader))
-                        && x.BaseType.GetGenericArguments().Length > 0
+                        && x.BaseType?.GetGenericArguments().Length > 0
                         && !x.IsAbstract);
 
         var toReturn = new List<object>();
@@ -207,6 +199,8 @@ public sealed class Bot
         {
             var x = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
             var baseType = ft.BaseType;
+            if (baseType is null)
+                continue;
             var typeArgs = baseType.GetGenericArguments();
             _commandService.AddTypeReader(typeArgs[0], x);
             toReturn.Add(x);

src/NadekoBot/Common/AsyncLazy.cs

@@ -1,5 +1,4 @@
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Common;
 

src/NadekoBot/Common/Attributes/Aliases.cs

@@ -1,5 +1,4 @@
 using System.Runtime.CompilerServices;
-using Discord.Commands;
 
 namespace NadekoBot.Common.Attributes;
 

src/NadekoBot/Common/Attributes/BotPerm.cs

@@ -1,6 +1,4 @@
-using Discord.Commands;
+namespace Discord;
-
-namespace Discord;
 
 public class BotPermAttribute : RequireBotPermissionAttribute
 {

src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs

@@ -1,6 +1,4 @@
-using System.IO;
+namespace NadekoBot.Common.Attributes;
-
-namespace NadekoBot.Common.Attributes;
 
 public static class CommandNameLoadHelper
 {

src/NadekoBot/Common/Attributes/Description.cs

@@ -1,6 +1,4 @@
-using Discord.Commands;
+namespace NadekoBot.Common.Attributes;
-
-namespace NadekoBot.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class DescriptionAttribute : SummaryAttribute

src/NadekoBot/Common/Attributes/NadekoCommand.cs

@@ -1,5 +1,4 @@
 using System.Runtime.CompilerServices;
-using Discord.Commands;
 
 namespace NadekoBot.Common.Attributes;
 

src/NadekoBot/Common/Attributes/NadekoModuleAttribute.cs

@@ -1,6 +1,4 @@
-using Discord.Commands;
+namespace NadekoBot.Common.Attributes;
-
-namespace NadekoBot.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Class)]
 sealed class NadekoModuleAttribute : GroupAttribute

src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs

@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
-using Discord.Commands;
-using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 
 namespace NadekoBot.Common.Attributes;
 

src/NadekoBot/Common/Attributes/Ratelimit.cs

@@ -1,7 +1,4 @@
-using Discord.Commands;
+using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Services;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace NadekoBot.Common.Attributes;
 

src/NadekoBot/Common/Attributes/Usage.cs

@@ -1,6 +1,4 @@
-using Discord.Commands;
+namespace NadekoBot.Common.Attributes;
-
-namespace NadekoBot.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class UsageAttribute : RemarksAttribute

src/NadekoBot/Common/Attributes/UserPerm.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
-using Discord.Commands;
-using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Modules.Administration.Services;
 
 namespace Discord;

src/NadekoBot/Common/Collections/ConcurrentHashSet.cs

@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Diagnostics;
-using System.Threading;
 
 namespace NadekoBot.Common.Collections;
 

src/NadekoBot/Common/DownloadTracker.cs

@@ -1,10 +1,4 @@
-using NadekoBot.Services;
+namespace NadekoBot.Common;
-using System.Collections.Concurrent;
-using System.Threading;
-using System.Threading.Tasks;
-using Discord;
-
-namespace NadekoBot.Common;
 
 public class DownloadTracker : INService
 {

src/NadekoBot/Common/Extensions/IBotCredentialsExtensions.cs

@@ -1,6 +1,4 @@
-using Discord;
+namespace NadekoBot.Extensions;
-
-namespace NadekoBot.Extensions;
 
 public static class BotCredentialsExtensions
 {

src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs

@@ -1,8 +1,6 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Common;
 using NadekoBot.Modules.Music;
-using NadekoBot.Services;
 using NadekoBot.Modules.Music.Resolvers;
 using NadekoBot.Modules.Music.Services;
 using StackExchange.Redis;

src/NadekoBot/Common/IBotCredentials.cs

@@ -1,6 +1,4 @@
-using NadekoBot.Common;
+namespace NadekoBot;
-
-namespace NadekoBot;
 
 public interface IBotCredentials
 {

src/NadekoBot/Common/IEmbedBuilder.cs

@@ -1,6 +1,4 @@
-using Discord;
+namespace NadekoBot;
-
-namespace NadekoBot;
 
 public interface IEmbedBuilder
 {

src/NadekoBot/Common/LoginErrorHandler.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Runtime.CompilerServices;
-using Discord.Net;
 
 namespace NadekoBot.Common;
 

src/NadekoBot/Common/ModuleBehaviors/IEarlyBehavior.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.ModuleBehaviors;
-using Discord;
-
-namespace NadekoBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// Implemented by modules which block execution before anything is executed

src/NadekoBot/Common/ModuleBehaviors/IINputTransformer.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.ModuleBehaviors;
-using Discord;
-
-namespace NadekoBot.Common.ModuleBehaviors;
 
 public interface IInputTransformer
 {

src/NadekoBot/Common/ModuleBehaviors/ILateBlocker.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.ModuleBehaviors;
-using Discord.Commands;
-
-namespace NadekoBot.Common.ModuleBehaviors;
 
 public interface ILateBlocker
 {

src/NadekoBot/Common/ModuleBehaviors/ILateExecutor.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.ModuleBehaviors;
-using Discord;
-
-namespace NadekoBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// Last thing to be executed, won't stop further executions

src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.ModuleBehaviors;
-
-namespace NadekoBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// All services which need to execute something after

src/NadekoBot/Common/NadekoModule.cs

@@ -1,10 +1,5 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Services;
-using NadekoBot.Extensions;
 using System.Globalization;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules;
 

src/NadekoBot/Common/NoPublicBotPrecondition.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common;
-using Discord.Commands;
-
-namespace NadekoBot.Common;
 
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
 public sealed class NoPublicBotAttribute : PreconditionAttribute

src/NadekoBot/Common/PubSub/EventPubSub.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common;
-
-namespace NadekoBot.Common;
 
 public class EventPubSub : IPubSub
 {

src/NadekoBot/Common/PubSub/IPubSub.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common;
-
-namespace NadekoBot.Common;
 
 public interface IPubSub
 {

src/NadekoBot/Common/PubSub/RedisPubSub.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Extensions;
-using NadekoBot.Extensions;
 using StackExchange.Redis;
 
 namespace NadekoBot.Common;

src/NadekoBot/Common/Replacements/ReplacementBuilder.cs

@@ -1,12 +1,8 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Common.Replacements;
+namespace NadekoBot.Common;
 
 public class ReplacementBuilder
 {

src/NadekoBot/Common/Replacements/Replacer.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Common.Replacements;
+namespace NadekoBot.Common;
 
 public class Replacer
 {

src/NadekoBot/Common/SmartText/SmartEmbedText.cs

@@ -1,5 +1,4 @@
-using Discord;
+using NadekoBot.Extensions;
-using NadekoBot.Extensions;
 
 namespace NadekoBot;
 

src/NadekoBot/Common/SocketMessageEventWrapper.cs

@@ -1,8 +1,4 @@
-using Discord;
+namespace NadekoBot.Common;
-using Discord.WebSocket;
-using System.Threading.Tasks;
-
-namespace NadekoBot.Common;
 
 public sealed class ReactionEventWrapper : IDisposable
 {

src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Modules.CustomReactions.Services;
-using Discord.Commands;
-using NadekoBot.Services;
-using NadekoBot.Modules.CustomReactions.Services;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Common/TypeReaders/EmoteTypeReader.cs

@@ -1,8 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.TypeReaders;
-using Discord;
-using Discord.Commands;
-
-namespace NadekoBot.Common.TypeReaders;
 
 public sealed class EmoteTypeReader : NadekoTypeReader<Emote>
 {

src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Modules.Administration.Services;
-using Discord.Commands;
-using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Common/TypeReaders/GuildTypeReader.cs

@@ -1,9 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.TypeReaders;
-using Discord.Commands;
-using Discord.WebSocket;
-using Discord;
-
-namespace NadekoBot.Common.TypeReaders;
 
 public sealed class GuildTypeReader : NadekoTypeReader<IGuild>
 {

src/NadekoBot/Common/TypeReaders/KwumTypeReader.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.TypeReaders;
-using Discord.Commands;
-
-namespace NadekoBot.Common.TypeReaders;
 
 public sealed class KwumTypeReader : NadekoTypeReader<kwum>
 {

src/NadekoBot/Common/TypeReaders/ModuleTypeReader.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Common/TypeReaders/NadekoTypeReader.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.TypeReaders;
-using Discord.Commands;
-
-namespace NadekoBot.Common.TypeReaders;
 
 public abstract class NadekoTypeReader<T> : TypeReader
 {

src/NadekoBot/Common/TypeReaders/PermissionActionTypeReader.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Common.TypeReaders.Models;
-using Discord.Commands;
-using NadekoBot.Common.TypeReaders.Models;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Common/TypeReaders/Rgba32TypeReader.cs

@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
+namespace NadekoBot.Common.TypeReaders;
-using Discord.Commands;
+using Color = SixLabors.ImageSharp.Color;
-using SixLabors.ImageSharp;
-
-namespace NadekoBot.Common.TypeReaders;
 
 public sealed class Rgba32TypeReader : NadekoTypeReader<Color>
 {

src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs

@@ -1,9 +1,6 @@
-using Discord.Commands;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
-using NadekoBot.Services;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Common/TypeReaders/StoopidTimeTypeReader.cs

@@ -1,6 +1,4 @@
-using Discord.Commands;
+using NadekoBot.Common.TypeReaders.Models;
-using NadekoBot.Common.TypeReaders.Models;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Common.TypeReaders;
 

src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs

@@ -1,6 +1,5 @@
 using NadekoBot.Db.Models;
 using Microsoft.EntityFrameworkCore;
-using Discord;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Services.Database;

src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db;

src/NadekoBot/Db/Extensions/QuoteExtensions.cs

@@ -1,7 +1,5 @@
 using NadekoBot.Services.Database.Models;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Common;
 
 namespace NadekoBot.Db;
 

src/NadekoBot/Db/Extensions/WarningExtensions.cs

@@ -1,6 +1,5 @@
 using NadekoBot.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Db;
 

src/NadekoBot/Db/Models/DiscordPemOverride.cs

@@ -1,6 +1,4 @@
-using Discord;
+namespace NadekoBot.Services.Database.Models;
-
-namespace NadekoBot.Services.Database.Models;
 
 public class DiscordPermOverride : DbEntity
 {

src/NadekoBot/Db/Models/FilterChannelId.cs

@@ -4,15 +4,26 @@ public class FilterChannelId : DbEntity
 {
     public ulong ChannelId { get; set; }
 
+    public bool Equals(FilterChannelId other) 
+        => ChannelId == other.ChannelId;
+
     public override bool Equals(object obj)
-    {
+        => obj is FilterChannelId fci && Equals(fci); 
-        return obj is FilterChannelId f
-            ? f.ChannelId == ChannelId
-            : false;
-    }
 
     public override int GetHashCode() 
-    {
+        => ChannelId.GetHashCode();
-        return ChannelId.GetHashCode();
+}
-    }
+
+public class FilterInvitesChannelId : DbEntity
+{
+    public ulong ChannelId { get; set; }
+
+    public bool Equals(FilterInvitesChannelId other) 
+        => ChannelId == other.ChannelId;
+
+    public override bool Equals(object obj)
+        => obj is FilterInvitesChannelId fci && Equals(fci); 
+
+    public override int GetHashCode() 
+        => ChannelId.GetHashCode();
 }

src/NadekoBot/Db/Models/FilterLinksChannelId.cs

@@ -5,14 +5,9 @@ public class FilterLinksChannelId : DbEntity
     public ulong ChannelId { get; set; }
 
     public override bool Equals(object obj)
-    {
+        => obj is FilterLinksChannelId f
-        return obj is FilterLinksChannelId f
+           && f.ChannelId == ChannelId;
-            ? f.ChannelId == ChannelId
-            : false;
-    }
 
     public override int GetHashCode() 
-    {
+        => ChannelId.GetHashCode();
-        return ChannelId.GetHashCode();
-    }
 }

src/NadekoBot/Db/Models/RotatingPlayingStatus.cs

@@ -1,6 +1,4 @@
-using Discord;
+namespace NadekoBot.Services.Database.Models;
-
-namespace NadekoBot.Services.Database.Models;
 
 public class RotatingPlayingStatus : DbEntity
 {

src/NadekoBot/Db/NadekoContext.cs

@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using NadekoBot.Services.Database.Models;
-using System.IO;
 using Microsoft.Extensions.Logging;
 using NadekoBot.Db.Models;
 

src/NadekoBot/GlobalUsings.cs

@@ -0,0 +1,13 @@
+global using Serilog;
+
+global using NadekoBot;
+global using NadekoBot.Services;
+global using NadekoBot.Common;
+global using NadekoBot.Common.Attributes;
+
+global using Discord;
+global using Discord.Commands;
+global using Discord.Net;
+global using Discord.WebSocket;
+
+global using System.Collections.Concurrent;

src/NadekoBot/Modules/Administration/Administration.cs

@@ -1,11 +1,6 @@
-using Discord;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Common.Attributes;
 using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/AutoAssignRoleCommands.cs

@@ -1,8 +1,4 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Administration/Common/ProtectionStats.cs

@@ -1,7 +1,4 @@
-using System.Collections.Concurrent;
+using NadekoBot.Common.Collections;
-using System.Threading;
-using Discord;
-using NadekoBot.Common.Collections;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Common;

src/NadekoBot/Modules/Administration/Common/PunishQueueItem.cs

@@ -1,5 +1,4 @@
-using Discord;
+using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Common;
 

src/NadekoBot/Modules/Administration/Common/UserSpamStats.cs

@@ -1,8 +1,4 @@
-using System.Collections.Concurrent;
+namespace NadekoBot.Modules.Administration.Common;
-using System.Threading;
-using Discord;
-
-namespace NadekoBot.Modules.Administration.Common;
 
 public sealed class UserSpamStats : IDisposable
 {

src/NadekoBot/Modules/Administration/DangerousCommands.cs

@@ -1,8 +1,4 @@
-using Discord.Commands;
+using NadekoBot.Extensions;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using Discord;
 using NadekoBot.Modules.Administration.Services;
 
 #if !GLOBAL_NADEKO

src/NadekoBot/Modules/Administration/DiscordPermOverrideCommands.cs

@@ -1,8 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Common.TypeReaders;
-using Discord;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common.TypeReaders;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/GameChannelCommands.cs

@@ -1,8 +1,4 @@
-using Discord;
+using NadekoBot.Modules.Administration.Services;
-using Discord.Commands;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/LocalizationCommands.cs

@@ -1,9 +1,5 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
 using System.Globalization;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/LogCommands.cs

@@ -1,12 +1,7 @@
-using Discord;
+using NadekoBot.Common.TypeReaders.Models;
-using Discord.Commands;
-using NadekoBot.Common;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/MuteCommands.cs

@@ -1,10 +1,5 @@
-using Discord;
+using NadekoBot.Common.TypeReaders.Models;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
-using Discord.WebSocket;
 using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Administration/PlayingRotateCommands.cs

@@ -1,8 +1,4 @@
-using Discord.Commands;
+using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Modules.Administration.Services;
-using Discord;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/PrefixCommands.cs

@@ -1,9 +1,4 @@
-using Discord;
+namespace NadekoBot.Modules.Administration;
-using Discord.Commands;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
-
-namespace NadekoBot.Modules.Administration;
 
 public partial class Administration
 {

src/NadekoBot/Modules/Administration/ProtectionCommands.cs

@@ -1,11 +1,7 @@
-using Discord;
+using NadekoBot.Services.Database.Models;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
 using NadekoBot.Common.TypeReaders.Models;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Administration/PruneCommands.cs

@@ -1,8 +1,4 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
 using ITextChannel = Discord.ITextChannel;
 

src/NadekoBot/Modules/Administration/RoleCommands.cs

@@ -1,14 +1,8 @@
-using Discord;
+using NadekoBot.Services.Database.Models;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Common;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using SixLabors.ImageSharp.PixelFormats;
 using System.Net;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/SelfAssignedRolesCommands.cs

@@ -1,8 +1,4 @@
 using System.Text;
-using System.Threading.Tasks;
-using Discord;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Extensions;
 

src/NadekoBot/Modules/Administration/SelfCommands.cs

@@ -1,14 +1,6 @@
-using Discord;
-using Discord.Commands;
-using Discord.Net;
-using Discord.WebSocket;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common.Replacements;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/ServerGreetCommands.cs

@@ -1,9 +1,4 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Services;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
 
 namespace NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Administration/Services/AdministrationService.cs

@@ -1,14 +1,7 @@
-using Discord;
+using Microsoft.EntityFrameworkCore;
-using Discord.Commands;
-using Discord.WebSocket;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
-using NadekoBot.Common.Replacements;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
 using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Administration.Services;

src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs

@@ -1,8 +1,4 @@
-using System.Collections.Concurrent;
+using System.Threading.Channels;
-using System.Threading.Tasks;
-using Discord.WebSocket;
-using NadekoBot.Services;
-using System.Threading.Channels;
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Services.Database.Models;

src/NadekoBot/Modules/Administration/Services/DangerousCommandsService.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Services.Database.Models;

src/NadekoBot/Modules/Administration/Services/DiscordPermOverrideService.cs

@@ -1,10 +1,5 @@
-using System.Collections.Concurrent;
+using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
-using Discord;
-using Discord.Commands;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 

src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs

@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
+using NadekoBot.Common.Collections;
-using Discord.WebSocket;
-using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Administration.Services;

src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs

@@ -1,9 +1,5 @@
-using System.Collections.Concurrent;
+using NadekoBot.Extensions;
-using Discord.WebSocket;
-using NadekoBot.Extensions;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
-using System.Threading.Tasks;
 using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Administration.Services;

src/NadekoBot/Modules/Administration/Services/ImageOnlyChannelService.cs

@@ -1,16 +1,10 @@
-using System.Collections.Concurrent;
+using System.Net;
-using System.Net;
 using System.Threading.Channels;
-using System.Threading.Tasks;
-using Discord;
-using Discord.Net;
-using Discord.WebSocket;
 using LinqToDB;
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/Services/LogCommandService.cs

@@ -1,12 +1,6 @@
-using System.Collections.Concurrent;
+using Microsoft.EntityFrameworkCore;
-using System.Threading;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;

src/NadekoBot/Modules/Administration/Services/MuteService.cs

@@ -1,12 +1,6 @@
-using System.Collections.Concurrent;
+using Microsoft.EntityFrameworkCore;
-using System.Threading;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 

src/NadekoBot/Modules/Administration/Services/PlayingRotateService.cs

@@ -1,12 +1,5 @@
-using System.Threading;
+using NadekoBot.Services.Database.Models;
-using Discord.WebSocket;
-using NadekoBot.Common.Replacements;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using Discord;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/Services/ProtectionService.cs

@@ -1,10 +1,5 @@
-using System.Collections.Concurrent;
+using System.Threading.Channels;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
 using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using Microsoft.EntityFrameworkCore;

src/NadekoBot/Modules/Administration/Services/PruneService.cs

@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
+using NadekoBot.Common.Collections;
-using Discord;
-using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs

@@ -1,16 +1,10 @@
-using Discord;
+using Microsoft.EntityFrameworkCore;
-using Discord.WebSocket;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Db;
-using System.Threading;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs

@@ -1,7 +1,4 @@
-using Discord;
+using NadekoBot.Services.Database.Models;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db;
 using NadekoBot.Modules.Xp;

src/NadekoBot/Modules/Administration/Services/SelfService.cs

@@ -1,16 +1,8 @@
 using System.Collections.Immutable;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Services.Database.Models;
-using System.Threading;
-using System.Collections.Concurrent;
-using System.Net.Http;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/NadekoBot/Modules/Administration/Services/UserPunishService.cs

@@ -1,12 +1,5 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Discord;
-using Discord.Commands;
-using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Common.Replacements;
 using NadekoBot.Common.TypeReaders.Models;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;

src/NadekoBot/Modules/Administration/Services/VcRoleService.cs

@@ -1,9 +1,4 @@
-using System.Collections.Concurrent;
+using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
-using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 

src/NadekoBot/Modules/Administration/TimeZoneCommands.cs

@@ -1,8 +1,4 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Administration/UserPunishCommands.cs

@@ -1,14 +1,8 @@
 using CommandLine;
-using Discord;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common;
 using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using System.Threading.Tasks;
 using NadekoBot.Modules.Permissions.Services;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Administration/VcRoleCommands.cs

@@ -1,10 +1,4 @@
-using System.Collections.Concurrent;
+using NadekoBot.Extensions;
-using Discord;
-using Discord.Commands;
-using System.Threading.Tasks;
-using Discord.WebSocket;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;

src/NadekoBot/Modules/CustomReactions/Common/ExportedExpr.cs

@@ -1,5 +1,4 @@
 using NadekoBot.Services.Database.Models;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.CustomReactions;
 

src/NadekoBot/Modules/CustomReactions/CustomReactions.cs

@@ -1,11 +1,5 @@
-using Discord;
+using NadekoBot.Extensions;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Extensions;
 using NadekoBot.Modules.CustomReactions.Services;
-using System.Net.Http;
-using System.Threading.Tasks;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.CustomReactions;
 

src/NadekoBot/Modules/CustomReactions/Extensions/CustomReactionExtensions.cs

@@ -1,10 +1,6 @@
-using Discord;
+using NadekoBot.Services.Database.Models;
-using Discord.WebSocket;
-using NadekoBot.Common.Replacements;
-using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.CustomReactions.Extensions;
 

src/NadekoBot/Modules/CustomReactions/Services/CustomReactionsService.cs

@@ -1,16 +1,10 @@
-using Discord;
+using NadekoBot.Common.ModuleBehaviors;
-using Discord.WebSocket;
-using NadekoBot.Common;
-using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.CustomReactions.Extensions;
 using NadekoBot.Modules.Permissions.Common;
 using NadekoBot.Modules.Permissions.Services;
-using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Yml;
 using NadekoBot.Db;

src/NadekoBot/Modules/Gambling/AnimalRacingCommands.cs

@@ -1,11 +1,4 @@
-using System.Threading.Tasks;
+using NadekoBot.Modules.Gambling.Common;
-using Discord;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common;
-using NadekoBot.Services;
-using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Extensions;

src/NadekoBot/Modules/Gambling/BlackJackCommands.cs

@@ -1,13 +1,7 @@
-using Discord;
+using NadekoBot.Modules.Gambling.Common;
-using Discord.Commands;
-using NadekoBot.Common.Attributes;
-using NadekoBot.Common;
-using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Blackjack;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling;
 

src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs

@@ -1,8 +1,4 @@
-using System.Threading;
+using NadekoBot.Extensions;
-using System.Threading.Tasks;
-using NadekoBot.Common;
-using NadekoBot.Services;
-using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing.Exceptions;
 using NadekoBot.Modules.Games.Common;