small cleanup

src/Ellie.Marmalade/Context/AnyContext.cs

@@ -1,5 +1,4 @@
 using Discord;
-using EllieBot;
 
 namespace EllieBot.Marmalade;
 

src/EllieBot/Bot.cs

@@ -114,7 +114,7 @@ public sealed class Bot : IBot
         // svcs.Components.Remove<IPlanner, Planner>();
         // svcs.Components.Add<IPlanner, RemovablePlanner>();
 
-        svcs.AddSingleton<IBotCredentials, IBotCredentials>(_ => _credsProvider.GetCreds());
+        svcs.AddSingleton<IBotCredentials>(_ => _credsProvider.GetCreds());
         svcs.AddSingleton<DbService, DbService>(_db);
         svcs.AddSingleton<IBotCredsProvider>(_credsProvider);
         svcs.AddSingleton<DiscordSocketClient>(Client);

src/EllieBot/Db/Models/anti/AntiRaidSetting.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace EllieBot.Db.Models;
 
 

src/EllieBot/Migrations/MigrationQueries.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Migrations;
-using EllieBot.Db.Models;
 
 namespace EllieBot.Migrations;
 

src/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/Migrations/Mysql/20240502233216_v5.cs

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

src/EllieBot/Migrations/Mysql/20240518221440_guidlconfig-cleanup.cs

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

src/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/Migrations/PostgreSql/20220614071421_patronage-system.cs

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

src/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/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/EllieBot/Migrations/PostgreSql/20240502233202_v5.cs

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

src/EllieBot/Migrations/PostgreSql/20240518221432_guidlconfig-cleanup.cs

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

src/EllieBot/Migrations/Sqlite/20210621042359_squash.cs

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

src/EllieBot/Migrations/Sqlite/20210707002343_cleanup.cs

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

src/EllieBot/Migrations/Sqlite/20210914180026_image-only-channels.cs

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

src/EllieBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs

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

src/EllieBot/Migrations/Sqlite/20211213145407_atl-rework.cs

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

src/EllieBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs

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

src/EllieBot/Migrations/Sqlite/20220409170828_clubs-refactor.cs

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

src/EllieBot/Migrations/Sqlite/20220428051304_bank.cs

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

src/EllieBot/Migrations/Sqlite/20220503234243_new-rero.cs

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

src/EllieBot/Migrations/Sqlite/20220614071359_patronage-system.cs

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

src/EllieBot/Migrations/Sqlite/20220623073903_stondel-db-cache.cs

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

src/EllieBot/Migrations/Sqlite/20220725112348_xpitemshop.cs

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

src/EllieBot/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/EllieBot/Migrations/Sqlite/20220916191702_autopub.cs

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

src/EllieBot/Migrations/Sqlite/20221003111019_gambling-stats.cs

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

src/EllieBot/Migrations/Sqlite/20240502233144_v5.cs

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

src/EllieBot/Migrations/Sqlite/20240518221424_guidlconfig-cleanup.cs

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

src/EllieBot/Modules/Administration/AdministrationService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Administration._common.results;
 

src/EllieBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleService.cs

@@ -4,7 +4,6 @@ using System.Net;
 using System.Threading.Channels;
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 
 namespace EllieBot.Modules.Administration.Services;
 

src/EllieBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelService.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using EllieBot.Db;
-
 namespace EllieBot.Modules.Administration.Services;
 
 public class GameVoiceChannelService : IEService

src/EllieBot/Modules/Administration/GreetBye/GreetService.cs

@@ -1,5 +1,4 @@
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using System.Threading.Channels;
 

src/EllieBot/Modules/Administration/Mute/MuteService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Administration.Services;

src/EllieBot/Modules/Administration/Protection/ProtectionService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using System.Threading.Channels;
 

src/EllieBot/Modules/Administration/Role/IReactionRoleService.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using EllieBot.Modules.Patronage;
 using EllieBot.Db.Models;
 using OneOf;
 using OneOf.Types;

src/EllieBot/Modules/Administration/Role/ReactionRolesService.cs

