More cleanup, namespace fixes, convenience methods for IKernel

src/Nadeko.Bot.Common/Abstractions/creds/IBotCredentials.cs

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

src/Nadeko.Bot.Common/Abstractions/strings/IBotStrings.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using System.Globalization;
-using NadekoBot.Services;
 
 namespace NadekoBot.Common;
 

src/Nadeko.Bot.Common/BotCommandTypeReader.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using NadekoBot.Services;
-
 namespace NadekoBot.Common.TypeReaders;
 
 public sealed class CommandTypeReader : NadekoTypeReader<CommandInfo>

src/Nadeko.Bot.Common/Common/TypeReaders/KwumTypeReader.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Common;
-
 namespace NadekoBot.Common.TypeReaders;
 
 public sealed class KwumTypeReader : NadekoTypeReader<kwum>

src/Nadeko.Bot.Common/Extensions/ImagesharpExtensions.cs

@@ -1,5 +1,4 @@
-using SixLabors.Fonts;
+using SixLabors.ImageSharp;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Formats;

src/Nadeko.Bot.Common/IPermissionChecker.cs

@@ -1,6 +1,4 @@
-using NadekoBot;
+using OneOf;
-using NadekoBot.Services;
-using OneOf;
 using OneOf.Types;
 
 namespace Nadeko.Bot.Common;

src/Nadeko.Bot.Common/Interaction/NadekoInteractionService.cs

