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

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).ToListAsync())
-            .Shuffle()
-            .FirstOrDefault();
+        return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToArrayAsync())
+            .RandomOrDefault();
     }
 
     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())
-               .OrderBy(_ => rngk.Next())
-               .FirstOrDefault();
+                            .ToArrayAsync())
+               .RandomOrDefault();
     }
 
     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
 {