Fixed some aliases and reworked namespaces

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 Nadeko.Bot.Db.Models;
+namespace NadekoBot.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 Nadeko.Bot.Db.Models;
+namespace NadekoBot.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 Nadeko.Bot.Db.Models;
+namespace NadekoBot.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
 {