@@ -2,7 +2,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Modules.Patronage;
 using EllieBot.Db.Models;
 using OneOf.Types;

src/EllieBot/Modules/Administration/Role/StickyRolesService.cs

@@ -3,7 +3,6 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Db.Models;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 
 namespace EllieBot.Modules.Administration;
 

src/EllieBot/Modules/Administration/Self/SelfCommands.cs

@@ -546,7 +546,7 @@ public partial class Administration
             text = await repSvc.ReplaceAsync(text, repCtx);
             await Response().Channel(ch).Text(text).SendAsync();
          
-            await ctx.OkAsync();;
+            await ctx.OkAsync();
         }
 
         [Cmd]

src/EllieBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Administration.Services;

src/EllieBot/Modules/Administration/ServerLog/ServerLogCommandService.cs

@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Modules.Administration.Services;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Administration/Timezone/GuildTimezoneService.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Common.ModuleBehaviors;
 

src/EllieBot/Modules/Administration/UserPunish/UserPunishService.cs

@@ -4,7 +4,6 @@ using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Common.TypeReaders.Models;
-using EllieBot.Db;
 using EllieBot.Modules.Permissions.Services;
 using EllieBot.Db.Models;
 using Newtonsoft.Json;

src/EllieBot/Modules/Administration/VcRole/VcRoleService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Administration.Services;

src/EllieBot/Modules/Expressions/EllieExpressionsService.cs

@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Common.Yml;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using System.Runtime.CompilerServices;
 using LinqToDB.EntityFrameworkCore;

src/EllieBot/Modules/Gambling/BlackJack/BlackJackCommands.cs

@@ -3,7 +3,6 @@ using EllieBot.Common.TypeReaders;
 using EllieBot.Modules.Gambling.Common;
 using EllieBot.Modules.Gambling.Common.Blackjack;
 using EllieBot.Modules.Gambling.Services;
-using EllieBot.Modules.Utility;
 
 namespace EllieBot.Modules.Gambling;
 

src/EllieBot/Modules/Gambling/Gambling.cs

@@ -13,7 +13,6 @@ using System.Text;
 using EllieBot.Modules.Gambling.Rps;
 using EllieBot.Common.TypeReaders;
 using EllieBot.Modules.Patronage;
-using EllieBot.Modules.Utility;
 
 namespace EllieBot.Modules.Gambling;
 

src/EllieBot/Modules/Gambling/GamblingService.cs

@@ -2,7 +2,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Gambling.Common;
 using EllieBot.Modules.Gambling.Common.Connect4;

src/EllieBot/Modules/Gambling/PlantPick/PlantPickService.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
@@ -32,7 +31,6 @@ public class PlantPickService : IEService, IExecNoCommand
 
     public PlantPickService(
         DbService db,
-        CommandHandler cmd,
         IBotStrings strings,
         IImageCache images,
         FontProvider fonts,
@@ -108,7 +106,6 @@ public class PlantPickService : IEService, IExecNoCommand
     ///     Get a random currency image stream, with an optional password sticked onto it.
     /// </summary>
     /// <param name="pass">Optional password to add to top left corner.</param>
-    /// <param name="extension">Extension of the file, defaults to png</param>
     /// <returns>Stream of the currency image</returns>
     public async Task<(Stream, string)> GetRandomCurrencyImageAsync(string pass)
     {

src/EllieBot/Modules/Gambling/Shop/ShopCommands.cs

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

src/EllieBot/Modules/Gambling/Shop/ShopService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Gambling.Services;

src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs

@@ -7,9 +7,7 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using EllieBot.Modules.Gambling;
 using EllieBot.Common.TypeReaders;
-using EllieBot.Modules.Utility;
 using Color = SixLabors.ImageSharp.Color;
 using Image = SixLabors.ImageSharp.Image;
 

src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs

@@ -3,7 +3,7 @@ using EllieBot.Modules.Gambling.Common;
 using EllieBot.Modules.Gambling.Common.Waifu;
 using EllieBot.Modules.Gambling.Services;
 using EllieBot.Db.Models;
-using TwitchLib.Api.Helix.Models.Teams;
+using System.Globalization;
 
 namespace EllieBot.Modules.Gambling;
 
@@ -153,12 +153,12 @@ public partial class Gambling
                 await Response().Confirm(strs.waifu_divorced_notlike(N(amount))).SendAsync();
             else if (result == DivorceResult.NotYourWife)
                 await Response().Error(strs.waifu_not_yours).SendAsync();
-            else
+            else if (remaining is { } rem)
             {
                 await Response()
                       .Error(strs.waifu_recent_divorce(
-                          Format.Bold(((int)remaining?.TotalHours).ToString()),
+                          Format.Bold(((int)rem.TotalHours).ToString()),
-                          Format.Bold(remaining?.Minutes.ToString())))
+                          Format.Bold(rem.Minutes.ToString())))
                       .SendAsync();
             }
         }
