Fixed some aliases and reworked namespaces

CHANGELOG.md

@@ -6,9 +6,9 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 
 ### Added
 
-- `.shopadd command` You can now sell commands in the shop. The command will execute as if you were the one running it when someone buys it
+- Added `.shopadd command` You can now sell commands in the shop. The command will execute as if you were the one running it when someone buys it
   - type `.h .shopadd` for more info
-- `.stickyroles` Users leaving the server will have their roles saved to the database and reapplied if they rejoin within 30 days.
+- Added `.stickyroles` Users leaving the server will have their roles saved to the database and reapplied if they rejoin within 30 days.
 - Giveaway commands
   - `.ga start` starts the giveway with the specified duration and message (prize). You may have up to 5 giveaways on the server at once
   - `.ga end <id>` prematurely ends the giveaway and selects a winner
@@ -16,20 +16,22 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
   - `.ga list` lists active giveaways on the current server
   - `.ga reroll <id>` rerolls the winner on the completed giveaway. This only works for 24 hours after the giveaway has ended, or until the bot restarts.
   - After the giveaway has started, user join the giveaway by adding a :tada: reaction
-- Selfhosters - Added `.sqlselectcsv` which will return results in a csv file instead of an embed.
+- Added Todo Commands
-- Todo Commands
   - `.todo add <name>` - adds a new todo
   - `.todo delete <id>` - deletes a todo item
   - `.todo done <id>` - completes a todo (marks it with a checkmark)
   - `.todo list` - lists all todos
   - `.todo edit <id> <new message>` - edits a todo item message
-  - Todo archive commands
+  - In addition to that, there are also Todo archive commands
     - `.todo archive add <name>` - adds all current todos (completed and not completed) to the archived list, your current todo list will become cleared
     - `.todo archive list` - lists all your archived todo lists
     - `.todo archive show <id>` - shows the todo items from one of your archived lists
     - `.todo archive delete <id>` - deletes and archived todo list
-- `.queufairplay` / `.qfp` (music feature) re-added but it works differently
+- Added `.queufairplay` / `.qfp` (music feature) re-added but it works differently
   - Once you run it, it will reorganize currently queued songs so that they're in a fair order. It has no effect on any subsequently queued songs
+- Added `.clubrename` command to uh rename your club
+- For self-hosters:
+  - Added `.sqlselectcsv` which will return results in a csv file instead of an embed.
 
 ### Changed
 
@@ -37,11 +39,13 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 - You can now target a different channel with .repeat, for example `.repeat #some-other 1h Hello every hour`
 - `.cmds <module name>` looks better / simpler
 - Cleanup: Removed a lot of obsolete aliases.
-
+- The bot will now send a discord Reply to every command
+- A lot of code cleanup (still a lot to be done) and Quality of Life improvements
 
 ### Fixed
 
 - `.feed` should now correctly accept (and show) the message which can be passed as the third parameter
+- `.say` will now correctly report errors if the user or the bot don't have sufficent perms to send a message in the targeted channel
 
 ### Removed
 

NadekoBot.sln

@@ -13,13 +13,13 @@ ProjectSection(SolutionItems) = preProject
 	.gitlab-ci.yml = .gitlab-ci.yml
 	Dockerfile = Dockerfile
 	NuGet.Config = NuGet.Config
+	migrate.ps1 = migrate.ps1
+	remove-migration.ps1 = remove-migration.ps1
 EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ayu", "ayu", "{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Voice", "src\ayu\NadekoBot.Voice\NadekoBot.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ayu.Discord.Voice", "src\ayu\Ayu.Discord.Voice\Ayu.Discord.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Tests", "src\NadekoBot.Tests\NadekoBot.Tests.csproj", "{DB448DD4-C97F-40E9-8BD3-F605FF1FF833}"
 EndProject
@@ -86,13 +86,12 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{45EC1473-C678-4857-A544-07DFE0D0B478} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
-		{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
-		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}
 		{DB448DD4-C97F-40E9-8BD3-F605FF1FF833} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{AE9B7F8C-81D7-4401-83A3-643B38258374} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

src/NadekoBot.Tests/IndexedCollectionTests.cs

@@ -1,5 +1,5 @@
 using Nadeko.Common;
-using Nadeko.Bot.Db.Models;
+using NadekoBot.Db.Models;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -6,11 +6,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="4.1.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     </ItemGroup>
 
+
     <ItemGroup>
       <ProjectReference Include="..\NadekoBot\NadekoBot.csproj" />
     </ItemGroup>

src/NadekoBot/Bot.cs

@@ -1,22 +1,10 @@
 #nullable disable
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
+using NadekoBot.Db.Models;
-using NadekoBot.Modules.Administration;
-using NadekoBot.Modules.Gambling;
-using NadekoBot.Modules.Help;
-using NadekoBot.Modules.Music;
-using NadekoBot.Modules.NadekoExpressions;
-using NadekoBot.Modules.Patronage;
-using NadekoBot.Modules.Permissions;
-using NadekoBot.Modules.Searches;
-using NadekoBot.Modules.Utility;
-using NadekoBot.Modules.Xp;
-
-using Nadeko.Bot.Db.Models;
 using Ninject;
 using Ninject.Planning;
 using System.Collections.Immutable;
@@ -98,12 +86,6 @@ public sealed class Bot : IBot
         _loadedAssemblies = new[]
         {
             typeof(Bot).Assembly, // bot
-            typeof(Creds).Assembly, // bot.common
-
-            // modules
-            typeof(NadekoExpressions).Assembly, typeof(Administration).Assembly, typeof(Gambling).Assembly,
-            typeof(Help).Assembly, typeof(Music).Assembly, typeof(Patronage).Assembly, typeof(Permissions).Assembly,
-            typeof(Searches).Assembly, typeof(Utility).Assembly, typeof(Xp).Assembly,
         };
     }
 
