Updated some namespaces, finished some todos. v5 should be cancelled probably as the code is too intertwined to make it modular

src/Nadeko.Bot.Common/DbService.cs

@@ -2,7 +2,7 @@
 using LinqToDB.Common;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database;
+
 
 namespace NadekoBot.Services;
 

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

@@ -1,8 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db;
 using NadekoBot.Db.Models;
-// todo fix these namespaces. It should only be Nadeko.Bot.Db
-using NadekoBot.Services.Database;
 
 namespace NadekoBot.Extensions;
 

src/Nadeko.Bot.Common/GlobalUsings.cs

@@ -12,7 +12,7 @@ global using Nadeko.Common; // new project
 global using NadekoBot.Common; // old + nadekobot specific things
 global using NadekoBot.Common.Attributes;
 global using NadekoBot.Extensions;
-// global using Nadeko.Snake;
+// global using Nadeko.Medusa;
 
 // discord
 global using Discord;

src/Nadeko.Bot.Common/IBot.cs

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot;
 

src/Nadeko.Bot.Common/ILogCommandService.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Common;
 

src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Nadeko.Medusa;
+namespace Nadeko.Common.Medusa;
 
 public interface IMedusaLoaderService
 {

src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Medusa;
+namespace Nadeko.Common.Medusa;
 
 public enum MedusaLoadResult
 {

src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Medusa;
+namespace Nadeko.Common.Medusa;
 
 public enum MedusaUnloadResult
 {

src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj

@@ -34,6 +34,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <AdditionalFiles Include="..\NadekoBot\data\strings\responses\responses.en-US.json" />
+      <AdditionalFiles Include="..\NadekoBot\data\strings\responses\responses.en-US.json">
+        <Link>responses.en-US.json</Link>
+      </AdditionalFiles>
     </ItemGroup>
 </Project>

src/Nadeko.Bot.Common/NadekoModule.cs

@@ -79,9 +79,10 @@ public abstract class NadekoModule : ModuleBase
 
     public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)
     {
-        embed.WithPendingColor().WithFooter("yes/no");
+        embed.WithPendingColor()
+            .WithFooter("yes/no");
 
-        var msg = await ctx.Channel.EmbedAsync(embed);
+        var msg = await MessageChannelExtensions.EmbedAsync(ctx.Channel, embed);
         try
         {
             var input = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);

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

@@ -43,8 +43,8 @@ public class CommandHandler : INService, IReadyExecutor, ICommandHandler
         // InteractionService interactions,
         IServiceProvider services)
     {
-        _client = client;
+    _client = client;
-        _commandService = commandService;
+    _commandService = commandService;
         _bss = bss;
         _bot = bot;
         _behaviorHandler = behaviorHandler;

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

@@ -1,7 +1,7 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Services.Currency;
 

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

@@ -2,7 +2,7 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Services.Currency;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Services;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Utility.Services;
 

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

@@ -5,7 +5,7 @@ using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
 using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Permissions.Services;
 

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

@@ -1,4 +1,5 @@
 using CommandLine;
+using Nadeko.Common.Medusa;
 
 namespace NadekoBot.Common;
 
@@ -9,7 +10,7 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
     private readonly DiscordPermOverrideService _dpos;
     private readonly IEmbedBuilderService _eb;
     private readonly ILocalization _loc;
-    private readonly Nadeko.Medusa.IMedusaLoaderService _medusae;
+    private readonly IMedusaLoaderService _medusae;
 
     public CommandsUtilityService(
         CommandHandler ch,
@@ -17,7 +18,7 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
         DiscordPermOverrideService dpos,
         IEmbedBuilderService eb,
         ILocalization loc,
-        Nadeko.Medusa.IMedusaLoaderService medusae)
+        IMedusaLoaderService medusae)
     {
         _ch = ch;
         _strings = strings;
@@ -46,10 +47,9 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
         if (reqs.Any())
             em.AddField(GetText(strs.requires, guild), string.Join("\n", reqs));
 
-        em.AddField(_strings.GetText(strs.usage),
+        Extensions.Extensions.WithOkColor(em.AddField(_strings.GetText(strs.usage),
-                string.Join("\n", com.RealRemarksArr(_strings, _medusae, culture, prefix).Map(arg => Format.Code(arg))))
+                    string.Join("\n", com.RealRemarksArr(_strings, _medusae, culture, prefix).Map(arg => Format.Code(arg))))
-            .WithFooter(GetText(strs.module(com.Module.GetTopLevelModule().Name), guild))
+                .WithFooter(GetText(strs.module(com.Module.GetTopLevelModule().Name), guild)));
-            .WithOkColor();
 
         var opt = GetNadekoOptionType(com.Attributes);
         if (opt is not null)

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

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

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

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using Nadeko.Medusa;
+using Nadeko.Common.Medusa;
 
 namespace NadekoBot.Extensions;
 

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

@@ -1,3 +1,4 @@
+
 namespace NadekoBot.Extensions;
 
 public static class MessageChannelExtensions
@@ -91,10 +92,6 @@ public static class MessageChannelExtensions
         return ch.EmbedAsync(builder, inter: inter);
     }
     
-    // regular send overloads
-    public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
-        => ch.SendAsync(eb, text, MsgType.Error);
-    
     public static Task<IUserMessage> SendConfirmAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
         => ch.SendAsync(eb, text, MsgType.Ok);
     
@@ -147,6 +144,10 @@ public static class MessageChannelExtensions
         string? url = null,
         string? footer = null)
         => ch.SendAsync(eb, MsgType.Error, title, text, url, footer);
+    
+    // regular send overloads
+    public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
+        => ch.SendAsync(eb, text, MsgType.Error);
 
     public static Task SendPaginatedConfirmAsync(
         this ICommandContext ctx,

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

@@ -1,4 +1,5 @@
-namespace NadekoBot.Extensions;
+
+namespace NadekoBot.Extensions;
 
 public static class SocketMessageComponentExtensions
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db;
 

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

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

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

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

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

@@ -1,7 +1,7 @@
 #nullable disable
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db;
 

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

@@ -1,6 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db;
 
@@ -29,10 +29,8 @@ public static class QuoteExtensions
         ulong guildId,
         string keyword)
     {
-        // todo figure shuffle out
+        return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToArrayAsync())
-        return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToListAsync())
+            .RandomOrDefault();
-            .Shuffle()
-            .FirstOrDefault();
     }
 
     public static async Task<Quote> SearchQuoteKeywordTextAsync(
@@ -41,15 +39,13 @@ public static class QuoteExtensions
         string keyword,
         string text)
     {
-        var rngk = new NadekoRandom();
         return (await quotes.AsQueryable()
                             .Where(q => q.GuildId == guildId
                                         && (keyword == null || q.Keyword == keyword)
                                         && (EF.Functions.Like(q.Text.ToUpper(), $"%{text.ToUpper()}%")
                                             || EF.Functions.Like(q.AuthorName, text)))
-                            .ToListAsync())
+                            .ToArrayAsync())
-               .OrderBy(_ => rngk.Next())
+               .RandomOrDefault();
-               .FirstOrDefault();
     }
 
     public static void RemoveAllByKeyword(this DbSet<Quote> quotes, ulong guildId, string keyword)

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

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

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

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

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