@@ -238,7 +238,7 @@ public partial class Gambling
         private string GetLbString(WaifuLbResult w)
         {
             var claimer = "no one";
-            var status = string.Empty;
+            string status;
 
             var waifuUsername = w.Username.TrimTo(20);
             var claimerUsername = w.Claimer?.TrimTo(20);
@@ -377,7 +377,8 @@ public partial class Gambling
             if (sucess)
             {
                 await Response()
-                      .Confirm(strs.waifu_gift(Format.Bold($"{GetCountString(items)}{items.Item} {items.Item.ItemEmoji}"),
+                      .Confirm(strs.waifu_gift(
+                          Format.Bold($"{GetCountString(items)}{items.Item} {items.Item.ItemEmoji}"),
                           Format.Bold(waifu.ToString())))
                       .SendAsync();
             }

src/EllieBot/Modules/Gambling/Waifus/WaifuService.cs

@@ -3,11 +3,9 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Gambling.Common;
 using EllieBot.Modules.Gambling.Common.Waifu;
-using SixLabors.ImageSharp;
 
 namespace EllieBot.Modules.Gambling.Services;
 

src/EllieBot/Modules/Gambling/_common/IGamblingService.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using EllieBot.Modules.Gambling;
 using EllieBot.Modules.Gambling.Betdraw;
 using EllieBot.Modules.Gambling.Rps;
 using OneOf;

src/EllieBot/Modules/Gambling/_common/NewGamblingService.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using EllieBot.Modules.Gambling;
 using EllieBot.Modules.Gambling.Betdraw;
 using EllieBot.Modules.Gambling.Rps;
 using EllieBot.Modules.Gambling.Services;

src/EllieBot/Modules/Gambling/_common/TypeReaders/BaseShmartInputAmountReader.cs

@@ -1,5 +1,4 @@
 using System.Text.RegularExpressions;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Gambling.Services;
 using NCalc;

src/EllieBot/Modules/Games/ChatterBot/ChatterBotCommands.cs

@@ -1,7 +1,5 @@
 #nullable disable
-using EllieBot.Db;
 using EllieBot.Modules.Games.Services;
-using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Games;
 

src/EllieBot/Modules/Games/ChatterBot/_common/ThinkResult.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using System.CodeDom;
-
 namespace EllieBot.Modules.Games.Common.ChatterBot;
 
 public sealed class ThinkResult

src/EllieBot/Modules/Games/GamesService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.Extensions.Caching.Memory;
-using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Modules.Games.Common;
 using EllieBot.Modules.Games.Common.Acrophobia;
 using EllieBot.Modules.Games.Common.Nunchi;
@@ -8,11 +7,10 @@ using Newtonsoft.Json;
 
 namespace EllieBot.Modules.Games.Services;
 
-public class GamesService : IEService, IReadyExecutor
+public class GamesService : IEService
 {
     private const string TYPING_ARTICLES_PATH = "data/typing_articles3.json";
 
-    public ConcurrentDictionary<ulong, GirlRating> GirlRatings { get; } = new();
 
     public IReadOnlyList<string> EightBallResponses
         => _gamesConfig.Data.EightBallResponses;
@@ -25,7 +23,6 @@ public class GamesService : IEService, IReadyExecutor
     public ConcurrentDictionary<ulong, TypingGame> RunningContests { get; } = new();
     public ConcurrentDictionary<ulong, NunchiGame> NunchiGames { get; } = new();
 
-    public AsyncLazy<RatingTexts> Ratings { get; }
     private readonly GamesConfigService _gamesConfig;
 
     private readonly IHttpClientFactory _httpFactory;
@@ -41,7 +38,6 @@ public class GamesService : IEService, IReadyExecutor
             SizeLimit = 500_000
         });
 
-        Ratings = new(GetRatingTexts);
         _rng = new EllieRandom();
 
         try
@@ -55,22 +51,6 @@ public class GamesService : IEService, IReadyExecutor
         }
     }
 