@@ -1,6 +1,4 @@
-using NadekoBot.Services;
+namespace NadekoBot;
-
-namespace NadekoBot;
 
 public class NadekoInteractionService : INadekoInteractionService, INService
 {

src/Nadeko.Bot.Common/ModuleBehaviors/IBehavior.cs

@@ -0,0 +1,6 @@
+namespace NadekoBot.Common.ModuleBehaviors;
+
+public interface IBehavior
+{
+    public virtual string Name => this.GetType().Name;
+}

src/Nadeko.Bot.Common/ModuleBehaviors/IExecNoCommand.cs

@@ -3,7 +3,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 /// <summary>
 ///     Executed if no command was found for this message
 /// </summary>
-public interface IExecNoCommand
+public interface IExecNoCommand : IBehavior
 {
     /// <summary>
     /// Executed at the end of the lifecycle if no command was found

src/Nadeko.Bot.Common/ModuleBehaviors/IExecOnMessage.cs

@@ -3,7 +3,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 /// <summary>
 ///     Implemented by modules to handle non-bot messages received
 /// </summary>
-public interface IExecOnMessage
+public interface IExecOnMessage : IBehavior
 {
     int Priority { get; }
 

src/Nadeko.Bot.Common/ModuleBehaviors/IExecPostCommand.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 /// ***There is no support for this method in NadekoBot services.***
 /// It is only meant to be used in medusa system
 /// </summary>
-public interface IExecPostCommand
+public interface IExecPostCommand : IBehavior
 {
     /// <summary>
     /// Executed after a command was successfully executed

src/Nadeko.Bot.Common/ModuleBehaviors/IExecPreCommand.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 /// This interface's method is executed after a command was found but before it was executed.
 /// Able to block further processing of a command
 /// </summary>
-public interface IExecPreCommand
+public interface IExecPreCommand : IBehavior
 {
     public int Priority { get; }
 

src/Nadeko.Bot.Common/ModuleBehaviors/IInputTransformer.cs

@@ -3,7 +3,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 /// <summary>
 /// Implemented by services which may transform input before a command is searched for
 /// </summary>
-public interface IInputTransformer
+public interface IInputTransformer : IBehavior
 {
     /// <summary>
     /// Ran after a non-bot message was received

src/Nadeko.Bot.Common/ModuleBehaviors/IReadyExecutor.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Common.ModuleBehaviors;
 ///     All services which need to execute something after
 ///     the bot is ready should implement this interface
 /// </summary>
-public interface IReadyExecutor
+public interface IReadyExecutor : IBehavior
 {
     /// <summary>
     ///     Executed when bot is ready

src/Nadeko.Bot.Common/Replacements/ReplacementBuilder.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using System.Text.RegularExpressions;
-using NonBlocking;
 
 namespace NadekoBot.Common;
 

src/Nadeko.Bot.Common/Replacements/Replacer.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using System.Text.RegularExpressions;
-using Nadeko.Common;
 
 namespace NadekoBot.Common;
 

src/Nadeko.Bot.Common/Services/Currency/DefaultWallet.cs

@@ -1,6 +1,5 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
-using NadekoBot.Services.Database;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Services.Currency;

src/Nadeko.Bot.Common/Services/ICommandHandler.cs

@@ -1,7 +1,4 @@
-using NadekoBot.Modules.Administration;
+namespace NadekoBot.Services;
-using NonBlocking;
-
-namespace NadekoBot.Services;
 
 public interface ICommandHandler
 {

src/Nadeko.Bot.Common/Services/Impl/BehaviorExecutor.cs

@@ -1,12 +1,11 @@
 #nullable disable
 using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.ModuleBehaviors;
-using Ninject;
 
 namespace NadekoBot.Services;
 
 // should be renamed to handler as it's not only executing
-public sealed class BehaviorHandler : IBehaviorHandler, INService
+public sealed class BehaviorHandler : IBehaviorHandler 
 {
     private readonly IServiceProvider _services;
     
@@ -152,10 +151,8 @@ public sealed class BehaviorHandler : IBehaviorHandler, INService
         return false;
     }
 
-    private string GetExecName(object exec)
+    private string GetExecName(IBehavior exec)
-        => exec is BehaviorAdapter ba
+        => exec.Name;
-            ? ba.ToString()
-            : exec.GetType().Name;
 
     public async Task<bool> RunPreCommandAsync(ICommandContext ctx, CommandInfo cmd)
     {

src/Nadeko.Bot.Common/Services/Impl/DiscordPermOverrideService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Services.Database.Models;
 

src/Nadeko.Bot.Common/Services/Impl/YtdlOperation.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Text;
-using Nadeko.Common;
 
 namespace NadekoBot.Services;
 

src/Nadeko.Bot.Common/Settings/ConfigServiceBase.cs

@@ -2,7 +2,6 @@ using NadekoBot.Common.Configs;
 using NadekoBot.Common.Yml;
 using System.Linq.Expressions;
 using System.Reflection;
-using NadekoBot.Common;
 
 namespace NadekoBot.Services;
 

src/Nadeko.Bot.Common/_Extensions/Extensions.cs

@@ -4,8 +4,6 @@ using System.Globalization;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using Nadeko.Medusa;
-using NadekoBot.Common;
-using Serilog;
 
 namespace NadekoBot.Extensions;
 

src/Nadeko.Bot.Common/_Extensions/IMessageChannelExtensions.cs

@@ -1,7 +1,3 @@
-using NadekoBot.Common;
-using NadekoBot.Services;
-using Serilog;
-
 namespace NadekoBot.Extensions;
 
 public static class MessageChannelExtensions

src/Nadeko.Bot.Common/_Extensions/SocketMessageComponentExtensions.cs

@@ -1,8 +1,4 @@
-using Nadeko.Common;
+namespace NadekoBot.Extensions;
-using NadekoBot.Common;
-using NadekoBot.Services;
-
-namespace NadekoBot.Extensions;
 
 public static class SocketMessageComponentExtensions
 {

src/Nadeko.Bot.Common/_Extensions/UserExtensions.cs

@@ -1,5 +1,4 @@
 using NadekoBot.Db.Models;
-using NadekoBot.Services;
 
 namespace NadekoBot.Extensions;
 

src/Nadeko.Bot.Db/Extensions/QuoteExtensions.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db;

src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.cs

@@ -1,5 +1,4 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

src/Nadeko.Bot.Db/Models/Permission.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
-using Nadeko.Common;
 
 namespace NadekoBot.Services.Database.Models;
 

src/Nadeko.Bot.Db/Models/Poll.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Common;
-
 namespace NadekoBot.Services.Database.Models;
 
 public class Poll : DbEntity

src/Nadeko.Bot.Db/Models/ShopEntry.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Common;
-
 namespace NadekoBot.Services.Database.Models;
 
 public enum ShopEntryType

src/Nadeko.Bot.Db/NadekoContext.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using NadekoBot.Db.Models;
 using NadekoBot.Services.Database.Models;
 

src/Nadeko.Bot.Generators.Cloneable/SymbolExtensions.cs

@@ -1,8 +1,7 @@
 // Code temporarily yeeted from
 // https://github.com/mostmand/Cloneable/blob/master/Cloneable/CloneableGenerator.cs
 // because of NRT issue
-using System.Collections.Generic;
+
-using System.Linq;
 using Microsoft.CodeAnalysis;
 
 namespace Cloneable

src/Nadeko.Bot.Generators.Cloneable/SyntaxReceiver.cs

@@ -1,7 +1,7 @@
 // Code temporarily yeeted from
 // https://github.com/mostmand/Cloneable/blob/master/Cloneable/CloneableGenerator.cs
 // because of NRT issue
-using System.Collections.Generic;
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 

src/Nadeko.Bot.Generators.Strings/LocalizedStringsGenerator.cs

@@ -1,10 +1,6 @@
 #nullable enable
-using System;
 using System.CodeDom.Compiler;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 using Newtonsoft.Json;
@@ -43,7 +39,6 @@ namespace NadekoBot.Generators
 
         public void Initialize(GeneratorInitializationContext context)
         {
-
         }
 
         public void Execute(GeneratorExecutionContext context)
@@ -55,6 +50,7 @@ namespace NadekoBot.Generators
             using (var stringWriter = new StringWriter())
             using (var sw = new IndentedTextWriter(stringWriter))
             {
+                sw.WriteLine("#pragma warning disable CS8981");
                 sw.WriteLine("namespace NadekoBot;");
                 sw.WriteLine();
 

src/Nadeko.Bot.Modules.Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;

src/Nadeko.Bot.Modules.Administration/Mute/MuteService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
 

src/Nadeko.Bot.Modules.Administration/PermOverrides/DiscordPermOverrideCommands.cs

@@ -1,8 +1,5 @@
 #nullable disable
-using Nadeko.Common;
-using Nadeko.Bot.Db;
 using NadekoBot.Common.TypeReaders;
-using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;
 

src/Nadeko.Bot.Modules.Administration/Role/RoleCommands.cs

@@ -1,8 +1,5 @@
 #nullable disable
-using NadekoBot.Modules.Administration.Services;
-using NadekoBot.Services.Database.Models;
 using SixLabors.ImageSharp.PixelFormats;
-using System.Net;
 using Color = SixLabors.ImageSharp.Color;
 
 namespace NadekoBot.Modules.Administration;

src/Nadeko.Bot.Modules.Administration/Self/SelfService.cs

@@ -3,7 +3,6 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Services.Database.Models;
 using System.Collections.Immutable;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/Nadeko.Bot.Modules.Administration/ServerLog/ServerLogCommandService.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
-using Nadeko.Common;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
 using NadekoBot.Modules.Administration.Services;

src/Nadeko.Bot.Modules.Administration/VcRole/VcRoleService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
 

src/Nadeko.Bot.Modules.Expresssions/ExportedExpr.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.NadekoExpressions;

src/Nadeko.Bot.Modules.Expresssions/NadekoExpressionExtensions.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using NadekoBot.Services.Database.Models;
 using System.Runtime.CompilerServices;
-using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.NadekoExpressions;
 

src/Nadeko.Bot.Modules.Expresssions/NadekoExpressionsService.cs

@@ -7,7 +7,6 @@ using NadekoBot.Services.Database.Models;
 using System.Runtime.CompilerServices;
 using LinqToDB.EntityFrameworkCore;
 using Nadeko.Bot.Common;
-using Nadeko.Common;
 using NadekoBot.Services;
 using Serilog;
 using YamlDotNet.Serialization;

src/Nadeko.Bot.Modules.Gambling/Gambling/AnimalRacing/AnimalRace.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing.Exceptions;
 using NadekoBot.Modules.Games.Common;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/AnimalRacing/AnimalRacingCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;

src/Nadeko.Bot.Modules.Gambling/Gambling/Bank/BankService.cs

@@ -1,6 +1,5 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
-using NadekoBot.Db.Models;
 
 namespace NadekoBot.Modules.Gambling.Bank;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/BlackJack/BlackJackCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Blackjack;

src/Nadeko.Bot.Modules.Gambling/Gambling/Events/GameStatusEvent.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using NadekoBot.Services.Database.Models;
 using System.Collections.Concurrent;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Gambling.Common.Events;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/FlipCoin/FlipCoinCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;

src/Nadeko.Bot.Modules.Gambling/Gambling/GamblingConfigService.cs

@@ -1,8 +1,6 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.Configs;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling.Services;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/GamblingService.cs

@@ -14,8 +14,6 @@ public class GamblingService : INService, IReadyExecutor
     public ConcurrentDictionary<(ulong, ulong), RollDuelGame> Duels { get; } = new();
     public ConcurrentDictionary<ulong, Connect4Game> Connect4Games { get; } = new();
     private readonly DbService _db;
-    private readonly ICurrencyService _cs;
-    private readonly IBot _bot;
     private readonly DiscordSocketClient _client;
     private readonly IBotCache _cache;
     private readonly GamblingConfigService _gss;
@@ -24,13 +22,11 @@ public class GamblingService : INService, IReadyExecutor
 
     public GamblingService(
         DbService db,
-        ICurrencyService cs,
         DiscordSocketClient client,
         IBotCache cache,
         GamblingConfigService gss)
     {
         _db = db;
-        _cs = cs;
         _client = client;
         _cache = cache;
         _gss = gss;
@@ -57,7 +53,7 @@ public class GamblingService : INService, IReadyExecutor
                 var days = TimeSpan.FromDays(lifetime);
                 await using var uow = _db.GetDbContext();
                 await uow.CurrencyTransactions
-                         .DeleteAsync(ct => ct.DateAdded == null || now - ct.DateAdded < days);
+                    .DeleteAsync(ct => ct.DateAdded == null || now - ct.DateAdded < days);
             }
             catch (Exception ex)
             {
@@ -67,7 +63,7 @@ public class GamblingService : INService, IReadyExecutor
             }
         }
     }
-    
+
     private async Task CurrencyDecayLoopAsync()
     {
         if (_client.ShardId != 0)
@@ -84,7 +80,7 @@ public class GamblingService : INService, IReadyExecutor
                     continue;
 
                 var now = DateTime.UtcNow;
-                
+
                 await using var uow = _db.GetDbContext();
                 var result = await _cache.GetAsync(_curDecayKey);
 
@@ -109,14 +105,14 @@ public class GamblingService : INService, IReadyExecutor
 
                 var decay = (double)config.Decay.Percent;
                 await uow.DiscordUser
-                         .Where(x => x.CurrencyAmount > config.Decay.MinThreshold && x.UserId != _client.CurrentUser.Id)
+                    .Where(x => x.CurrencyAmount > config.Decay.MinThreshold && x.UserId != _client.CurrentUser.Id)
-                         .UpdateAsync(old => new()
+                    .UpdateAsync(old => new()
-                         {
+                    {
-                             CurrencyAmount =
+                        CurrencyAmount =
-                                 maxDecay > Sql.Round((old.CurrencyAmount * decay) - 0.5)
+                            maxDecay > Sql.Round((old.CurrencyAmount * decay) - 0.5)
-                                     ? (long)(old.CurrencyAmount - Sql.Round((old.CurrencyAmount * decay) - 0.5))
+                                ? (long)(old.CurrencyAmount - Sql.Round((old.CurrencyAmount * decay) - 0.5))
-                                     : old.CurrencyAmount - maxDecay 
+                                : old.CurrencyAmount - maxDecay
-                         });
+                    });
 
                 await uow.SaveChangesAsync();
 
@@ -145,7 +141,7 @@ public class GamblingService : INService, IReadyExecutor
                 var waifus = uow.WaifuInfo.GetTotalValue();
                 var bot = await uow.DiscordUser.GetUserCurrencyAsync(_client.CurrentUser.Id);
                 decimal bank = await uow.GetTable<BankUser>()
-                                        .SumAsyncLinqToDB(x => x.Balance);
+                    .SumAsyncLinqToDB(x => x.Balance);
 
                 var result = new EconomyResult
                 {
@@ -165,10 +161,11 @@ public class GamblingService : INService, IReadyExecutor
     }
 
 
-    private static readonly SemaphoreSlim _timelyLock = new (1, 1);
+    private static readonly SemaphoreSlim _timelyLock = new(1, 1);
 
     private static TypedKey<Dictionary<ulong, long>> _timelyKey
         = new("timely:claims");
+
     public async Task<TimeSpan?> ClaimTimelyAsync(ulong userId, int period)
     {
         if (period == 0)
@@ -196,7 +193,7 @@ public class GamblingService : INService, IReadyExecutor
                 // update the cache
                 dict[userId] = nowB;
                 await _cache.AddAsync(_timelyKey, dict);
-                
+
                 return null;
             }
             else

src/Nadeko.Bot.Modules.Gambling/Gambling/GamblingTopLevelModule.cs

@@ -1,10 +1,7 @@
 #nullable disable
 using NadekoBot.Modules.Gambling.Services;
-using System.Globalization;
 using System.Numerics;
-using Discord;
 using Nadeko.Bot.Common;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Gambling.Common;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/PlantPick/PlantAndPickCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;

src/Nadeko.Bot.Modules.Gambling/Gambling/Raffle/CurrencyRaffleCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;

src/Nadeko.Bot.Modules.Gambling/Gambling/Shop/ShopCommands.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;

src/Nadeko.Bot.Modules.Gambling/Gambling/Shop/ShopService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Db;
 using NadekoBot.Services.Database;
 using NadekoBot.Services.Database.Models;

src/Nadeko.Bot.Modules.Gambling/Gambling/Slot/SlotCommands.cs

@@ -7,7 +7,6 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using System.Text;
 using Nadeko.Econ.Gambling;
 using NadekoBot.Common.TypeReaders;
 using Color = SixLabors.ImageSharp.Color;

src/Nadeko.Bot.Modules.Gambling/Gambling/VoteRewardService.cs

@@ -2,9 +2,6 @@
 using NadekoBot.Common.ModuleBehaviors;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Discord.WebSocket;
-using NadekoBot.Services;
-using Serilog;
 
 namespace NadekoBot.Modules.Gambling.Services;
 

src/Nadeko.Bot.Modules.Gambling/Gambling/Waifus/WaifuClaimCommands.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Waifu;
 using NadekoBot.Modules.Gambling.Services;

src/Nadeko.Bot.Modules.Gambling/Games/GamesService.cs

@@ -1,11 +1,9 @@
 #nullable disable
 using Microsoft.Extensions.Caching.Memory;
-using Nadeko.Common;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Common.Acrophobia;
 using NadekoBot.Modules.Games.Common.Nunchi;
-using NadekoBot.Modules.Games.Common.Trivia;
 using Newtonsoft.Json;
 
 namespace NadekoBot.Modules.Games.Services;

src/Nadeko.Bot.Modules.Gambling/Games/GirlRating.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using Image = SixLabors.ImageSharp.Image;

src/Nadeko.Bot.Modules.Gambling/Games/Hangman/HangmanCommands.cs

@@ -1,4 +1,3 @@
-using Nadeko.Common;
 using NadekoBot.Modules.Games.Hangman;
 
 namespace NadekoBot.Modules.Games;

src/Nadeko.Bot.Modules.Help/CommandsOptions.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using CommandLine;
-using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Help.Common;
 

src/Nadeko.Bot.Modules.Music/Services/MusicService.cs

@@ -1,7 +1,6 @@
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
 using System.Diagnostics.CodeAnalysis;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Music.Services;
 

src/Nadeko.Bot.Modules.Music/_Common/Impl/MusicPlayer.cs

@@ -4,7 +4,6 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Music;
 

src/Nadeko.Bot.Modules.Music/_Common/Resolvers/LocalTrackResolver.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Text;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Music.Resolvers;