@@ -2,8 +2,8 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database;
+
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db;
 

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

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

src/Nadeko.Bot.Db/GlobalUsings.cs

@@ -7,12 +7,11 @@
 //
 // // nadekobot
 global using NadekoBot;
-global using NadekoBot.Services;
 global using Nadeko.Common;
 // global using NadekoBot.Common; // old + nadekobot specific things
 // global using NadekoBot.Common.Attributes;
 // global using NadekoBot.Extensions;
-// global using Nadeko.Snake;
+// global using Nadeko.Medusa;
 
 // // discord
 // global using Discord;

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AutoCommand : DbEntity
 {

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

@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db.Models;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AutoTranslateChannel : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AutoTranslateUser : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class BlacklistEntry : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class CommandAlias : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class CommandCooldown : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class CurrencyTransaction : DbEntity
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class DelMsgOnCmdChannel : DbEntity
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using Nadeko.Bot.Db;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class DiscordPermOverride : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db.Models;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class CurrencyEvent
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class FeedSub : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db.Models;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class GCChannelId : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class GamblingStats : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class GroupName : DbEntity
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class GuildConfig : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class IgnoredLogItem : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class IgnoredVoicePresenceChannel : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class ImageOnlyChannel : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class LogSetting : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class NsfwBlacklistedTag : DbEntity
 {

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

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 [DebuggerDisplay("{PrimaryTarget}{SecondaryTarget} {SecondaryTargetName} {State} {PrimaryTargetId}")]
 public class Permissionv2 : DbEntity, IIndexed

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class PlantedCurrency : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class PlaylistSong : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class Poll : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class PollVote : DbEntity
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class ReactionRoleV2 : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class Reminder : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class Repeater
 {

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

@@ -1,7 +1,7 @@
 #nullable disable
 using Nadeko.Bot.Db;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class RotatingPlayingStatus : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class SelfAssignedRole : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public enum ShopEntryType
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db.Models;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class StreamRoleSettings : DbEntity
 {

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

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class VcRoleInfo : DbEntity
 {

src/Nadeko.Bot.Db/Models/anti/AntiAltSetting.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AntiAltSetting
 {

src/Nadeko.Bot.Db/Models/anti/AntiRaidSetting.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 
 // todo db required, nullable?

src/Nadeko.Bot.Db/Models/anti/AntiSpamIgnore.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AntiSpamIgnore : DbEntity
 {

src/Nadeko.Bot.Db/Models/anti/AntiSpamSetting.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class AntiSpamSetting : DbEntity
 {

src/Nadeko.Bot.Db/Models/club/ClubInfo.cs

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 using System.ComponentModel.DataAnnotations;
 
 namespace NadekoBot.Db.Models;

src/Nadeko.Bot.Db/Models/currency/BankUser.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Db.Models;
 

src/Nadeko.Bot.Db/Models/expr/NadekoExpression.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class NadekoExpression : DbEntity
 {

src/Nadeko.Bot.Db/Models/expr/Quote.cs

@@ -1,7 +1,7 @@
 #nullable disable
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class Quote : DbEntity
 {

src/Nadeko.Bot.Db/Models/filter/FilterChannelId.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class FilterChannelId : DbEntity
 {

src/Nadeko.Bot.Db/Models/filter/FilterLinksChannelId.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class FilterLinksChannelId : DbEntity
 {

src/Nadeko.Bot.Db/Models/filter/FilteredWord.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class FilteredWord : DbEntity
 {

src/Nadeko.Bot.Db/Models/punish/BanTemplate.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class BanTemplate : DbEntity
 {

src/Nadeko.Bot.Db/Models/punish/MutedUserId.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class MutedUserId : DbEntity
 {

src/Nadeko.Bot.Db/Models/punish/PunishmentAction.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public enum PunishmentAction
 {

src/Nadeko.Bot.Db/Models/punish/WarnExpireAction.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public enum WarnExpireAction
 {

src/Nadeko.Bot.Db/Models/punish/Warning.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class Warning : DbEntity
 {

src/Nadeko.Bot.Db/Models/punish/WarningPunishment.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class WarningPunishment : DbEntity
 {

src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredRole.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class SlowmodeIgnoredRole : DbEntity
 {

src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredUser.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class SlowmodeIgnoredUser : DbEntity
 {

src/Nadeko.Bot.Db/Models/support/RewardedUser.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class RewardedUser : DbEntity
 {

src/Nadeko.Bot.Db/Models/untimer/UnbanTimer.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class UnbanTimer : DbEntity
 {

src/Nadeko.Bot.Db/Models/untimer/UnmuteTimer.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class UnmuteTimer : DbEntity
 {

src/Nadeko.Bot.Db/Models/untimer/UnroleTimer.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class UnroleTimer : DbEntity
 {

src/Nadeko.Bot.Db/Models/xp/UserXpStats.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class UserXpStats : DbEntity
 {

src/Nadeko.Bot.Db/Models/xp/XpSettings.cs

@@ -1,5 +1,5 @@
 #nullable disable
-namespace NadekoBot.Services.Database.Models;
+namespace Nadeko.Bot.Db.Models;
 
 public class XpSettings : DbEntity
 {

src/Nadeko.Bot.Modules.Administration/AdministrationService.cs

@@ -1,7 +1,7 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Administration.Services;
 

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

@@ -1,5 +1,5 @@
 #nullable disable
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 using System.Net;
 using System.Threading.Channels;
 using LinqToDB;

src/Nadeko.Bot.Modules.Administration/DangerousCommands/DangerousCommandsService.cs

@@ -3,7 +3,7 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Administration.Services;
 

src/Nadeko.Bot.Modules.Administration/GlobalUsings.cs

@@ -13,7 +13,7 @@ global using Nadeko.Common; // new project
 global using NadekoBot.Common; // old + nadekobot specific things
 global using NadekoBot.Common.Attributes;
 global using NadekoBot.Extensions;
-// global using Nadeko.Snake;
+// global using Nadeko.Medusa;
 
 // discord
 global using Discord;

src/Nadeko.Bot.Modules.Administration/GreetBye/GreetService.cs

@@ -1,6 +1,6 @@
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 using System.Threading.Channels;
 
 namespace NadekoBot.Services;

src/Nadeko.Bot.Modules.Administration/GreetBye/GreetSettings.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Services;
 

src/Nadeko.Bot.Modules.Administration/ImageOnlyChannelService.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.ModuleBehaviors;
 using System.Net;
 using System.Threading.Channels;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Administration.Services;