-    public async Task OnReadyAsync()
-    {
-        // reset rating once a day
-        using var timer = new PeriodicTimer(TimeSpan.FromDays(1));
-        while (await timer.WaitForNextTickAsync())
-            GirlRatings.Clear();
-    }
-
-    private async Task<RatingTexts> GetRatingTexts()
-    {
-        using var http = _httpFactory.CreateClient();
-        var text = await http.GetStringAsync(
-            "https://nadeko-pictures.nyc3.digitaloceanspaces.com/other/rategirl/rates.json");
-        return JsonConvert.DeserializeObject<RatingTexts>(text);
-    }
-
     public void AddTypingArticle(IUser user, string text)
     {
         TypingArticles.Add(new()
@@ -104,15 +84,4 @@ public class GamesService : IEService, IReadyExecutor
         File.WriteAllText(TYPING_ARTICLES_PATH, JsonConvert.SerializeObject(articles));
         return removed;
     }
-
-    public class RatingTexts
-    {
-        public string Nog { get; set; }
-        public string Tra { get; set; }
-        public string Fun { get; set; }
-        public string Uni { get; set; }
-        public string Wif { get; set; }
-        public string Dat { get; set; }
-        public string Dan { get; set; }
-    }
 }

src/EllieBot/Modules/Games/GirlRating.cs

@@ -1,61 +0,0 @@
-#nullable disable
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
-using Image = SixLabors.ImageSharp.Image;
-
-namespace EllieBot.Modules.Games.Common;
-
-public class GirlRating
-{
-    public double Crazy { get; }
-    public double Hot { get; }
-    public int Roll { get; }
-    public string Advice { get; }
-
-    public AsyncLazy<Stream> Stream { get; }
-    private readonly IImageCache _images;
-
-    public GirlRating(
-        IImageCache images,
-        double crazy,
-        double hot,
-        int roll,
-        string advice)
-    {
-        _images = images;
-        Crazy = crazy;
-        Hot = hot;
-        Roll = roll;
-        Advice = advice; // convenient to have it here, even though atm there are only few different ones.
-
-        Stream = new(async () =>
-        {
-            try
-            {
-                var bgBytes = await _images.GetRategirlBgAsync();
-                using var img = Image.Load(bgBytes);
-                const int minx = 35;
-                const int miny = 385;
-                const int length = 345;
-
-                var pointx = (int)(minx + (length * (Hot / 10)));
-                var pointy = (int)(miny - (length * ((Crazy - 4) / 6)));
-
-                var dotBytes = await _images.GetRategirlDotAsync(); 
-                using (var pointImg = Image.Load(dotBytes))
-                {
-                    img.Mutate(x => x.DrawImage(pointImg, new(pointx - 10, pointy - 10), new GraphicsOptions()));
-                }
-
-                var imgStream = new MemoryStream();
-                img.SaveAsPng(imgStream);
-                return imgStream;
-            }
-            catch (Exception ex)
-            {
-                Log.Warning(ex, "Error getting RateGirl image");
-                return null;
-            }
-        });
-    }
-}

src/EllieBot/Modules/Games/Trivia/TriviaCommands.cs

@@ -107,9 +107,9 @@ public partial class Games
             return sb.ToString();
         }
 