@@ -145,6 +127,7 @@ public sealed class Bot : IBot
         svcs.AddSingleton<IConfigSeria, YamlSeria>();
         svcs.AddSingleton<IMemoryCache, MemoryCache>(new MemoryCache(new MemoryCacheOptions()));
         svcs.AddSingleton<IBehaviorHandler, BehaviorHandler>();
+        svcs.AddSingleton<ILocalization, Localization>();
 
 
         foreach (var a in _loadedAssemblies)

src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs

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

src/NadekoBot/Db/Extensions/DbExtensions.cs

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

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -2,8 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 
-using Nadeko.Bot.Db.Models;
-
 namespace NadekoBot.Db;
 
 public static class GuildConfigExtensions

src/NadekoBot/Db/Extensions/NadekoExpressionExtensions.cs

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

src/NadekoBot/Db/Extensions/QuoteExtensions.cs

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

src/NadekoBot/Db/Extensions/ReminderExtensions.cs

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

src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs

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

src/NadekoBot/Db/Extensions/UserXpExtensions.cs

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

src/NadekoBot/Db/Extensions/WarningExtensions.cs

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

src/NadekoBot/Db/Helpers/ActivityType.cs

@@ -1,6 +1,22 @@
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
-public enum ActivityType
+public enum DbActivityType
 {
-    
+    /// <summary>The user is playing a game.</summary>
+    Playing,
+
+    /// <summary>The user is streaming online.</summary>
+    Streaming,
+
+    /// <summary>The user is listening to a song.</summary>
+    Listening,
+
+    /// <summary>The user is watching some form of media.</summary>
+    Watching,
+
+    /// <summary>The user has set a custom status.</summary>
+    CustomStatus,
+
+    /// <summary>The user is competing in a game.</summary>
+    Competing,
 }

src/NadekoBot/Db/Helpers/GuildPerm.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 [Flags]
 public enum GuildPerm : ulong

src/NadekoBot/Db/Models/AutoCommand.cs

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

src/NadekoBot/Db/Models/AutoPublishChannel.cs

@@ -1,5 +1,3 @@
-using Nadeko.Bot.Db.Models;
-
 namespace NadekoBot.Db.Models;
 
 public class AutoPublishChannel : DbEntity

src/NadekoBot/Db/Models/AutoTranslateChannel.cs

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

src/NadekoBot/Db/Models/AutoTranslateUser.cs

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

src/NadekoBot/Db/Models/BlacklistEntry.cs

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

src/NadekoBot/Db/Models/CommandAlias.cs

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

src/NadekoBot/Db/Models/CommandCooldown.cs

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

src/NadekoBot/Db/Models/CurrencyTransaction.cs

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

src/NadekoBot/Db/Models/DbEntity.cs

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

src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs

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

src/NadekoBot/Db/Models/DiscordPemOverride.cs

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

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Bot.Db.Models;
-
 namespace NadekoBot.Db.Models;
 
 

src/NadekoBot/Db/Models/Event.cs

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

src/NadekoBot/Db/Models/FeedSub.cs

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

src/NadekoBot/Db/Models/FollowedStream.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Bot.Db.Models;
-
 namespace NadekoBot.Db.Models;
 
 public class FollowedStream : DbEntity

src/NadekoBot/Db/Models/GCChannelId.cs

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

src/NadekoBot/Db/Models/GamblingStats.cs

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

src/NadekoBot/Db/Models/GroupName.cs

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

src/NadekoBot/Db/Models/GuildConfig.cs

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

src/NadekoBot/Db/Models/IgnoredLogItem.cs

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

src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs

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

src/NadekoBot/Db/Models/ImageOnlyChannel.cs

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

src/NadekoBot/Db/Models/LogSetting.cs

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

src/NadekoBot/Db/Models/Permission.cs

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

src/NadekoBot/Db/Models/PlantedCurrency.cs

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

src/NadekoBot/Db/Models/PlaylistSong.cs

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

src/NadekoBot/Db/Models/Reminder.cs

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

src/NadekoBot/Db/Models/Repeater.cs

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

src/NadekoBot/Db/Models/RotatingPlayingStatus.cs