-        private EmbedBuilder? questionEmbed = null;
+        private EmbedBuilder? questionEmbed;
-        private IUserMessage? questionMessage = null;
+        private IUserMessage? questionMessage;
-        private bool showHowToQuit = false;
+        private bool showHowToQuit;
 
         private void RegisterEvents(TriviaGame trivia)
         {

src/EllieBot/Modules/Games/Trivia/TriviaGame.cs

@@ -11,12 +11,19 @@ public sealed class TriviaGame
     private readonly IQuestionPool _questionPool;
 
     #region Events
+
     public event Func<TriviaGame, TriviaQuestion, Task> OnQuestion = static delegate { return Task.CompletedTask; };
     public event Func<TriviaGame, TriviaQuestion, Task> OnHint = static delegate { return Task.CompletedTask; };
     public event Func<TriviaGame, Task> OnStats = static delegate { return Task.CompletedTask; };
-    public event Func<TriviaGame, TriviaUser, TriviaQuestion, bool, Task> OnGuess = static delegate { return Task.CompletedTask; };
+
+    public event Func<TriviaGame, TriviaUser, TriviaQuestion, bool, Task> OnGuess = static delegate
+    {
+        return Task.CompletedTask;
+    };
+
     public event Func<TriviaGame, TriviaQuestion, Task> OnTimeout = static delegate { return Task.CompletedTask; };
     public event Func<TriviaGame, Task> OnEnded = static delegate { return Task.CompletedTask; };
+
     #endregion
 
     private bool _isStopped;
@@ -24,7 +31,7 @@ public sealed class TriviaGame
     public TriviaQuestion? CurrentQuestion { get; set; }
 
 
-    private readonly ConcurrentDictionary<ulong, int> _users = new ();
+    private readonly ConcurrentDictionary<ulong, int> _users = new();
 
     private readonly Channel<(TriviaUser User, string Input)> _inputs
         = Channel.CreateUnbounded<(TriviaUser, string)>(new UnboundedChannelOptions
@@ -41,8 +48,8 @@ public sealed class TriviaGame
         _questionPool = _opts.IsPokemon
             ? new PokemonQuestionPool(cache)
             : new DefaultQuestionPool(cache);
-
     }
+
     public async Task RunAsync()
     {
         await GameLoop();
@@ -50,7 +57,8 @@ public sealed class TriviaGame
 
     private async Task GameLoop()
     {
-        Task TimeOutFactory() => Task.Delay(_opts.QuestionTimer * 1000 / 2);
+        Task TimeOutFactory()
+            => Task.Delay(_opts.QuestionTimer * 1000 / 2);
 
         var errorCount = 0;
         var inactivity = 0;
@@ -91,7 +99,8 @@ public sealed class TriviaGame
                 {
                     // clear out all of the past guesses
                     while (_inputs.Reader.TryRead(out _))
-                        ;
+                    {
+                    }
 
                     await OnQuestion(this, question);
                 }
@@ -121,7 +130,7 @@ public sealed class TriviaGame
                     if (task == halfGuessTimerTask)
                     {
                         readCancel.Cancel();
-                        
+
                         // if hint is already sent, means time expired
                         // break (end the round)
                         if (hintSent)
@@ -213,7 +222,7 @@ public sealed class TriviaGame
 
     public async Task TriggerQuestionAsync()
     {
-        if(CurrentQuestion is TriviaQuestion q)
+        if (CurrentQuestion is TriviaQuestion q)
             await OnQuestion(this, q);
     }
 }

src/EllieBot/Modules/Music/Music.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using EllieBot.Modules.Music.Services;
 using EllieBot.Db.Models;
-using EllieBot.Modules.Utility;
 
 namespace EllieBot.Modules.Music;
 

src/EllieBot/Modules/Music/PlaylistCommands.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using LinqToDB;
-using EllieBot.Db;
 using EllieBot.Modules.Music.Services;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Music/Services/MusicService.cs

@@ -1,5 +1,4 @@
-using EllieBot.Db;
+using EllieBot.Db.Models;
-using EllieBot.Db.Models;
 using System.Diagnostics.CodeAnalysis;
 
 namespace EllieBot.Modules.Music.Services;

src/EllieBot/Modules/Music/_common/Resolvers/RadioResolveStrategy.cs

@@ -61,8 +61,8 @@ public class RadioResolver : IRadioResolver
             try
             {
                 var m = _m3URegex.Match(file);
-                var res = m.Groups["url"]?.ToString();
+                var res = m.Groups["url"].ToString();
-                return res?.Trim();
+                return res.Trim();
             }
             catch
             {
@@ -76,8 +76,8 @@ public class RadioResolver : IRadioResolver
             try
             {
                 var m = _asxRegex.Match(file);
-                var res = m.Groups["url"]?.ToString();
+                var res = m.Groups["url"].ToString();
-                return res?.Trim();
+                return res.Trim();
             }
             catch
             {
@@ -91,8 +91,8 @@ public class RadioResolver : IRadioResolver
             try
             {
                 var m = _xspfRegex.Match(file);
-                var res = m.Groups["url"]?.ToString();
+                var res = m.Groups["url"].ToString();
-                return res?.Trim();
+                return res.Trim();
             }
             catch
             {

src/EllieBot/Modules/Patronage/PatronageService.cs

@@ -2,8 +2,6 @@
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Db.Models;
-using StackExchange.Redis;
-using System.Diagnostics;
 
 namespace EllieBot.Modules.Patronage;
 
@@ -21,16 +19,11 @@ public sealed class PatronageService
     public int Priority
         => int.MinValue;
 
-    private static readonly PatronTier[] _tiers = Enum.GetValues<PatronTier>();
-
     private readonly PatronageConfig _pConf;
     private readonly DbService _db;
     private readonly DiscordSocketClient _client;
     private readonly ISubscriptionHandler _subsHandler;
 
-    private static readonly TypedKey<long> _quotaKey
-        = new($"quota:last_hourly_reset");
-
     private readonly IBotCache _cache;
     private readonly IBotCredsProvider _creds;
     private readonly IMessageSenderService _sender;
@@ -135,19 +128,19 @@ public sealed class PatronageService
                         // user is charged again for this month
                         // if his sub would end in teh future, extend it by one month.
                         // if it's not, just add 1 month to the last charge date
-                        var count = await ctx.GetTable<PatronUser>()
+                        await ctx.GetTable<PatronUser>()
-                                             .Where(x => x.UniquePlatformUserId
+                                 .Where(x => x.UniquePlatformUserId
-                                                         == subscriber.UniquePlatformUserId)
+                                             == subscriber.UniquePlatformUserId)
-                                             .UpdateAsync(old => new()
+                                 .UpdateAsync(old => new()
-                                             {
+                                 {
-                                                 UserId = subscriber.UserId,
+                                     UserId = subscriber.UserId,
-                                                 AmountCents = subscriber.Cents,
+                                     AmountCents = subscriber.Cents,
-                                                 LastCharge = lastChargeUtc,
+                                     LastCharge = lastChargeUtc,
-                                                 ValidThru = old.ValidThru >= todayDate
+                                     ValidThru = old.ValidThru >= todayDate
-                                                     // ? Sql.DateAdd(Sql.DateParts.Month, 1, old.ValidThru).Value
+                                         // ? Sql.DateAdd(Sql.DateParts.Month, 1, old.ValidThru).Value
-                                                     ? old.ValidThru.AddMonths(1)
+                                         ? old.ValidThru.AddMonths(1)
-                                                     : dateInOneMonth,
+                                         : dateInOneMonth,
-                                             });
+                                 });
 
 
                         dbPatron.UserId = subscriber.UserId;
@@ -332,7 +325,7 @@ public sealed class PatronageService
     {
         if (!_pConf.Data.IsEnabled)
             return _infiniteQuota;
-        
+
         var maybePatron = await GetPatronAsync(userId);
 
         if (maybePatron is not { } patron)

src/EllieBot/Modules/Permissions/CommandCooldown/CmdCdService.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 
 namespace EllieBot.Modules.Permissions.Services;
 

src/EllieBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.TypeReaders;
-using EllieBot.Db;
 using EllieBot.Modules.Permissions.Services;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Permissions/Filter/FilterCommands.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Modules.Permissions.Services;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Permissions/Filter/FilterService.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Permissions.Services;

src/EllieBot/Modules/Permissions/Permissions.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using EllieBot.Common.TypeReaders;
 using EllieBot.Common.TypeReaders.Models;
-using EllieBot.Db;
 using EllieBot.Modules.Permissions.Common;
 using EllieBot.Modules.Permissions.Services;
 using EllieBot.Db.Models;

src/EllieBot/Modules/Permissions/PermissionsService.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Modules.Permissions.Common;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Searches/Crypto/CryptoCommands.cs

@@ -65,18 +65,6 @@ public partial class Searches
             var change = (stock.Price - stock.Close).ToString("N2", Culture);
             var changePercent = (1 - (stock.Close / stock.Price)).ToString("P1", Culture);
 
-            var sign50 = stock.Change50d >= 0
-                ? "\\🔼"
-                : "\\🔻";
-
-            var change50 = (stock.Change50d).ToString("P1", Culture);
-
-            var sign200 = stock.Change200d >= 0
-                ? "\\🔼"
-                : "\\🔻";
-
-            var change200 = (stock.Change200d).ToString("P1", Culture);
-
             var price = stock.Price.ToString("C2", localCulture);
 
             var eb = _sender.CreateEmbed()

src/EllieBot/Modules/Searches/Crypto/CryptoService.cs

@@ -4,13 +4,11 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Net.Http.Json;
 using System.Text.Json.Serialization;
 using System.Xml;
 using Color = SixLabors.ImageSharp.Color;
-using StringExtensions = EllieBot.Extensions.StringExtensions;
 
 namespace EllieBot.Modules.Searches.Services;
 

src/EllieBot/Modules/Searches/Crypto/DefaultStockDataService.cs

@@ -1,7 +1,6 @@
 using AngleSharp;
 using CsvHelper;
 using CsvHelper.Configuration;
-using System.Diagnostics;
 using System.Globalization;
 using System.Text.Json;
 

src/EllieBot/Modules/Searches/Feeds/FeedsService.cs

@@ -4,7 +4,6 @@ using CodeHollow.FeedReader.Feeds;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Searches.Services;

src/EllieBot/Modules/Searches/Religious/ReligiousApiService.cs

@@ -1,5 +1,4 @@
-using EllieBot.Modules.Searches.Common;
+using OneOf;
-using OneOf;
 using OneOf.Types;
 using System.Net;
 using System.Net.Http.Json;

src/EllieBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Searches.Services;
 

src/EllieBot/Modules/Searches/StreamNotification/StreamNotificationService.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Searches.Common;
 using EllieBot.Modules.Searches.Common.StreamNotifications;

src/EllieBot/Modules/Utility/Ai/UtilityCommands.cs

@@ -1,6 +1,4 @@
-using EllieBot.Modules.Administration;
+namespace EllieBot.Modules.Utility;
-
-namespace EllieBot.Modules.Utility;
 
 public partial class UtilityCommands
 {

src/EllieBot/Modules/Utility/Alias/AliasCommands.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using EllieBot.Db;
 using EllieBot.Modules.Utility.Services;
 using EllieBot.Db.Models;
 

src/EllieBot/Modules/Utility/Alias/AliasService.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Modules.Utility.Services;

src/EllieBot/Modules/Utility/Giveaway/GiveawayService.cs

@@ -19,7 +19,6 @@ public sealed class GiveawayService : IEService, IReadyExecutor
     private readonly IMemoryCache _cache;
     private SortedSet<GiveawayModel> _giveawayCache = new SortedSet<GiveawayModel>();
     private readonly EllieRandom _rng;
-    private readonly ConcurrentDictionary<int, GiveawayRerollData> _rerolls = new();
 
     public GiveawayService(DbService db, IBotCredentials creds, DiscordSocketClient client,
         IMessageSenderService sender, IBotStrings strings, ILocalization localization, IMemoryCache cache)

src/EllieBot/Modules/Utility/Quote/QuoteCommands.cs

@@ -2,7 +2,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.Yml;
-using EllieBot.Db;
 using EllieBot.Db.Models;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;