@@ -1,10 +1,8 @@
 #nullable disable
-using Nadeko.Bot.Db;
+namespace NadekoBot.Db.Models;
-
-namespace Nadeko.Bot.Db.Models;
 
 public class RotatingPlayingStatus : DbEntity
 {
     public string Status { get; set; }
-    public ActivityType Type { get; set; }
+    public DbActivityType Type { get; set; }
 }

src/NadekoBot/Db/Models/ShopEntry.cs

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

src/NadekoBot/Db/Models/StreamOnlineMessage.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Bot.Db.Models;
-
 namespace NadekoBot.Db.Models;
 
 public class StreamOnlineMessage : DbEntity

src/NadekoBot/Db/Models/StreamRoleSettings.cs

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

src/NadekoBot/Db/Models/VcRoleInfo.cs

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

src/NadekoBot/Db/Models/Waifu.cs

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

src/NadekoBot/Db/Models/anti/AntiAltSetting.cs

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

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

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

src/NadekoBot/Db/Models/anti/AntiSpamIgnore.cs

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

src/NadekoBot/Db/Models/anti/AntiSpamSetting.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Bot.Db.Models;
+namespace NadekoBot.Db.Models;
 
 #nullable disable
 public class AntiSpamSetting : DbEntity

src/NadekoBot/Db/Models/club/ClubInfo.cs

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

src/NadekoBot/Db/Models/currency/BankUser.cs

@@ -1,6 +1,4 @@
-using Nadeko.Bot.Db.Models;
+namespace NadekoBot.Db.Models;
-
-namespace NadekoBot.Db.Models;
 
 public class BankUser : DbEntity
 {

src/NadekoBot/Db/Models/expr/NadekoExpression.cs

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

src/NadekoBot/Db/Models/expr/Quote.cs

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

src/NadekoBot/Db/Models/filter/FilterChannelId.cs

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

src/NadekoBot/Db/Models/filter/FilterLinksChannelId.cs

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

src/NadekoBot/Db/Models/filter/FilteredWord.cs

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

src/NadekoBot/Db/Models/punish/BanTemplate.cs

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

src/NadekoBot/Db/Models/punish/MutedUserId.cs

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

src/NadekoBot/Db/Models/punish/PunishmentAction.cs

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

src/NadekoBot/Db/Models/punish/WarnExpireAction.cs

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

src/NadekoBot/Db/Models/punish/Warning.cs

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

src/NadekoBot/Db/Models/punish/WarningPunishment.cs

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

src/NadekoBot/Db/Models/roles/ReactionRole.cs

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

src/NadekoBot/Db/Models/roles/SelfAssignableRole.cs

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

src/NadekoBot/Db/Models/roles/StickyRoles.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Bot.Db.Models;
+namespace NadekoBot.Db.Models;
 
 #nullable disable
 public class StickyRole : DbEntity

src/NadekoBot/Db/Models/slowmode/SlowmodeIgnoredRole.cs

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

src/NadekoBot/Db/Models/slowmode/SlowmodeIgnoredUser.cs

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

src/NadekoBot/Db/Models/support/RewardedUser.cs

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

src/NadekoBot/Db/Models/untimer/UnbanTimer.cs

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

src/NadekoBot/Db/Models/untimer/UnmuteTimer.cs

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

src/NadekoBot/Db/Models/untimer/UnroleTimer.cs

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

src/NadekoBot/Db/Models/xp/UserXpStats.cs

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

src/NadekoBot/Db/Models/xp/XpSettings.cs

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

src/NadekoBot/Db/MysqlContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 public sealed class MysqlContext : NadekoContext
 {

src/NadekoBot/Db/NadekoContext.cs

@@ -2,11 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using NadekoBot.Db.Models;
-using Nadeko.Bot.Db.Models;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 public abstract class NadekoContext : DbContext
 {

src/NadekoBot/Db/NadekoDbService.cs

@@ -2,7 +2,7 @@
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 public sealed class NadekoDbService : DbService 
 {

src/NadekoBot/Db/PostgreSqlContext.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 public sealed class PostgreSqlContext : NadekoContext
 {

src/NadekoBot/Db/SqliteContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 
-namespace Nadeko.Bot.Db;
+namespace NadekoBot.Db;
 
 public sealed class SqliteContext : NadekoContext
 {

src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.cs

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

src/NadekoBot/Migrations/Mysql/20230813113816_timely-reminder-type.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/20230903153202_clubinfo-name-index.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/20240423153724_sticky-roles.cs

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

src/NadekoBot/Migrations/Mysql/20240424203922_giveaway.cs

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

src/NadekoBot/Migrations/Mysql/20240425132907_todolist.cs

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

src/NadekoBot/Migrations/Postgresql/20221122204423_feed-text.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/NadekoBot/Migrations/Postgresql/20221122204423_feed-text.cs

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

src/NadekoBot/Migrations/Postgresql/20230813113832_timely-reminder-type.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Nadeko.Bot.Db;
+using NadekoBot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable