From 7a6086863253a481561e0f752490a755cc1ffcd4 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 Mar 2023 15:48:59 +0100 Subject: [PATCH] Lots more stuff --- NadekoBot.sln | 27 ++++--- .../Abstractions/creds/IBotCredentials.cs | 78 +++++++++++++++++++ .../Abstractions/creds/IBotCredsProvider.cs | 8 ++ .../Abstractions}/strings/IBotStrings.cs | 7 +- .../strings/IBotStringsExtensions.cs | 2 +- .../strings/IBotStringsProvider.cs | 2 +- .../Abstractions/strings/ICommandStrings.cs | 8 ++ .../Abstractions}/strings/IStringsSource.cs | 2 +- .../Abstractions/strings/LocStr.cs | 13 ++++ .../Configs/BotConfig.cs | 2 + .../Configs/IConfigSeria.cs | 0 .../DbService.cs | 0 .../Extensions/DbExtensions.cs | 12 +++ .../Extensions}/ImagesharpExtensions.cs | 0 src/Nadeko.Bot.Common/GlobalUsings.cs | 31 ++++++++ .../ICloneable.cs | 0 .../ILogCommandService.cs | 0 .../Interaction/INadekoInteractionService.cs | 0 .../Interaction/NadekoInteraction.cs | 0 .../Interaction/NadekoInteractionData.cs | 0 .../Interaction/NadekoInteractionService.cs | 4 +- .../Interaction/SimpleInteraction.cs | 0 .../Medusa/IMedusaLoaderService.cs | 24 ++++++ .../Medusa/MedusaLoadResult.cs | 10 +++ .../Medusa/MedusaUnloadResult.cs | 9 +++ src/Nadeko.Bot.Common/MessageType.cs | 8 ++ .../ModuleBehaviors/IExecNoCommand.cs | 0 .../ModuleBehaviors/IExecOnMessage.cs | 0 .../ModuleBehaviors/IExecPostCommand.cs | 0 .../ModuleBehaviors/IExecPreCommand.cs | 0 .../ModuleBehaviors/IInputTransformer.cs | 0 .../ModuleBehaviors/IReadyExecutor.cs | 0 .../Nadeko.Bot.Common.csproj | 29 +++++++ .../NadekoModule.cs | 12 +-- .../Replacements/ReplacementBuilder.cs | 0 .../Replacements/Replacer.cs | 0 .../Services/IBehaviourExecutor.cs | 0 .../Services/ICommandHandler.cs | 6 ++ .../Services/ICoordinator.cs | 0 .../Services/ICustomBehavior.cs | 0 .../Services/IEmbedBuilderService.cs | 0 .../Services/IGoogleApiService.cs | 0 .../Services/ILocalization.cs | 2 +- .../Services/INService.cs | 0 .../Services/IStatsService.cs | 0 .../Settings/BotConfigService.cs | 0 .../Settings/ConfigParsers.cs | 1 - .../Settings/ConfigServiceBase.cs | 2 + .../Settings/IConfigMigrator.cs | 0 .../Settings/IConfigService.cs | 0 .../Settings/SettingParser.cs | 0 .../SmartText/SmartEmbedText.cs | 0 .../SmartText/SmartEmbedTextArray.cs | 0 .../SmartText/SmartPlainText.cs | 0 .../SmartText/SmartText.cs | 0 .../SmartText/SmartTextEmbedAuthor.cs | 0 .../SmartText/SmartTextEmbedField.cs | 0 .../SmartText/SmartTextEmbedFooter.cs | 0 .../_Extensions/BotCredentialsExtensions.cs | 0 .../_Extensions/Extensions.cs | 4 +- .../_Extensions/IMessageChannelExtensions.cs | 50 ++++++------ .../_Extensions/LinkedListExtensions.cs | 0 .../_Extensions/NumberExtensions.cs | 0 .../_Extensions/ReflectionExtensions.cs | 0 .../_Extensions/Rgba32Extensions.cs | 0 .../SocketMessageComponentExtensions.cs | 14 ++-- .../_Extensions/UserExtensions.cs | 1 + src/Nadeko.Bot.Db/.globalconfig | 1 + .../Extensions/ClubExtensions.cs | 0 .../CurrencyTransactionExtensions.cs | 0 .../Extensions/DbExtensions.cs | 0 .../Extensions/DiscordUserExtensions.cs | 2 - .../Extensions/GuildConfigExtensions.cs | 0 .../MusicPlayerSettingsExtensions.cs | 0 .../Extensions/MusicPlaylistExtensions.cs | 0 .../Extensions/NadekoExpressionExtensions.cs | 0 .../Extensions/PollExtensions.cs | 4 +- .../Extensions/QuoteExtensions.cs | 7 +- .../Extensions/ReminderExtensions.cs | 0 .../SelfAssignableRolesExtensions.cs | 0 .../Extensions/UserXpExtensions.cs | 0 .../Extensions/WaifuExtensions.cs | 0 .../Extensions/WarningExtensions.cs | 0 src/Nadeko.Bot.Db/GlobalUsings.cs | 31 ++++++++ src/Nadeko.Bot.Db/Helpers/ActivityType.cs | 6 ++ src/Nadeko.Bot.Db/Helpers/GuildPerm.cs | 47 +++++++++++ .../Migrations/MigrationQueries.cs | 0 .../20220409170652_mysql-init.Designer.cs | 48 ++++++------ .../Mysql/20220409170652_mysql-init.cs | 0 .../Mysql/20220428044612_stondel.Designer.cs | 48 ++++++------ .../Mysql/20220428044612_stondel.cs | 0 .../Mysql/20220429044757_bank.Designer.cs | 50 ++++++------ .../Migrations/Mysql/20220429044757_bank.cs | 0 .../Mysql/20220504162509_new-rero.Designer.cs | 50 ++++++------ .../Mysql/20220504162509_new-rero.cs | 0 ...0220614071410_patronage-system.Designer.cs | 54 ++++++------- .../Mysql/20220614071410_patronage-system.cs | 0 ...0220623090718_stondel-db-cache.Designer.cs | 56 ++++++------- .../Mysql/20220623090718_stondel-db-cache.cs | 0 .../Mysql/20220703194400_logwarns.Designer.cs | 56 ++++++------- .../Mysql/20220703194400_logwarns.cs | 0 .../20220725155953_xpitemshop.Designer.cs | 58 +++++++------- .../Mysql/20220725155953_xpitemshop.cs | 0 ...220727033931_linkonly-channels.Designer.cs | 58 +++++++------- .../Mysql/20220727033931_linkonly-channels.cs | 0 ...855_remove-obsolete-xp-columns.Designer.cs | 58 +++++++------- ...220808141855_remove-obsolete-xp-columns.cs | 0 .../Mysql/20220831142722_banprune.Designer.cs | 58 +++++++------- .../Mysql/20220831142722_banprune.cs | 0 .../20220913192520_shop-role-req.Designer.cs | 58 +++++++------- .../Mysql/20220913192520_shop-role-req.cs | 0 .../Mysql/20220916194514_autopub.Designer.cs | 60 +++++++------- .../Mysql/20220916194514_autopub.cs | 0 .../20221003175743_gambling-stats.Designer.cs | 60 +++++++------- .../Mysql/20221003175743_gambling-stats.cs | 0 ...2758_toggle-global-expressions.Designer.cs | 60 +++++++------- ...0221021192758_toggle-global-expressions.cs | 0 .../20221118195208_log-thread.Designer.cs | 60 +++++++------- .../Mysql/20221118195208_log-thread.cs | 0 .../20221122204432_feed-text.Designer.cs | 60 +++++++------- .../Mysql/20221122204432_feed-text.cs | 0 .../Mysql/MysqlContextModelSnapshot.cs | 60 +++++++------- .../20220409170719_mysql-init.Designer.cs | 48 ++++++------ .../PostgreSql/20220409170719_mysql-init.cs | 0 .../20220428044547_stondel.Designer.cs | 48 ++++++------ .../PostgreSql/20220428044547_stondel.cs | 0 .../20220429044808_bank.Designer.cs | 50 ++++++------ .../PostgreSql/20220429044808_bank.cs | 0 .../20220504162457_new-rero.Designer.cs | 50 ++++++------ .../PostgreSql/20220504162457_new-rero.cs | 0 ...0220614071421_patronage-system.Designer.cs | 54 ++++++------- .../20220614071421_patronage-system.cs | 0 ...0220623090729_stondel-db-cache.Designer.cs | 56 ++++++------- .../20220623090729_stondel-db-cache.cs | 0 .../20220703194412_logwarns.Designer.cs | 56 ++++++------- .../PostgreSql/20220703194412_logwarns.cs | 0 .../20220725155941_xpitemshop.Designer.cs | 58 +++++++------- .../PostgreSql/20220725155941_xpitemshop.cs | 0 ...220727033944_linkonly-channels.Designer.cs | 58 +++++++------- .../20220727033944_linkonly-channels.cs | 0 ...559_remove-obsolete-xp-columns.Designer.cs | 58 +++++++------- ...220808142559_remove-obsolete-xp-columns.cs | 0 .../20220831142735_banprune.Designer.cs | 58 +++++++------- .../PostgreSql/20220831142735_banprune.cs | 0 .../20220913192529_shop-role-req.Designer.cs | 58 +++++++------- .../20220913192529_shop-role-req.cs | 0 .../20220916194523_autopub.Designer.cs | 60 +++++++------- .../PostgreSql/20220916194523_autopub.cs | 0 .../20221003175752_gambling-stats.Designer.cs | 60 +++++++------- .../20221003175752_gambling-stats.cs | 0 ...2807_toggle-global-expressions.Designer.cs | 60 +++++++------- ...0221021192807_toggle-global-expressions.cs | 0 .../20221118195200_log-thread.Designer.cs | 60 +++++++------- .../PostgreSql/20221118195200_log-thread.cs | 0 .../20221122204423_feed-text.Designer.cs | 60 +++++++------- .../PostgreSql/20221122204423_feed-text.cs | 0 .../PostgreSqlContextModelSnapshot.cs | 60 +++++++------- .../Sqlite/20210621042359_squash.Designer.cs | 48 ++++++------ .../Sqlite/20210621042359_squash.cs | 0 .../Sqlite/20210707002343_cleanup.Designer.cs | 48 ++++++------ .../Sqlite/20210707002343_cleanup.cs | 0 .../20210911225622_rero-cascade.Designer.cs | 48 ++++++------ .../Sqlite/20210911225622_rero-cascade.cs | 0 .../20210912182515_boost-messages.Designer.cs | 48 ++++++------ .../Sqlite/20210912182515_boost-messages.cs | 0 ...00106_logsettings-independence.Designer.cs | 48 ++++++------ ...20210912200106_logsettings-independence.cs | 0 ...0914180026_image-only-channels.Designer.cs | 48 ++++++------ .../20210914180026_image-only-channels.cs | 0 ...1204645_logignore-user-channel.Designer.cs | 48 ++++++------ .../20210921204645_logignore-user-channel.cs | 0 ...1015232708_nsfw-blacklist-tags.Designer.cs | 48 ++++++------ .../20211015232708_nsfw-blacklist-tags.cs | 0 ...211121002508_weighted-warnings.Designer.cs | 48 ++++++------ .../20211121002508_weighted-warnings.cs | 0 .../20211213145407_atl-rework.Designer.cs | 48 ++++++------ .../Sqlite/20211213145407_atl-rework.cs | 0 ...ame-to-expressions-perm-rename.Designer.cs | 48 ++++++------ ...4_crs-rename-to-expressions-perm-rename.cs | 0 ...105942_filter-settings-cleanup.Designer.cs | 48 ++++++------ .../20220110105942_filter-settings-cleanup.cs | 0 ...rs-rework-discorduser-defaults.Designer.cs | 48 ++++++------ ...4401_curtrs-rework-discorduser-defaults.cs | 0 .../20220213123633_music-autoplay.Designer.cs | 48 ++++++------ .../Sqlite/20220213123633_music-autoplay.cs | 0 .../20220409170828_clubs-refactor.Designer.cs | 48 ++++++------ .../Sqlite/20220409170828_clubs-refactor.cs | 0 .../Sqlite/20220427200557_stondel.Designer.cs | 48 ++++++------ .../Sqlite/20220427200557_stondel.cs | 0 .../Sqlite/20220428051304_bank.Designer.cs | 50 ++++++------ .../Migrations/Sqlite/20220428051304_bank.cs | 0 .../20220503234243_new-rero.Designer.cs | 50 ++++++------ .../Sqlite/20220503234243_new-rero.cs | 0 ...0220614071359_patronage-system.Designer.cs | 54 ++++++------- .../Sqlite/20220614071359_patronage-system.cs | 0 ...0220623073903_stondel-db-cache.Designer.cs | 56 ++++++------- .../Sqlite/20220623073903_stondel-db-cache.cs | 0 .../20220703194348_logwarns.Designer.cs | 56 ++++++------- .../Sqlite/20220703194348_logwarns.cs | 0 .../20220725112348_xpitemshop.Designer.cs | 58 +++++++------- .../Sqlite/20220725112348_xpitemshop.cs | 0 ...220727005807_linkonly-channels.Designer.cs | 58 +++++++------- .../20220727005807_linkonly-channels.cs | 0 ...842_remove-obsolete-xp-columns.Designer.cs | 58 +++++++------- ...220808141842_remove-obsolete-xp-columns.cs | 0 .../20220831142504_banprune.Designer.cs | 58 +++++++------- .../Sqlite/20220831142504_banprune.cs | 0 .../20220913190532_shop-role-req.Designer.cs | 58 +++++++------- .../Sqlite/20220913190532_shop-role-req.cs | 0 .../Sqlite/20220916191702_autopub.Designer.cs | 60 +++++++------- .../Sqlite/20220916191702_autopub.cs | 0 .../20221003111019_gambling-stats.Designer.cs | 60 +++++++------- .../Sqlite/20221003111019_gambling-stats.cs | 0 ...2121_toggle-global-expressions.Designer.cs | 60 +++++++------- ...0221021192121_toggle-global-expressions.cs | 0 .../20221118195152_log-thread.Designer.cs | 60 +++++++------- .../Sqlite/20221118195152_log-thread.cs | 0 .../20221122204324_feed-text.Designer.cs | 60 +++++++------- .../Sqlite/20221122204324_feed-text.cs | 0 .../NadekoSqliteContextModelSnapshot.cs | 60 +++++++------- .../Models/AntiProtection.cs | 2 + .../Models/AutoCommand.cs | 0 .../Models/AutoPublishChannel.cs | 0 .../Models/AutoTranslateChannel.cs | 0 .../Models/AutoTranslateUser.cs | 0 .../Models/BanTemplate.cs | 0 .../Db => Nadeko.Bot.Db}/Models/BankUser.cs | 0 .../Models/BlacklistEntry.cs | 0 .../Db => Nadeko.Bot.Db}/Models/ClubInfo.cs | 0 .../Models/CommandAlias.cs | 0 .../Models/CommandCooldown.cs | 0 .../Models/CurrencyTransaction.cs | 0 .../Db => Nadeko.Bot.Db}/Models/DbEntity.cs | 0 .../Models/DelMsgOnCmdChannel.cs | 0 .../Models/DiscordPemOverride.cs | 2 + .../Models/DiscordUser.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Event.cs | 0 .../Db => Nadeko.Bot.Db}/Models/FeedSub.cs | 0 .../Models/FilterChannelId.cs | 0 .../Models/FilterLinksChannelId.cs | 0 .../Models/FilteredWord.cs | 0 .../Models/FollowedStream.cs | 4 +- .../Models/GCChannelId.cs | 0 .../Models/GamblingStats.cs | 0 .../Db => Nadeko.Bot.Db}/Models/GroupName.cs | 0 .../Models/GuildConfig.cs | 0 .../Models/IgnoredLogItem.cs | 0 .../Models/IgnoredVoicePresenceChannel.cs | 0 .../Models/ImageOnlyChannel.cs | 0 .../Db => Nadeko.Bot.Db}/Models/LogSetting.cs | 0 .../Models/MusicPlaylist.cs | 0 .../Models/MusicSettings.cs | 0 .../Models/MutedUserId.cs | 0 .../Models/NadekoExpression.cs | 0 .../Models/NsfwBlacklistedTag.cs | 0 .../Models/PatronQuota.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Permission.cs | 1 + .../Models/PlantedCurrency.cs | 0 .../Models/PlaylistSong.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Poll.cs | 2 + .../Db => Nadeko.Bot.Db}/Models/PollVote.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Quote.cs | 0 .../Models/ReactionRole.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Reminder.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Repeater.cs | 0 .../Models/RewardedUser.cs | 0 .../Models/RotatingPlayingStatus.cs | 2 + .../Models/SelfAssignableRole.cs | 0 .../Db => Nadeko.Bot.Db}/Models/ShopEntry.cs | 2 + .../Models/SlowmodeIgnoredRole.cs | 0 .../Models/SlowmodeIgnoredUser.cs | 0 .../Models/StreamOnlineMessage.cs | 0 .../Models/StreamRoleSettings.cs | 0 .../Db => Nadeko.Bot.Db}/Models/UnbanTimer.cs | 0 .../Models/UnmuteTimer.cs | 0 .../Models/UnroleTimer.cs | 0 .../Models/UserXpStats.cs | 0 .../Db => Nadeko.Bot.Db}/Models/VcRoleInfo.cs | 0 src/Nadeko.Bot.Db/Models/Waifu.cs | 33 ++++++++ .../Db => Nadeko.Bot.Db}/Models/WaifuItem.cs | 0 .../Models/WaifuUpdate.cs | 0 .../Models/WarnExpireAction.cs | 0 .../Db => Nadeko.Bot.Db}/Models/Warning.cs | 0 .../Models/WarningPunishment.cs | 0 .../Db => Nadeko.Bot.Db}/Models/XpSettings.cs | 0 .../Models/XpShopOwnedItem.cs | 0 .../Db => Nadeko.Bot.Db}/MysqlContext.cs | 0 src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj | 36 +++++++++ .../Db => Nadeko.Bot.Db}/NadekoContext.cs | 0 .../Db => Nadeko.Bot.Db}/PostgreSqlContext.cs | 0 .../Db => Nadeko.Bot.Db}/SqliteContext.cs | 0 .../Extensions/EnumerableExtensions.cs | 4 +- .../Extensions}/StringExtensions.cs | 5 +- src/Nadeko.Common/Nadeko.Common.csproj | 1 + .../Yml => Nadeko.Common}/YamlHelper.cs | 4 +- .../LocalizedStringsGenerator.cs | 30 +++---- .../GlobalUsings.cs | 31 ++++++++ .../NadekoBot.Modules.Expresssions.csproj | 11 +++ .../NadekoExpressionExtensions.cs | 1 + .../NadekoExpressionsService.cs | 1 + src/NadekoBot.Tests/BotStringsTests.cs | 1 + src/NadekoBot/Common/Creds.cs | 37 ++++----- src/NadekoBot/Common/IBotCredentials.cs | 37 --------- .../Common/Medusa/MedusaLoaderService.cs | 17 ---- .../ServiceCollectionExtensions.cs | 0 src/NadekoBot/Db/Models/Waifu.cs | 75 ------------------ .../Gambling/Waifus/Common/Extensions.cs | 6 ++ .../Gambling/Waifus/WaifuClaimCommands.cs | 43 +++++++--- .../Modules/Searches/_Common/Extensions.cs | 10 +++ src/NadekoBot/NadekoBot.csproj | 9 +-- src/NadekoBot/Services/CommandHandler.cs | 2 +- .../Services/Impl/BotCredsProvider.cs | 17 ++-- .../Services/strings/impl/BotStrings.cs | 4 +- .../strings/impl/LocalFileStringsSource.cs | 4 +- .../strings/impl/MemoryBotStringsProvider.cs | 2 +- 315 files changed, 2482 insertions(+), 2128 deletions(-) create mode 100644 src/Nadeko.Bot.Common/Abstractions/creds/IBotCredentials.cs create mode 100644 src/Nadeko.Bot.Common/Abstractions/creds/IBotCredsProvider.cs rename src/{NadekoBot/Services => Nadeko.Bot.Common/Abstractions}/strings/IBotStrings.cs (60%) rename src/{NadekoBot/Services => Nadeko.Bot.Common/Abstractions}/strings/IBotStringsExtensions.cs (95%) rename src/{NadekoBot/Services => Nadeko.Bot.Common/Abstractions}/strings/IBotStringsProvider.cs (90%) create mode 100644 src/Nadeko.Bot.Common/Abstractions/strings/ICommandStrings.cs rename src/{NadekoBot/Services => Nadeko.Bot.Common/Abstractions}/strings/IStringsSource.cs (83%) create mode 100644 src/Nadeko.Bot.Common/Abstractions/strings/LocStr.cs rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Configs/BotConfig.cs (99%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Configs/IConfigSeria.cs (100%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/DbService.cs (100%) create mode 100644 src/Nadeko.Bot.Common/Extensions/DbExtensions.cs rename src/{NadekoBot/_Extensions => Nadeko.Bot.Common/Extensions}/ImagesharpExtensions.cs (100%) create mode 100644 src/Nadeko.Bot.Common/GlobalUsings.cs rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ICloneable.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ILogCommandService.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Interaction/INadekoInteractionService.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Interaction/NadekoInteraction.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Interaction/NadekoInteractionData.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Interaction/NadekoInteractionService.cs (90%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Interaction/SimpleInteraction.cs (100%) create mode 100644 src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs create mode 100644 src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs create mode 100644 src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs create mode 100644 src/Nadeko.Bot.Common/MessageType.cs rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IExecNoCommand.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IExecOnMessage.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IExecPostCommand.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IExecPreCommand.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IInputTransformer.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/ModuleBehaviors/IReadyExecutor.cs (100%) create mode 100644 src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj rename src/{NadekoBot/Common => Nadeko.Bot.Common}/NadekoModule.cs (93%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Replacements/ReplacementBuilder.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/Replacements/Replacer.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/IBehaviourExecutor.cs (100%) create mode 100644 src/Nadeko.Bot.Common/Services/ICommandHandler.cs rename src/{NadekoBot => Nadeko.Bot.Common}/Services/ICoordinator.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/ICustomBehavior.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/IEmbedBuilderService.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/IGoogleApiService.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/ILocalization.cs (87%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/INService.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/Services/IStatsService.cs (100%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/BotConfigService.cs (100%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/ConfigParsers.cs (97%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/ConfigServiceBase.cs (99%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/IConfigMigrator.cs (100%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/IConfigService.cs (100%) rename src/{NadekoBot/Services => Nadeko.Bot.Common}/Settings/SettingParser.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartEmbedText.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartEmbedTextArray.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartPlainText.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartText.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartTextEmbedAuthor.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartTextEmbedField.cs (100%) rename src/{NadekoBot/Common => Nadeko.Bot.Common}/SmartText/SmartTextEmbedFooter.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/BotCredentialsExtensions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/Extensions.cs (99%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/IMessageChannelExtensions.cs (90%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/LinkedListExtensions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/NumberExtensions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/ReflectionExtensions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/Rgba32Extensions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/SocketMessageComponentExtensions.cs (89%) rename src/{NadekoBot => Nadeko.Bot.Common}/_Extensions/UserExtensions.cs (98%) create mode 100644 src/Nadeko.Bot.Db/.globalconfig rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/ClubExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/CurrencyTransactionExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/DbExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/DiscordUserExtensions.cs (94%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/GuildConfigExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/MusicPlayerSettingsExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/MusicPlaylistExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/NadekoExpressionExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/PollExtensions.cs (88%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/QuoteExtensions.cs (94%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/ReminderExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/SelfAssignableRolesExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/UserXpExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/WaifuExtensions.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Extensions/WarningExtensions.cs (100%) create mode 100644 src/Nadeko.Bot.Db/GlobalUsings.cs create mode 100644 src/Nadeko.Bot.Db/Helpers/ActivityType.cs create mode 100644 src/Nadeko.Bot.Db/Helpers/GuildPerm.cs rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/MigrationQueries.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220409170652_mysql-init.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220409170652_mysql-init.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220428044612_stondel.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220428044612_stondel.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220429044757_bank.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220429044757_bank.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220504162509_new-rero.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220504162509_new-rero.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220614071410_patronage-system.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220614071410_patronage-system.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220623090718_stondel-db-cache.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220703194400_logwarns.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220703194400_logwarns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220725155953_xpitemshop.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220727033931_linkonly-channels.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220831142722_banprune.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220831142722_banprune.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220913192520_shop-role-req.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220916194514_autopub.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20220916194514_autopub.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221003175743_gambling-stats.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221021192758_toggle-global-expressions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221118195208_log-thread.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221118195208_log-thread.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221122204432_feed-text.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/20221122204432_feed-text.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Mysql/MysqlContextModelSnapshot.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220409170719_mysql-init.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220428044547_stondel.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220428044547_stondel.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220429044808_bank.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220429044808_bank.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220504162457_new-rero.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220614071421_patronage-system.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220703194412_logwarns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220725155941_xpitemshop.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220727033944_linkonly-channels.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220831142735_banprune.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220831142735_banprune.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220913192529_shop-role-req.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220916194523_autopub.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20220916194523_autopub.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221003175752_gambling-stats.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221021192807_toggle-global-expressions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221118195200_log-thread.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/20221122204423_feed-text.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210621042359_squash.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210621042359_squash.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210707002343_cleanup.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210707002343_cleanup.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210911225622_rero-cascade.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210912182515_boost-messages.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210912200106_logsettings-independence.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210914180026_image-only-channels.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20210921204645_logignore-user-channel.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211121002508_weighted-warnings.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20211213145407_atl-rework.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220213123633_music-autoplay.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220409170828_clubs-refactor.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220427200557_stondel.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220427200557_stondel.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220428051304_bank.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220428051304_bank.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220503234243_new-rero.Designer.cs (98%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220503234243_new-rero.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220614071359_patronage-system.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220623073903_stondel-db-cache.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220703194348_logwarns.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220703194348_logwarns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220725112348_xpitemshop.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220727005807_linkonly-channels.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220831142504_banprune.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220831142504_banprune.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220913190532_shop-role-req.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220916191702_autopub.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20220916191702_autopub.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221003111019_gambling-stats.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221021192121_toggle-global-expressions.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221118195152_log-thread.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221118195152_log-thread.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221122204324_feed-text.Designer.cs (97%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/20221122204324_feed-text.cs (100%) rename src/{NadekoBot => Nadeko.Bot.Db}/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs (97%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/AntiProtection.cs (98%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/AutoCommand.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/AutoPublishChannel.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/AutoTranslateChannel.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/AutoTranslateUser.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/BanTemplate.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/BankUser.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/BlacklistEntry.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/ClubInfo.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/CommandAlias.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/CommandCooldown.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/CurrencyTransaction.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/DbEntity.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/DelMsgOnCmdChannel.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/DiscordPemOverride.cs (91%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/DiscordUser.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Event.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/FeedSub.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/FilterChannelId.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/FilterLinksChannelId.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/FilteredWord.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/FollowedStream.cs (88%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/GCChannelId.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/GamblingStats.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/GroupName.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/GuildConfig.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/IgnoredLogItem.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/IgnoredVoicePresenceChannel.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/ImageOnlyChannel.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/LogSetting.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/MusicPlaylist.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/MusicSettings.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/MutedUserId.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/NadekoExpression.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/NsfwBlacklistedTag.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/PatronQuota.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Permission.cs (98%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/PlantedCurrency.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/PlaylistSong.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Poll.cs (95%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/PollVote.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Quote.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/ReactionRole.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Reminder.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Repeater.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/RewardedUser.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/RotatingPlayingStatus.cs (89%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/SelfAssignableRole.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/ShopEntry.cs (97%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/SlowmodeIgnoredRole.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/SlowmodeIgnoredUser.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/StreamOnlineMessage.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/StreamRoleSettings.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/UnbanTimer.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/UnmuteTimer.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/UnroleTimer.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/UserXpStats.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/VcRoleInfo.cs (100%) create mode 100644 src/Nadeko.Bot.Db/Models/Waifu.cs rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/WaifuItem.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/WaifuUpdate.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/WarnExpireAction.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/Warning.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/WarningPunishment.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/XpSettings.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/Models/XpShopOwnedItem.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/MysqlContext.cs (100%) create mode 100644 src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj rename src/{NadekoBot/Db => Nadeko.Bot.Db}/NadekoContext.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/PostgreSqlContext.cs (100%) rename src/{NadekoBot/Db => Nadeko.Bot.Db}/SqliteContext.cs (100%) rename src/{NadekoBot/_Extensions => Nadeko.Common/Extensions}/StringExtensions.cs (97%) rename src/{NadekoBot/Common/Yml => Nadeko.Common}/YamlHelper.cs (92%) create mode 100644 src/NadekoBot.Modules.Expresssions/GlobalUsings.cs delete mode 100644 src/NadekoBot/Common/IBotCredentials.cs rename src/NadekoBot/{_Extensions => Common}/ServiceCollectionExtensions.cs (100%) delete mode 100644 src/NadekoBot/Db/Models/Waifu.cs create mode 100644 src/NadekoBot/Modules/Gambling/Waifus/Common/Extensions.cs create mode 100644 src/NadekoBot/Modules/Searches/_Common/Extensions.cs diff --git a/NadekoBot.sln b/NadekoBot.sln index f26c7cd56..805b062d0 100644 --- a/NadekoBot.sln +++ b/NadekoBot.sln @@ -35,10 +35,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Common", "src\Nadeko EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Econ", "src\Nadeko.Econ\Nadeko.Econ.csproj", "{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Cache", "src\Nadeko.Cache\Nadeko.Cache.csproj", "{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Modules.Expresssions", "src\NadekoBot.Modules.Expresssions\NadekoBot.Modules.Expresssions.csproj", "{92E239B9-C230-4475-9506-BED20174FD20}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Bot.Db", "src\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj", "{02499E3E-3B04-4BC8-9B3C-D9494661F78E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Bot.Common", "src\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj", "{02ABC10E-3323-4698-A388-C61D7D03797E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -100,18 +102,24 @@ Global {4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU {4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.ActiveCfg = Release|Any CPU {4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.Build.0 = Release|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Release|Any CPU.Build.0 = Release|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.Debug|Any CPU.Build.0 = Debug|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.Release|Any CPU.ActiveCfg = Release|Any CPU {92E239B9-C230-4475-9506-BED20174FD20}.Release|Any CPU.Build.0 = Release|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02499E3E-3B04-4BC8-9B3C-D9494661F78E}.Release|Any CPU.Build.0 = Release|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02ABC10E-3323-4698-A388-C61D7D03797E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -127,8 +135,9 @@ Global {E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} {A6022F5F-A764-4D3F-847B-36F0391FF659} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} {4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} - {7CD45BAA-72BF-466E-AFD8-E1224A6DDC05} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} {92E239B9-C230-4475-9506-BED20174FD20} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} + {02499E3E-3B04-4BC8-9B3C-D9494661F78E} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} + {02ABC10E-3323-4698-A388-C61D7D03797E} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4} diff --git a/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredentials.cs b/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredentials.cs new file mode 100644 index 000000000..e833f7128 --- /dev/null +++ b/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredentials.cs @@ -0,0 +1,78 @@ +#nullable disable +namespace NadekoBot; + +public interface IBotCredentials +{ + string Token { get; } + string GoogleApiKey { get; } + ICollection OwnerIds { get; } + bool UsePrivilegedIntents { get; } + string RapidApiKey { get; } + + IDbOptions Db { get; } + string OsuApiKey { get; } + int TotalShards { get; } + IPatreonSettings Patreon { get; } + string CleverbotApiKey { get; } + string Gpt3ApiKey { get; } + IRestartConfig RestartCommand { get; } + IVotesSettings Votes { get; } + string BotListToken { get; } + string RedisOptions { get; } + string LocationIqApiKey { get; } + string TimezoneDbApiKey { get; } + string CoinmarketcapApiKey { get; } + string TrovoClientId { get; } + string CoordinatorUrl { get; set; } + string TwitchClientId { get; set; } + string TwitchClientSecret { get; set; } + IGoogleApiConfig Google { get; set; } + BotCacheImplemenation BotCache { get; set; } +} + +public interface IVotesSettings +{ + string TopggServiceUrl { get; set; } + string TopggKey { get; set; } + string DiscordsServiceUrl { get; set; } + string DiscordsKey { get; set; } +} + +public interface IPatreonSettings +{ + public string ClientId { get; set; } + public string AccessToken { get; set; } + public string RefreshToken { get; set; } + public string ClientSecret { get; set; } + public string CampaignId { get; set; } +} + +public interface IRestartConfig +{ + string Cmd { get; set; } + string Args { get; set; } +} + +public class RestartConfig : IRestartConfig +{ + public string Cmd { get; set; } + public string Args { get; set; } +} + +public enum BotCacheImplemenation +{ + Memory, + Redis +} + +public interface IDbOptions +{ + string Type { get; set; } + string ConnectionString { get; set; } +} + +public interface IGoogleApiConfig +{ + string SearchId { get; init; } + string ImageSearchId { get; init; } +} \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredsProvider.cs b/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredsProvider.cs new file mode 100644 index 000000000..97568583d --- /dev/null +++ b/src/Nadeko.Bot.Common/Abstractions/creds/IBotCredsProvider.cs @@ -0,0 +1,8 @@ +namespace NadekoBot; + +public interface IBotCredsProvider +{ + public void Reload(); + public IBotCredentials GetCreds(); + public void ModifyCredsFile(Action func); +} \ No newline at end of file diff --git a/src/NadekoBot/Services/strings/IBotStrings.cs b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStrings.cs similarity index 60% rename from src/NadekoBot/Services/strings/IBotStrings.cs rename to src/Nadeko.Bot.Common/Abstractions/strings/IBotStrings.cs index fb4c66162..09bc896d7 100644 --- a/src/NadekoBot/Services/strings/IBotStrings.cs +++ b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStrings.cs @@ -1,7 +1,8 @@ #nullable disable using System.Globalization; +using NadekoBot.Services; -namespace NadekoBot.Services; +namespace NadekoBot.Common; /// /// Defines methods to retrieve and reload bot strings @@ -11,6 +12,6 @@ public interface IBotStrings string GetText(string key, ulong? guildId = null, params object[] data); string GetText(string key, CultureInfo locale, params object[] data); void Reload(); - CommandStrings GetCommandStrings(string commandName, ulong? guildId = null); - CommandStrings GetCommandStrings(string commandName, CultureInfo cultureInfo); + ICommandStrings GetCommandStrings(string commandName, ulong? guildId = null); + ICommandStrings GetCommandStrings(string commandName, CultureInfo cultureInfo); } \ No newline at end of file diff --git a/src/NadekoBot/Services/strings/IBotStringsExtensions.cs b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsExtensions.cs similarity index 95% rename from src/NadekoBot/Services/strings/IBotStringsExtensions.cs rename to src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsExtensions.cs index 599ea78a3..6b9ef89d1 100644 --- a/src/NadekoBot/Services/strings/IBotStringsExtensions.cs +++ b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsExtensions.cs @@ -1,7 +1,7 @@ #nullable disable using System.Globalization; -namespace NadekoBot.Services; +namespace NadekoBot.Common; public static class BotStringsExtensions { diff --git a/src/NadekoBot/Services/strings/IBotStringsProvider.cs b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsProvider.cs similarity index 90% rename from src/NadekoBot/Services/strings/IBotStringsProvider.cs rename to src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsProvider.cs index 628923ac3..8491071b6 100644 --- a/src/NadekoBot/Services/strings/IBotStringsProvider.cs +++ b/src/Nadeko.Bot.Common/Abstractions/strings/IBotStringsProvider.cs @@ -24,5 +24,5 @@ public interface IBotStringsProvider /// /// Language name /// Command name - CommandStrings GetCommandStrings(string localeName, string commandName); + ICommandStrings GetCommandStrings(string localeName, string commandName); } \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/Abstractions/strings/ICommandStrings.cs b/src/Nadeko.Bot.Common/Abstractions/strings/ICommandStrings.cs new file mode 100644 index 000000000..b092523f9 --- /dev/null +++ b/src/Nadeko.Bot.Common/Abstractions/strings/ICommandStrings.cs @@ -0,0 +1,8 @@ +#nullable disable +namespace NadekoBot.Services; + +public interface ICommandStrings +{ + string Desc { get; set; } + string[] Args { get; set; } +} \ No newline at end of file diff --git a/src/NadekoBot/Services/strings/IStringsSource.cs b/src/Nadeko.Bot.Common/Abstractions/strings/IStringsSource.cs similarity index 83% rename from src/NadekoBot/Services/strings/IStringsSource.cs rename to src/Nadeko.Bot.Common/Abstractions/strings/IStringsSource.cs index 82329f873..693168661 100644 --- a/src/NadekoBot/Services/strings/IStringsSource.cs +++ b/src/Nadeko.Bot.Common/Abstractions/strings/IStringsSource.cs @@ -12,5 +12,5 @@ public interface IStringsSource /// Dictionary(localename, Dictionary(key, response)) Dictionary> GetResponseStrings(); - Dictionary> GetCommandStrings(); + Dictionary> GetCommandStrings(); } \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/Abstractions/strings/LocStr.cs b/src/Nadeko.Bot.Common/Abstractions/strings/LocStr.cs new file mode 100644 index 000000000..6518265d6 --- /dev/null +++ b/src/Nadeko.Bot.Common/Abstractions/strings/LocStr.cs @@ -0,0 +1,13 @@ +namespace NadekoBot.Common; + +public readonly struct LocStr +{ + public readonly string Key; + public readonly object[] Params; + + public LocStr(string key, params object[] data) + { + Key = key; + Params = data; + } +} \ No newline at end of file diff --git a/src/NadekoBot/Common/Configs/BotConfig.cs b/src/Nadeko.Bot.Common/Configs/BotConfig.cs similarity index 99% rename from src/NadekoBot/Common/Configs/BotConfig.cs rename to src/Nadeko.Bot.Common/Configs/BotConfig.cs index fad137834..d9c508428 100644 --- a/src/NadekoBot/Common/Configs/BotConfig.cs +++ b/src/Nadeko.Bot.Common/Configs/BotConfig.cs @@ -1,8 +1,10 @@ #nullable disable + using Cloneable; using NadekoBot.Common.Yml; using SixLabors.ImageSharp.PixelFormats; using System.Globalization; +using Microsoft.EntityFrameworkCore; using YamlDotNet.Core; using YamlDotNet.Serialization; diff --git a/src/NadekoBot/Common/Configs/IConfigSeria.cs b/src/Nadeko.Bot.Common/Configs/IConfigSeria.cs similarity index 100% rename from src/NadekoBot/Common/Configs/IConfigSeria.cs rename to src/Nadeko.Bot.Common/Configs/IConfigSeria.cs diff --git a/src/NadekoBot/Services/DbService.cs b/src/Nadeko.Bot.Common/DbService.cs similarity index 100% rename from src/NadekoBot/Services/DbService.cs rename to src/Nadeko.Bot.Common/DbService.cs diff --git a/src/Nadeko.Bot.Common/Extensions/DbExtensions.cs b/src/Nadeko.Bot.Common/Extensions/DbExtensions.cs new file mode 100644 index 000000000..105617667 --- /dev/null +++ b/src/Nadeko.Bot.Common/Extensions/DbExtensions.cs @@ -0,0 +1,12 @@ +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; + +public static class DbExtensions +{ + public static DiscordUser GetOrCreateUser(this NadekoContext ctx, IUser original, Func, IQueryable> includes = null) + => ctx.GetOrCreateUser(original.Id, original.Username, original.Discriminator, original.AvatarId, includes); +} \ No newline at end of file diff --git a/src/NadekoBot/_Extensions/ImagesharpExtensions.cs b/src/Nadeko.Bot.Common/Extensions/ImagesharpExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/ImagesharpExtensions.cs rename to src/Nadeko.Bot.Common/Extensions/ImagesharpExtensions.cs diff --git a/src/Nadeko.Bot.Common/GlobalUsings.cs b/src/Nadeko.Bot.Common/GlobalUsings.cs new file mode 100644 index 000000000..6029f602e --- /dev/null +++ b/src/Nadeko.Bot.Common/GlobalUsings.cs @@ -0,0 +1,31 @@ +// // global using System.Collections.Concurrent; +// global using NonBlocking; +// +// // packages +// global using Serilog; +global using Humanizer; +// +// // nadekobot +// global using NadekoBot; +// global using NadekoBot.Services; +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; + +// discord +global using Discord; +global using Discord.Commands; +global using Discord.Net; +global using Discord.WebSocket; + +// aliases +global using GuildPerm = Discord.GuildPermission; +global using ChannelPerm = Discord.ChannelPermission; +global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute; +global using LeftoverAttribute = Discord.Commands.RemainderAttribute; +// global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult; + +// non-essential +global using JetBrains.Annotations; \ No newline at end of file diff --git a/src/NadekoBot/Common/ICloneable.cs b/src/Nadeko.Bot.Common/ICloneable.cs similarity index 100% rename from src/NadekoBot/Common/ICloneable.cs rename to src/Nadeko.Bot.Common/ICloneable.cs diff --git a/src/NadekoBot/Common/ILogCommandService.cs b/src/Nadeko.Bot.Common/ILogCommandService.cs similarity index 100% rename from src/NadekoBot/Common/ILogCommandService.cs rename to src/Nadeko.Bot.Common/ILogCommandService.cs diff --git a/src/NadekoBot/Common/Interaction/INadekoInteractionService.cs b/src/Nadeko.Bot.Common/Interaction/INadekoInteractionService.cs similarity index 100% rename from src/NadekoBot/Common/Interaction/INadekoInteractionService.cs rename to src/Nadeko.Bot.Common/Interaction/INadekoInteractionService.cs diff --git a/src/NadekoBot/Common/Interaction/NadekoInteraction.cs b/src/Nadeko.Bot.Common/Interaction/NadekoInteraction.cs similarity index 100% rename from src/NadekoBot/Common/Interaction/NadekoInteraction.cs rename to src/Nadeko.Bot.Common/Interaction/NadekoInteraction.cs diff --git a/src/NadekoBot/Common/Interaction/NadekoInteractionData.cs b/src/Nadeko.Bot.Common/Interaction/NadekoInteractionData.cs similarity index 100% rename from src/NadekoBot/Common/Interaction/NadekoInteractionData.cs rename to src/Nadeko.Bot.Common/Interaction/NadekoInteractionData.cs diff --git a/src/NadekoBot/Common/Interaction/NadekoInteractionService.cs b/src/Nadeko.Bot.Common/Interaction/NadekoInteractionService.cs similarity index 90% rename from src/NadekoBot/Common/Interaction/NadekoInteractionService.cs rename to src/Nadeko.Bot.Common/Interaction/NadekoInteractionService.cs index 5f586b2cb..c0c54f61d 100644 --- a/src/NadekoBot/Common/Interaction/NadekoInteractionService.cs +++ b/src/Nadeko.Bot.Common/Interaction/NadekoInteractionService.cs @@ -1,4 +1,6 @@ -namespace NadekoBot; +using NadekoBot.Services; + +namespace NadekoBot; public class NadekoInteractionService : INadekoInteractionService, INService { diff --git a/src/NadekoBot/Common/Interaction/SimpleInteraction.cs b/src/Nadeko.Bot.Common/Interaction/SimpleInteraction.cs similarity index 100% rename from src/NadekoBot/Common/Interaction/SimpleInteraction.cs rename to src/Nadeko.Bot.Common/Interaction/SimpleInteraction.cs diff --git a/src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs b/src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs new file mode 100644 index 000000000..06812a8e1 --- /dev/null +++ b/src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs @@ -0,0 +1,24 @@ +using System.Globalization; + +namespace Nadeko.Medusa; + +public interface IMedusaLoaderService +{ + Task LoadMedusaAsync(string medusaName); + Task UnloadMedusaAsync(string medusaName); + string GetCommandDescription(string medusaName, string commandName, CultureInfo culture); + string[] GetCommandExampleArgs(string medusaName, string commandName, CultureInfo culture); + Task ReloadStrings(); + IReadOnlyCollection GetAllMedusae(); + IReadOnlyCollection GetLoadedMedusae(CultureInfo? cultureInfo = null); +} + +public sealed record MedusaStats(string Name, + string? Description, + IReadOnlyCollection Sneks); + +public sealed record SnekStats(string Name, + string? Prefix, + IReadOnlyCollection Commands); + +public sealed record SnekCommandStats(string Name); \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs b/src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs new file mode 100644 index 000000000..619450225 --- /dev/null +++ b/src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs @@ -0,0 +1,10 @@ +namespace Nadeko.Medusa; + +public enum MedusaLoadResult +{ + Success, + NotFound, + AlreadyLoaded, + Empty, + UnknownError, +} \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs b/src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs new file mode 100644 index 000000000..b8398bb12 --- /dev/null +++ b/src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs @@ -0,0 +1,9 @@ +namespace Nadeko.Medusa; + +public enum MedusaUnloadResult +{ + Success, + NotLoaded, + PossiblyUnable, + NotFound, +} \ No newline at end of file diff --git a/src/Nadeko.Bot.Common/MessageType.cs b/src/Nadeko.Bot.Common/MessageType.cs new file mode 100644 index 000000000..7f195095a --- /dev/null +++ b/src/Nadeko.Bot.Common/MessageType.cs @@ -0,0 +1,8 @@ +namespace NadekoBot.Common; + +public enum MsgType +{ + Ok, + Pending, + Error +} \ No newline at end of file diff --git a/src/NadekoBot/Common/ModuleBehaviors/IExecNoCommand.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IExecNoCommand.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IExecNoCommand.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IExecNoCommand.cs diff --git a/src/NadekoBot/Common/ModuleBehaviors/IExecOnMessage.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IExecOnMessage.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IExecOnMessage.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IExecOnMessage.cs diff --git a/src/NadekoBot/Common/ModuleBehaviors/IExecPostCommand.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IExecPostCommand.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IExecPostCommand.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IExecPostCommand.cs diff --git a/src/NadekoBot/Common/ModuleBehaviors/IExecPreCommand.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IExecPreCommand.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IExecPreCommand.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IExecPreCommand.cs diff --git a/src/NadekoBot/Common/ModuleBehaviors/IInputTransformer.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IInputTransformer.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IInputTransformer.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IInputTransformer.cs diff --git a/src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs b/src/Nadeko.Bot.Common/ModuleBehaviors/IReadyExecutor.cs similarity index 100% rename from src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs rename to src/Nadeko.Bot.Common/ModuleBehaviors/IReadyExecutor.cs diff --git a/src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj b/src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj new file mode 100644 index 000000000..b1b0144ec --- /dev/null +++ b/src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj @@ -0,0 +1,29 @@ + + + + net7.0 + enable + enable + false + + + + + + + + + + + + + + + + + all + True + + + + diff --git a/src/NadekoBot/Common/NadekoModule.cs b/src/Nadeko.Bot.Common/NadekoModule.cs similarity index 93% rename from src/NadekoBot/Common/NadekoModule.cs rename to src/Nadeko.Bot.Common/NadekoModule.cs index 1a70895ed..ab6830337 100644 --- a/src/NadekoBot/Common/NadekoModule.cs +++ b/src/Nadeko.Bot.Common/NadekoModule.cs @@ -1,10 +1,10 @@ #nullable disable using System.Globalization; -using MessageType = NadekoBot.Extensions.MessageType; +using NadekoBot.Services; // ReSharper disable InconsistentNaming -namespace NadekoBot.Modules; +namespace NadekoBot.Common; [UsedImplicitly(ImplicitUseTargetFlags.Default | ImplicitUseTargetFlags.WithInheritors @@ -15,7 +15,7 @@ public abstract class NadekoModule : ModuleBase // Injected by Discord.net public IBotStrings Strings { get; set; } - public CommandHandler _cmdHandler { get; set; } + public ICommandHandler _cmdHandler { get; set; } public ILocalization _localization { get; set; } public IEmbedBuilderService _eb { get; set; } public INadekoInteractionService _inter { get; set; } @@ -49,11 +49,11 @@ public abstract class NadekoModule : ModuleBase // public Task SendErrorAsync(string text, NadekoInteraction inter = null) - => ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter); + => ctx.Channel.SendAsync(_eb, text, MsgType.Error, inter); public Task SendConfirmAsync(string text, NadekoInteraction inter = null) - => ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter); + => ctx.Channel.SendAsync(_eb, text, MsgType.Ok, inter); public Task SendPendingAsync(string text, NadekoInteraction inter = null) - => ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter); + => ctx.Channel.SendAsync(_eb, text, MsgType.Pending, inter); // localized normal diff --git a/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs b/src/Nadeko.Bot.Common/Replacements/ReplacementBuilder.cs similarity index 100% rename from src/NadekoBot/Common/Replacements/ReplacementBuilder.cs rename to src/Nadeko.Bot.Common/Replacements/ReplacementBuilder.cs diff --git a/src/NadekoBot/Common/Replacements/Replacer.cs b/src/Nadeko.Bot.Common/Replacements/Replacer.cs similarity index 100% rename from src/NadekoBot/Common/Replacements/Replacer.cs rename to src/Nadeko.Bot.Common/Replacements/Replacer.cs diff --git a/src/NadekoBot/Services/IBehaviourExecutor.cs b/src/Nadeko.Bot.Common/Services/IBehaviourExecutor.cs similarity index 100% rename from src/NadekoBot/Services/IBehaviourExecutor.cs rename to src/Nadeko.Bot.Common/Services/IBehaviourExecutor.cs diff --git a/src/Nadeko.Bot.Common/Services/ICommandHandler.cs b/src/Nadeko.Bot.Common/Services/ICommandHandler.cs new file mode 100644 index 000000000..affb45e3e --- /dev/null +++ b/src/Nadeko.Bot.Common/Services/ICommandHandler.cs @@ -0,0 +1,6 @@ +namespace NadekoBot.Services; + +public interface ICommandHandler +{ + string GetPrefix(IGuild ctxGuild); +} \ No newline at end of file diff --git a/src/NadekoBot/Services/ICoordinator.cs b/src/Nadeko.Bot.Common/Services/ICoordinator.cs similarity index 100% rename from src/NadekoBot/Services/ICoordinator.cs rename to src/Nadeko.Bot.Common/Services/ICoordinator.cs diff --git a/src/NadekoBot/Services/ICustomBehavior.cs b/src/Nadeko.Bot.Common/Services/ICustomBehavior.cs similarity index 100% rename from src/NadekoBot/Services/ICustomBehavior.cs rename to src/Nadeko.Bot.Common/Services/ICustomBehavior.cs diff --git a/src/NadekoBot/Services/IEmbedBuilderService.cs b/src/Nadeko.Bot.Common/Services/IEmbedBuilderService.cs similarity index 100% rename from src/NadekoBot/Services/IEmbedBuilderService.cs rename to src/Nadeko.Bot.Common/Services/IEmbedBuilderService.cs diff --git a/src/NadekoBot/Services/IGoogleApiService.cs b/src/Nadeko.Bot.Common/Services/IGoogleApiService.cs similarity index 100% rename from src/NadekoBot/Services/IGoogleApiService.cs rename to src/Nadeko.Bot.Common/Services/IGoogleApiService.cs diff --git a/src/NadekoBot/Services/ILocalization.cs b/src/Nadeko.Bot.Common/Services/ILocalization.cs similarity index 87% rename from src/NadekoBot/Services/ILocalization.cs rename to src/Nadeko.Bot.Common/Services/ILocalization.cs index f5e5439da..684f69983 100644 --- a/src/NadekoBot/Services/ILocalization.cs +++ b/src/Nadeko.Bot.Common/Services/ILocalization.cs @@ -6,7 +6,7 @@ namespace NadekoBot.Services; public interface ILocalization { CultureInfo DefaultCultureInfo { get; } - ConcurrentDictionary GuildCultureInfos { get; } + IDictionary GuildCultureInfos { get; } CultureInfo GetCultureInfo(IGuild guild); CultureInfo GetCultureInfo(ulong? guildId); diff --git a/src/NadekoBot/Services/INService.cs b/src/Nadeko.Bot.Common/Services/INService.cs similarity index 100% rename from src/NadekoBot/Services/INService.cs rename to src/Nadeko.Bot.Common/Services/INService.cs diff --git a/src/NadekoBot/Services/IStatsService.cs b/src/Nadeko.Bot.Common/Services/IStatsService.cs similarity index 100% rename from src/NadekoBot/Services/IStatsService.cs rename to src/Nadeko.Bot.Common/Services/IStatsService.cs diff --git a/src/NadekoBot/Services/Settings/BotConfigService.cs b/src/Nadeko.Bot.Common/Settings/BotConfigService.cs similarity index 100% rename from src/NadekoBot/Services/Settings/BotConfigService.cs rename to src/Nadeko.Bot.Common/Settings/BotConfigService.cs diff --git a/src/NadekoBot/Services/Settings/ConfigParsers.cs b/src/Nadeko.Bot.Common/Settings/ConfigParsers.cs similarity index 97% rename from src/NadekoBot/Services/Settings/ConfigParsers.cs rename to src/Nadeko.Bot.Common/Settings/ConfigParsers.cs index 0dbc29d4d..9b4d3dadf 100644 --- a/src/NadekoBot/Services/Settings/ConfigParsers.cs +++ b/src/Nadeko.Bot.Common/Settings/ConfigParsers.cs @@ -1,5 +1,4 @@ #nullable disable -using NadekoBot.Modules.Searches; using SixLabors.ImageSharp.PixelFormats; using System.Globalization; diff --git a/src/NadekoBot/Services/Settings/ConfigServiceBase.cs b/src/Nadeko.Bot.Common/Settings/ConfigServiceBase.cs similarity index 99% rename from src/NadekoBot/Services/Settings/ConfigServiceBase.cs rename to src/Nadeko.Bot.Common/Settings/ConfigServiceBase.cs index 7031d17c3..d26b140c3 100644 --- a/src/NadekoBot/Services/Settings/ConfigServiceBase.cs +++ b/src/Nadeko.Bot.Common/Settings/ConfigServiceBase.cs @@ -2,6 +2,8 @@ using NadekoBot.Common.Configs; using NadekoBot.Common.Yml; using System.Linq.Expressions; using System.Reflection; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Common; namespace NadekoBot.Services; diff --git a/src/NadekoBot/Services/Settings/IConfigMigrator.cs b/src/Nadeko.Bot.Common/Settings/IConfigMigrator.cs similarity index 100% rename from src/NadekoBot/Services/Settings/IConfigMigrator.cs rename to src/Nadeko.Bot.Common/Settings/IConfigMigrator.cs diff --git a/src/NadekoBot/Services/Settings/IConfigService.cs b/src/Nadeko.Bot.Common/Settings/IConfigService.cs similarity index 100% rename from src/NadekoBot/Services/Settings/IConfigService.cs rename to src/Nadeko.Bot.Common/Settings/IConfigService.cs diff --git a/src/NadekoBot/Services/Settings/SettingParser.cs b/src/Nadeko.Bot.Common/Settings/SettingParser.cs similarity index 100% rename from src/NadekoBot/Services/Settings/SettingParser.cs rename to src/Nadeko.Bot.Common/Settings/SettingParser.cs diff --git a/src/NadekoBot/Common/SmartText/SmartEmbedText.cs b/src/Nadeko.Bot.Common/SmartText/SmartEmbedText.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartEmbedText.cs rename to src/Nadeko.Bot.Common/SmartText/SmartEmbedText.cs diff --git a/src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs b/src/Nadeko.Bot.Common/SmartText/SmartEmbedTextArray.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs rename to src/Nadeko.Bot.Common/SmartText/SmartEmbedTextArray.cs diff --git a/src/NadekoBot/Common/SmartText/SmartPlainText.cs b/src/Nadeko.Bot.Common/SmartText/SmartPlainText.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartPlainText.cs rename to src/Nadeko.Bot.Common/SmartText/SmartPlainText.cs diff --git a/src/NadekoBot/Common/SmartText/SmartText.cs b/src/Nadeko.Bot.Common/SmartText/SmartText.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartText.cs rename to src/Nadeko.Bot.Common/SmartText/SmartText.cs diff --git a/src/NadekoBot/Common/SmartText/SmartTextEmbedAuthor.cs b/src/Nadeko.Bot.Common/SmartText/SmartTextEmbedAuthor.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartTextEmbedAuthor.cs rename to src/Nadeko.Bot.Common/SmartText/SmartTextEmbedAuthor.cs diff --git a/src/NadekoBot/Common/SmartText/SmartTextEmbedField.cs b/src/Nadeko.Bot.Common/SmartText/SmartTextEmbedField.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartTextEmbedField.cs rename to src/Nadeko.Bot.Common/SmartText/SmartTextEmbedField.cs diff --git a/src/NadekoBot/Common/SmartText/SmartTextEmbedFooter.cs b/src/Nadeko.Bot.Common/SmartText/SmartTextEmbedFooter.cs similarity index 100% rename from src/NadekoBot/Common/SmartText/SmartTextEmbedFooter.cs rename to src/Nadeko.Bot.Common/SmartText/SmartTextEmbedFooter.cs diff --git a/src/NadekoBot/_Extensions/BotCredentialsExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/BotCredentialsExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/BotCredentialsExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/BotCredentialsExtensions.cs diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/Nadeko.Bot.Common/_Extensions/Extensions.cs similarity index 99% rename from src/NadekoBot/_Extensions/Extensions.cs rename to src/Nadeko.Bot.Common/_Extensions/Extensions.cs index dfb6c7c9e..e81e8ab8e 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/Nadeko.Bot.Common/_Extensions/Extensions.cs @@ -1,9 +1,11 @@ using Humanizer.Localisation; -using Nadeko.Medusa; using System.Diagnostics; using System.Globalization; using System.Text.Json; using System.Text.RegularExpressions; +using Nadeko.Medusa; +using NadekoBot.Common; +using Serilog; namespace NadekoBot.Extensions; diff --git a/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/IMessageChannelExtensions.cs similarity index 90% rename from src/NadekoBot/_Extensions/IMessageChannelExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/IMessageChannelExtensions.cs index 47cfcc114..1d5b2c5f4 100644 --- a/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs +++ b/src/Nadeko.Bot.Common/_Extensions/IMessageChannelExtensions.cs @@ -1,5 +1,6 @@ -using Nadeko.Common; -using NadekoBot.Modules.Xp; +using NadekoBot.Common; +using NadekoBot.Services; +using Serilog; namespace NadekoBot.Extensions; @@ -78,16 +79,16 @@ public static class MessageChannelExtensions this IMessageChannel ch, IEmbedBuilderService eb, string text, - MessageType type, + MsgType type, NadekoInteraction? inter = null) { var builder = eb.Create().WithDescription(text); builder = (type switch { - MessageType.Error => builder.WithErrorColor(), - MessageType.Ok => builder.WithOkColor(), - MessageType.Pending => builder.WithPendingColor(), + MsgType.Error => builder.WithErrorColor(), + MsgType.Ok => builder.WithOkColor(), + MsgType.Pending => builder.WithPendingColor(), _ => throw new ArgumentOutOfRangeException(nameof(type)) }); @@ -96,15 +97,15 @@ public static class MessageChannelExtensions // regular send overloads public static Task SendErrorAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text) - => ch.SendAsync(eb, text, MessageType.Error); + => ch.SendAsync(eb, text, MsgType.Error); public static Task SendConfirmAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text) - => ch.SendAsync(eb, text, MessageType.Ok); + => ch.SendAsync(eb, text, MsgType.Ok); public static Task SendAsync( this IMessageChannel ch, IEmbedBuilderService eb, - MessageType type, + MsgType type, string? title, string text, string? url = null, @@ -122,9 +123,9 @@ public static class MessageChannelExtensions embed = type switch { - MessageType.Error => embed.WithErrorColor(), - MessageType.Ok => embed.WithOkColor(), - MessageType.Pending => embed.WithPendingColor(), + MsgType.Error => embed.WithErrorColor(), + MsgType.Ok => embed.WithOkColor(), + MsgType.Pending => embed.WithPendingColor(), _ => throw new ArgumentOutOfRangeException(nameof(type)) }; @@ -140,7 +141,7 @@ public static class MessageChannelExtensions string text, string? url = null, string? footer = null) - => ch.SendAsync(eb, MessageType.Ok, title, text, url, footer); + => ch.SendAsync(eb, MsgType.Ok, title, text, url, footer); public static Task SendErrorAsync( this IMessageChannel ch, @@ -149,7 +150,7 @@ public static class MessageChannelExtensions string text, string? url = null, string? footer = null) - => ch.SendAsync(eb, MessageType.Error, title, text, url, footer); + => ch.SendAsync(eb, MsgType.Error, title, text, url, footer); public static Task SendPaginatedConfirmAsync( this ICommandContext ctx, @@ -307,13 +308,13 @@ public static class MessageChannelExtensions private static readonly Emoji _warnEmoji = new Emoji("⚠️"); private static readonly Emoji _errorEmoji = new Emoji("❌"); - public static Task ReactAsync(this ICommandContext ctx, MessageType type) + public static Task ReactAsync(this ICommandContext ctx, MsgType type) { var emoji = type switch { - MessageType.Error => _errorEmoji, - MessageType.Pending => _warnEmoji, - MessageType.Ok => _okEmoji, + MsgType.Error => _errorEmoji, + MsgType.Pending => _warnEmoji, + MsgType.Ok => _okEmoji, _ => throw new ArgumentOutOfRangeException(nameof(type)), }; @@ -321,18 +322,11 @@ public static class MessageChannelExtensions } public static Task OkAsync(this ICommandContext ctx) - => ctx.ReactAsync(MessageType.Ok); + => ctx.ReactAsync(MsgType.Ok); public static Task ErrorAsync(this ICommandContext ctx) - => ctx.ReactAsync(MessageType.Error); + => ctx.ReactAsync(MsgType.Error); public static Task WarningAsync(this ICommandContext ctx) - => ctx.ReactAsync(MessageType.Pending); -} - -public enum MessageType -{ - Ok, - Pending, - Error + => ctx.ReactAsync(MsgType.Pending); } \ No newline at end of file diff --git a/src/NadekoBot/_Extensions/LinkedListExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/LinkedListExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/LinkedListExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/LinkedListExtensions.cs diff --git a/src/NadekoBot/_Extensions/NumberExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/NumberExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/NumberExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/NumberExtensions.cs diff --git a/src/NadekoBot/_Extensions/ReflectionExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/ReflectionExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/ReflectionExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/ReflectionExtensions.cs diff --git a/src/NadekoBot/_Extensions/Rgba32Extensions.cs b/src/Nadeko.Bot.Common/_Extensions/Rgba32Extensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/Rgba32Extensions.cs rename to src/Nadeko.Bot.Common/_Extensions/Rgba32Extensions.cs diff --git a/src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/SocketMessageComponentExtensions.cs similarity index 89% rename from src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/SocketMessageComponentExtensions.cs index 3054331b2..ae0ef1ecf 100644 --- a/src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs +++ b/src/Nadeko.Bot.Common/_Extensions/SocketMessageComponentExtensions.cs @@ -1,4 +1,6 @@ using Nadeko.Common; +using NadekoBot.Common; +using NadekoBot.Services; namespace NadekoBot.Extensions; @@ -63,7 +65,7 @@ public static class SocketMessageComponentExtensions this SocketMessageComponent ch, IEmbedBuilderService eb, string text, - MessageType type, + MsgType type, bool ephemeral = false, NadekoInteraction? inter = null) { @@ -71,9 +73,9 @@ public static class SocketMessageComponentExtensions builder = (type switch { - MessageType.Error => builder.WithErrorColor(), - MessageType.Ok => builder.WithOkColor(), - MessageType.Pending => builder.WithPendingColor(), + MsgType.Error => builder.WithErrorColor(), + MsgType.Ok => builder.WithOkColor(), + MsgType.Pending => builder.WithPendingColor(), _ => throw new ArgumentOutOfRangeException(nameof(type)) }); @@ -87,12 +89,12 @@ public static class SocketMessageComponentExtensions IEmbedBuilderService eb, string text, bool ephemeral = false) - => smc.RespondAsync(eb, text, MessageType.Error, ephemeral); + => smc.RespondAsync(eb, text, MsgType.Error, ephemeral); public static Task RespondConfirmAsync( this SocketMessageComponent smc, IEmbedBuilderService eb, string text, bool ephemeral = false) - => smc.RespondAsync(eb, text, MessageType.Ok, ephemeral); + => smc.RespondAsync(eb, text, MsgType.Ok, ephemeral); } \ No newline at end of file diff --git a/src/NadekoBot/_Extensions/UserExtensions.cs b/src/Nadeko.Bot.Common/_Extensions/UserExtensions.cs similarity index 98% rename from src/NadekoBot/_Extensions/UserExtensions.cs rename to src/Nadeko.Bot.Common/_Extensions/UserExtensions.cs index 79da0c824..aeb7960db 100644 --- a/src/NadekoBot/_Extensions/UserExtensions.cs +++ b/src/Nadeko.Bot.Common/_Extensions/UserExtensions.cs @@ -1,4 +1,5 @@ using NadekoBot.Db.Models; +using NadekoBot.Services; namespace NadekoBot.Extensions; diff --git a/src/Nadeko.Bot.Db/.globalconfig b/src/Nadeko.Bot.Db/.globalconfig new file mode 100644 index 000000000..5e750a2a0 --- /dev/null +++ b/src/Nadeko.Bot.Db/.globalconfig @@ -0,0 +1 @@ +dotnet_diagnostic.CS8981.severity = none \ No newline at end of file diff --git a/src/NadekoBot/Db/Extensions/ClubExtensions.cs b/src/Nadeko.Bot.Db/Extensions/ClubExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/ClubExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/ClubExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs b/src/Nadeko.Bot.Db/Extensions/CurrencyTransactionExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/CurrencyTransactionExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/DbExtensions.cs b/src/Nadeko.Bot.Db/Extensions/DbExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/DbExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/DbExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs b/src/Nadeko.Bot.Db/Extensions/DiscordUserExtensions.cs similarity index 94% rename from src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/DiscordUserExtensions.cs index a2eaaa179..ae4c603e9 100644 --- a/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs +++ b/src/Nadeko.Bot.Db/Extensions/DiscordUserExtensions.cs @@ -83,8 +83,6 @@ public static class DiscordUserExtensions return queryable.First(u => u.UserId == userId); } - public static DiscordUser GetOrCreateUser(this NadekoContext ctx, IUser original, Func, IQueryable> includes = null) - => ctx.GetOrCreateUser(original.Id, original.Username, original.Discriminator, original.AvatarId, includes); public static int GetUserGlobalRank(this DbSet users, ulong id) => users.AsQueryable() diff --git a/src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs b/src/Nadeko.Bot.Db/Extensions/GuildConfigExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/GuildConfigExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs b/src/Nadeko.Bot.Db/Extensions/MusicPlayerSettingsExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/MusicPlayerSettingsExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs b/src/Nadeko.Bot.Db/Extensions/MusicPlaylistExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/MusicPlaylistExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/NadekoExpressionExtensions.cs b/src/Nadeko.Bot.Db/Extensions/NadekoExpressionExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/NadekoExpressionExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/NadekoExpressionExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/PollExtensions.cs b/src/Nadeko.Bot.Db/Extensions/PollExtensions.cs similarity index 88% rename from src/NadekoBot/Db/Extensions/PollExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/PollExtensions.cs index f5da1a051..01be1e3d6 100644 --- a/src/NadekoBot/Db/Extensions/PollExtensions.cs +++ b/src/Nadeko.Bot.Db/Extensions/PollExtensions.cs @@ -8,7 +8,9 @@ namespace NadekoBot.Db; public static class PollExtensions { public static IEnumerable GetAllPolls(this DbSet polls) - => polls.Include(x => x.Answers).Include(x => x.Votes).ToArray(); + => polls.Include(x => x.Answers) + .Include(x => x.Votes) + .ToArray(); public static void RemovePoll(this NadekoContext ctx, int id) { diff --git a/src/NadekoBot/Db/Extensions/QuoteExtensions.cs b/src/Nadeko.Bot.Db/Extensions/QuoteExtensions.cs similarity index 94% rename from src/NadekoBot/Db/Extensions/QuoteExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/QuoteExtensions.cs index fce0ed76d..e9fb1a5a4 100644 --- a/src/NadekoBot/Db/Extensions/QuoteExtensions.cs +++ b/src/Nadeko.Bot.Db/Extensions/QuoteExtensions.cs @@ -1,5 +1,6 @@ #nullable disable using Microsoft.EntityFrameworkCore; +using Nadeko.Common; using NadekoBot.Services.Database.Models; namespace NadekoBot.Db; @@ -29,10 +30,10 @@ public static class QuoteExtensions ulong guildId, string keyword) { - var rng = new NadekoRandom(); + // todo figure shuffle out return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToListAsync()) - .OrderBy(_ => rng.Next()) - .FirstOrDefault(); + .Shuffle() + .FirstOrDefault(); } public static async Task SearchQuoteKeywordTextAsync( diff --git a/src/NadekoBot/Db/Extensions/ReminderExtensions.cs b/src/Nadeko.Bot.Db/Extensions/ReminderExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/ReminderExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/ReminderExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs b/src/Nadeko.Bot.Db/Extensions/SelfAssignableRolesExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/SelfAssignableRolesExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/UserXpExtensions.cs b/src/Nadeko.Bot.Db/Extensions/UserXpExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/UserXpExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/UserXpExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/WaifuExtensions.cs b/src/Nadeko.Bot.Db/Extensions/WaifuExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/WaifuExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/WaifuExtensions.cs diff --git a/src/NadekoBot/Db/Extensions/WarningExtensions.cs b/src/Nadeko.Bot.Db/Extensions/WarningExtensions.cs similarity index 100% rename from src/NadekoBot/Db/Extensions/WarningExtensions.cs rename to src/Nadeko.Bot.Db/Extensions/WarningExtensions.cs diff --git a/src/Nadeko.Bot.Db/GlobalUsings.cs b/src/Nadeko.Bot.Db/GlobalUsings.cs new file mode 100644 index 000000000..d7366f6f0 --- /dev/null +++ b/src/Nadeko.Bot.Db/GlobalUsings.cs @@ -0,0 +1,31 @@ +// // global using System.Collections.Concurrent; +// global using NonBlocking; +// +// // packages +// global using Serilog; +// global using Humanizer; +// +// // 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; + +// // discord +// global using Discord; +// global using Discord.Commands; +// global using Discord.Net; +// global using Discord.WebSocket; +// +// // aliases +// global using GuildPerm = Discord.GuildPermission; +// global using ChannelPerm = Discord.ChannelPermission; +// global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute; +// global using LeftoverAttribute = Discord.Commands.RemainderAttribute; +// global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult; + +// non-essential +// global using JetBrains.Annotations; \ No newline at end of file diff --git a/src/Nadeko.Bot.Db/Helpers/ActivityType.cs b/src/Nadeko.Bot.Db/Helpers/ActivityType.cs new file mode 100644 index 000000000..fc40d6e9e --- /dev/null +++ b/src/Nadeko.Bot.Db/Helpers/ActivityType.cs @@ -0,0 +1,6 @@ +namespace Nadeko.Bot.Db; + +public enum ActivityType +{ + +} \ No newline at end of file diff --git a/src/Nadeko.Bot.Db/Helpers/GuildPerm.cs b/src/Nadeko.Bot.Db/Helpers/GuildPerm.cs new file mode 100644 index 000000000..f95de33a7 --- /dev/null +++ b/src/Nadeko.Bot.Db/Helpers/GuildPerm.cs @@ -0,0 +1,47 @@ +namespace Nadeko.Bot.Db; + +[Flags] +public enum GuildPerm : ulong +{ + CreateInstantInvite = 1, + KickMembers = 2, + BanMembers = 4, + Administrator = 8, + ManageChannels = 16, // 0x0000000000000010 + ManageGuild = 32, // 0x0000000000000020 + ViewGuildInsights = 524288, // 0x0000000000080000 + AddReactions = 64, // 0x0000000000000040 + ViewAuditLog = 128, // 0x0000000000000080 + ViewChannel = 1024, // 0x0000000000000400 + SendMessages = 2048, // 0x0000000000000800 + SendTTSMessages = 4096, // 0x0000000000001000 + ManageMessages = 8192, // 0x0000000000002000 + EmbedLinks = 16384, // 0x0000000000004000 + AttachFiles = 32768, // 0x0000000000008000 + ReadMessageHistory = 65536, // 0x0000000000010000 + MentionEveryone = 131072, // 0x0000000000020000 + UseExternalEmojis = 262144, // 0x0000000000040000 + Connect = 1048576, // 0x0000000000100000 + Speak = 2097152, // 0x0000000000200000 + MuteMembers = 4194304, // 0x0000000000400000 + DeafenMembers = 8388608, // 0x0000000000800000 + MoveMembers = 16777216, // 0x0000000001000000 + UseVAD = 33554432, // 0x0000000002000000 + PrioritySpeaker = 256, // 0x0000000000000100 + Stream = 512, // 0x0000000000000200 + ChangeNickname = 67108864, // 0x0000000004000000 + ManageNicknames = 134217728, // 0x0000000008000000 + ManageRoles = 268435456, // 0x0000000010000000 + ManageWebhooks = 536870912, // 0x0000000020000000 + ManageEmojisAndStickers = 1073741824, // 0x0000000040000000 + UseApplicationCommands = 2147483648, // 0x0000000080000000 + RequestToSpeak = 4294967296, // 0x0000000100000000 + ManageEvents = 8589934592, // 0x0000000200000000 + ManageThreads = 17179869184, // 0x0000000400000000 + CreatePublicThreads = 34359738368, // 0x0000000800000000 + CreatePrivateThreads = 68719476736, // 0x0000001000000000 + UseExternalStickers = 137438953472, // 0x0000002000000000 + SendMessagesInThreads = 274877906944, // 0x0000004000000000 + StartEmbeddedActivities = 549755813888, // 0x0000008000000000 + ModerateMembers = 1099511627776, // 0x0000010000000000 +} \ No newline at end of file diff --git a/src/NadekoBot/Migrations/MigrationQueries.cs b/src/Nadeko.Bot.Db/Migrations/MigrationQueries.cs similarity index 100% rename from src/NadekoBot/Migrations/MigrationQueries.cs rename to src/Nadeko.Bot.Db/Migrations/MigrationQueries.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.Designer.cs index fe7bb2012..036e0f4d2 100644 --- a/src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -40,7 +40,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -59,7 +59,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -106,7 +106,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -194,7 +194,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2790,16 +2790,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2811,16 +2811,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2832,20 +2832,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2854,7 +2854,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3192,17 +3192,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3228,17 +3228,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3296,7 +3296,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220409170652_mysql-init.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220428044612_stondel.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220428044612_stondel.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220428044612_stondel.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220428044612_stondel.Designer.cs index 4d660814c..05f952a35 100644 --- a/src/NadekoBot/Migrations/Mysql/20220428044612_stondel.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220428044612_stondel.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -40,7 +40,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -59,7 +59,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -106,7 +106,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -194,7 +194,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2794,16 +2794,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2815,16 +2815,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2836,20 +2836,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2858,7 +2858,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3196,17 +3196,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3232,17 +3232,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3300,7 +3300,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220428044612_stondel.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220428044612_stondel.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220428044612_stondel.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220428044612_stondel.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220429044757_bank.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220429044757_bank.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.Designer.cs index a0fb0acc6..3307f7180 100644 --- a/src/NadekoBot/Migrations/Mysql/20220429044757_bank.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2823,16 +2823,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2844,16 +2844,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2865,20 +2865,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2887,7 +2887,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3225,17 +3225,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3261,17 +3261,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3329,7 +3329,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220429044757_bank.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220429044757_bank.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220429044757_bank.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.Designer.cs index 3872a4b97..11834a4f3 100644 --- a/src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.4") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2804,16 +2804,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2825,16 +2825,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2846,20 +2846,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2868,7 +2868,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3185,17 +3185,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3221,17 +3221,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3289,7 +3289,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220504162509_new-rero.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.Designer.cs index 70961f3cf..af7429ef4 100644 --- a/src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -267,7 +267,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -302,7 +302,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -2874,16 +2874,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2895,16 +2895,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2916,20 +2916,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2938,7 +2938,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3255,17 +3255,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3291,17 +3291,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3359,7 +3359,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220614071410_patronage-system.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs index d1198b5d4..3162a6031 100644 --- a/src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.6") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -267,7 +267,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -302,7 +302,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -335,7 +335,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2907,16 +2907,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2928,16 +2928,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2949,20 +2949,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2971,7 +2971,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3288,17 +3288,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3324,17 +3324,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3392,7 +3392,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220623090718_stondel-db-cache.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220703194400_logwarns.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220703194400_logwarns.Designer.cs index 99e16ccfc..a1ed6a991 100644 --- a/src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220703194400_logwarns.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.6") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -267,7 +267,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -302,7 +302,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -335,7 +335,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2911,16 +2911,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2932,16 +2932,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2953,20 +2953,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2975,7 +2975,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3292,17 +3292,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3328,17 +3328,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3396,7 +3396,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220703194400_logwarns.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220703194400_logwarns.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220703194400_logwarns.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs index ffbd3435c..e7e3a4a35 100644 --- a/src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -267,7 +267,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -302,7 +302,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -335,7 +335,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2949,16 +2949,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2970,16 +2970,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2991,20 +2991,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3013,7 +3013,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3330,17 +3330,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3366,17 +3366,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3434,7 +3434,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220725155953_xpitemshop.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs index 5de64cdef..fb1472308 100644 --- a/src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220727033931_linkonly-channels.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -267,7 +267,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -302,7 +302,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -335,7 +335,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2953,16 +2953,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2974,16 +2974,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2995,20 +2995,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3017,7 +3017,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3334,17 +3334,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3370,17 +3370,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3438,7 +3438,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220727033931_linkonly-channels.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220727033931_linkonly-channels.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220727033931_linkonly-channels.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs index adc7dc0d2..7a2ed9ead 100644 --- a/src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -255,7 +255,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -290,7 +290,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -323,7 +323,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -356,7 +356,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2935,16 +2935,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2956,16 +2956,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2977,20 +2977,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2999,7 +2999,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3316,17 +3316,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3352,17 +3352,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3420,7 +3420,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220831142722_banprune.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220831142722_banprune.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220831142722_banprune.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220831142722_banprune.Designer.cs index 31050b8bd..d9be4f158 100644 --- a/src/NadekoBot/Migrations/Mysql/20220831142722_banprune.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220831142722_banprune.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -255,7 +255,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -290,7 +290,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -323,7 +323,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -356,7 +356,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2939,16 +2939,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2960,16 +2960,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2981,20 +2981,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3003,7 +3003,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3320,17 +3320,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3356,17 +3356,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3424,7 +3424,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220831142722_banprune.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220831142722_banprune.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220831142722_banprune.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220831142722_banprune.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs index 4f5b9ddc2..cd78957ec 100644 --- a/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -69,7 +69,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -88,7 +88,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -255,7 +255,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -290,7 +290,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -323,7 +323,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -356,7 +356,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2943,16 +2943,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2964,16 +2964,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2985,20 +2985,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3007,7 +3007,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3324,17 +3324,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3360,17 +3360,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3428,7 +3428,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220913192520_shop-role-req.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220913192520_shop-role-req.cs diff --git a/src/NadekoBot/Migrations/Mysql/20220916194514_autopub.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20220916194514_autopub.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.Designer.cs index 5b70edaad..42495e474 100644 --- a/src/NadekoBot/Migrations/Mysql/20220916194514_autopub.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -79,7 +79,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -98,7 +98,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -117,7 +117,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -240,7 +240,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -284,7 +284,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -319,7 +319,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -352,7 +352,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -385,7 +385,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2972,16 +2972,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2993,16 +2993,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3014,20 +3014,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3036,7 +3036,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3353,17 +3353,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3389,17 +3389,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3457,7 +3457,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20220916194514_autopub.cs diff --git a/src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs index 8ab08051c..a6f3e989b 100644 --- a/src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -79,7 +79,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -98,7 +98,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -117,7 +117,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -240,7 +240,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -284,7 +284,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -319,7 +319,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -352,7 +352,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -385,7 +385,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3005,16 +3005,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3026,16 +3026,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3047,20 +3047,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3069,7 +3069,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3386,17 +3386,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3422,17 +3422,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3490,7 +3490,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221003175743_gambling-stats.cs diff --git a/src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs index 7fb158ed6..e013af23d 100644 --- a/src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20221021192758_toggle-global-expressions.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -79,7 +79,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -98,7 +98,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -117,7 +117,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -240,7 +240,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -284,7 +284,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -319,7 +319,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -352,7 +352,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -385,7 +385,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3009,16 +3009,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3030,16 +3030,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3051,20 +3051,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3073,7 +3073,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3390,17 +3390,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3426,17 +3426,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3494,7 +3494,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221021192758_toggle-global-expressions.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20221021192758_toggle-global-expressions.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221021192758_toggle-global-expressions.cs diff --git a/src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221118195208_log-thread.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221118195208_log-thread.Designer.cs index f364d4d17..175027719 100644 --- a/src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20221118195208_log-thread.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -79,7 +79,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -98,7 +98,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -117,7 +117,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -240,7 +240,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -284,7 +284,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -319,7 +319,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -352,7 +352,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -385,7 +385,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3017,16 +3017,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3038,16 +3038,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3059,20 +3059,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3081,7 +3081,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3398,17 +3398,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3434,17 +3434,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3502,7 +3502,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221118195208_log-thread.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221118195208_log-thread.cs diff --git a/src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221122204432_feed-text.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221122204432_feed-text.Designer.cs index 5b3db6379..28982b68c 100644 --- a/src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/20221122204432_feed-text.Designer.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -79,7 +79,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -98,7 +98,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -117,7 +117,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -240,7 +240,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -284,7 +284,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -319,7 +319,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -352,7 +352,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -385,7 +385,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3021,16 +3021,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3042,16 +3042,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3063,20 +3063,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3085,7 +3085,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3402,17 +3402,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3438,17 +3438,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3506,7 +3506,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/20221122204432_feed-text.cs similarity index 100% rename from src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/20221122204432_feed-text.cs diff --git a/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs b/src/Nadeko.Bot.Db/Migrations/Mysql/MysqlContextModelSnapshot.cs similarity index 98% rename from src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs rename to src/Nadeko.Bot.Db/Migrations/Mysql/MysqlContextModelSnapshot.cs index 788acf460..7a352ba4f 100644 --- a/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs +++ b/src/Nadeko.Bot.Db/Migrations/Mysql/MysqlContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations.Mysql .HasAnnotation("ProductVersion", "6.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -77,7 +77,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("int") @@ -96,7 +96,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("int") @@ -115,7 +115,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -162,7 +162,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -282,7 +282,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("bigint unsigned") @@ -317,7 +317,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -350,7 +350,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -383,7 +383,7 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3019,16 +3019,16 @@ namespace NadekoBot.Migrations.Mysql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3040,16 +3040,16 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3061,20 +3061,20 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3083,7 +3083,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3400,17 +3400,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3436,17 +3436,17 @@ namespace NadekoBot.Migrations.Mysql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3504,7 +3504,7 @@ namespace NadekoBot.Migrations.Mysql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs index 5b5e89cb8..442500d11 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -43,7 +43,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -62,7 +62,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -110,7 +110,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -200,7 +200,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2930,16 +2930,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2951,16 +2951,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2972,20 +2972,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2994,7 +2994,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3332,17 +3332,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3368,17 +3368,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3436,7 +3436,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220409170719_mysql-init.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220428044547_stondel.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220428044547_stondel.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220428044547_stondel.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220428044547_stondel.Designer.cs index a1dc711d2..b7a23502e 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220428044547_stondel.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220428044547_stondel.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -43,7 +43,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -62,7 +62,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -110,7 +110,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -200,7 +200,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2934,16 +2934,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2955,16 +2955,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2976,20 +2976,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -2998,7 +2998,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3336,17 +3336,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3372,17 +3372,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3440,7 +3440,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220428044547_stondel.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220428044547_stondel.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220428044547_stondel.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220428044547_stondel.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.Designer.cs index a8a0f530d..9b7b0c32b 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2965,16 +2965,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2986,16 +2986,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3007,20 +3007,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3029,7 +3029,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3367,17 +3367,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3403,17 +3403,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3471,7 +3471,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220429044808_bank.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs index 751b8efef..d4ca1b3d7 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2944,16 +2944,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2965,16 +2965,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2986,20 +2986,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3008,7 +3008,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3325,17 +3325,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3361,17 +3361,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3429,7 +3429,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220504162457_new-rero.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs index 86ef22544..3a772956b 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -312,7 +312,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -3014,16 +3014,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3035,16 +3035,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3056,20 +3056,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3078,7 +3078,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3395,17 +3395,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3431,17 +3431,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3499,7 +3499,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220614071421_patronage-system.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs index 3cbdb90e5..e1c5fc119 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -312,7 +312,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -345,7 +345,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3049,16 +3049,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3070,16 +3070,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3091,20 +3091,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3113,7 +3113,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3430,17 +3430,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3466,17 +3466,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3534,7 +3534,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs index be0705cd7..b90b40953 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220703194412_logwarns.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -312,7 +312,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -345,7 +345,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3053,16 +3053,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3074,16 +3074,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3095,20 +3095,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3117,7 +3117,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3434,17 +3434,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3470,17 +3470,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3538,7 +3538,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220703194412_logwarns.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220703194412_logwarns.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220703194412_logwarns.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220703194412_logwarns.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs index 6d7089d1d..9a5a94fcd 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -312,7 +312,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -345,7 +345,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -380,7 +380,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3093,16 +3093,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3114,16 +3114,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3135,20 +3135,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3157,7 +3157,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3474,17 +3474,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3510,17 +3510,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3578,7 +3578,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220725155941_xpitemshop.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs index 1b9a56ddd..902d9cb31 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220727033944_linkonly-channels.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -312,7 +312,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -345,7 +345,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -380,7 +380,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3097,16 +3097,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3118,16 +3118,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3139,20 +3139,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3161,7 +3161,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3478,17 +3478,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3514,17 +3514,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3582,7 +3582,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220727033944_linkonly-channels.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220727033944_linkonly-channels.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220727033944_linkonly-channels.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220727033944_linkonly-channels.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs index e398f43ec..5d22c87f6 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -219,7 +219,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -265,7 +265,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -300,7 +300,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -333,7 +333,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3079,16 +3079,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3100,16 +3100,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3121,20 +3121,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3143,7 +3143,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3460,17 +3460,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3496,17 +3496,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3564,7 +3564,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220831142735_banprune.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220831142735_banprune.Designer.cs index 0c3a7ef73..d8c292ec4 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220831142735_banprune.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -219,7 +219,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -265,7 +265,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -300,7 +300,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -333,7 +333,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3083,16 +3083,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3104,16 +3104,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3125,20 +3125,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3147,7 +3147,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3464,17 +3464,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3500,17 +3500,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3568,7 +3568,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220831142735_banprune.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220831142735_banprune.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs index c022ee7db..d3bdffb22 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -74,7 +74,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -141,7 +141,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -219,7 +219,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -265,7 +265,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -300,7 +300,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -333,7 +333,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3087,16 +3087,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3108,16 +3108,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3129,20 +3129,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3151,7 +3151,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3468,17 +3468,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3504,17 +3504,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3572,7 +3572,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220913192529_shop-role-req.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220913192529_shop-role-req.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.Designer.cs index c926f8942..d96b99625 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -86,7 +86,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -105,7 +105,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -124,7 +124,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -172,7 +172,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -296,7 +296,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -331,7 +331,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -364,7 +364,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -399,7 +399,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3118,16 +3118,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3139,16 +3139,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3160,20 +3160,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3182,7 +3182,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3499,17 +3499,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3535,17 +3535,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3603,7 +3603,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20220916194523_autopub.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs index 326926f57..37558428b 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -86,7 +86,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -105,7 +105,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -124,7 +124,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -172,7 +172,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -296,7 +296,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -331,7 +331,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -364,7 +364,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -399,7 +399,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3153,16 +3153,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3174,16 +3174,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3195,20 +3195,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3217,7 +3217,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3534,17 +3534,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3570,17 +3570,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3638,7 +3638,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221003175752_gambling-stats.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs index ba45a94c7..db8d21536 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221021192807_toggle-global-expressions.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -86,7 +86,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -105,7 +105,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -124,7 +124,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -172,7 +172,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -296,7 +296,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -331,7 +331,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -364,7 +364,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -399,7 +399,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3157,16 +3157,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3178,16 +3178,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3199,20 +3199,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3221,7 +3221,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3538,17 +3538,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3574,17 +3574,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3642,7 +3642,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20221021192807_toggle-global-expressions.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221021192807_toggle-global-expressions.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20221021192807_toggle-global-expressions.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221021192807_toggle-global-expressions.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs index 971c3d646..22756b635 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221118195200_log-thread.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -86,7 +86,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -105,7 +105,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -124,7 +124,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -172,7 +172,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -296,7 +296,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -331,7 +331,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -364,7 +364,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -399,7 +399,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3165,16 +3165,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3186,16 +3186,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3207,20 +3207,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3229,7 +3229,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3546,17 +3546,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3582,17 +3582,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3650,7 +3650,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221118195200_log-thread.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221118195200_log-thread.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs index 0ab3d6d06..3d0317281 100644 --- a/src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221122204423_feed-text.Designer.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -55,7 +55,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -86,7 +86,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -105,7 +105,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -124,7 +124,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -172,7 +172,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -296,7 +296,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -331,7 +331,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -364,7 +364,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -399,7 +399,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3169,16 +3169,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3190,16 +3190,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3211,20 +3211,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3233,7 +3233,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3550,17 +3550,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3586,17 +3586,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3654,7 +3654,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/20221122204423_feed-text.cs similarity index 100% rename from src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/20221122204423_feed-text.cs diff --git a/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs b/src/Nadeko.Bot.Db/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs similarity index 98% rename from src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs rename to src/Nadeko.Bot.Db/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs index 472513b2b..94e59fed5 100644 --- a/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs +++ b/src/Nadeko.Bot.Db/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs @@ -22,7 +22,7 @@ namespace NadekoBot.Migrations.PostgreSql NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -53,7 +53,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("autopublishchannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("bankusers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("integer") @@ -103,7 +103,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubapplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("integer") @@ -122,7 +122,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubbans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -170,7 +170,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -248,7 +248,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("discorduser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -294,7 +294,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("followedstream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("numeric(20,0)") @@ -329,7 +329,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patronquotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -362,7 +362,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -397,7 +397,7 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("streamonlinemessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3167,16 +3167,16 @@ namespace NadekoBot.Migrations.PostgreSql b.ToTable("xpsettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubapplicants_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3188,16 +3188,16 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired() .HasConstraintName("fk_clubbans_clubs_clubid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3209,20 +3209,20 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull) .HasConstraintName("fk_clubs_discorduser_ownerid"); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction) @@ -3231,7 +3231,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -3548,17 +3548,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId") .HasConstraintName("fk_waifuinfo_discorduser_affinityid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId") .HasConstraintName("fk_waifuinfo_discorduser_claimerid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -3584,17 +3584,17 @@ namespace NadekoBot.Migrations.PostgreSql modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId") .HasConstraintName("fk_waifuupdates_discorduser_newid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId") .HasConstraintName("fk_waifuupdates_discorduser_oldid"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -3652,7 +3652,7 @@ namespace NadekoBot.Migrations.PostgreSql b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210621042359_squash.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210621042359_squash.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.Designer.cs index 2c27731b5..d2fd3e285 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210621042359_squash.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -149,7 +149,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2189,15 +2189,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2208,15 +2208,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2227,27 +2227,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2562,15 +2562,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2592,15 +2592,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2653,7 +2653,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210621042359_squash.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210621042359_squash.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210621042359_squash.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.Designer.cs index 066405c62..3386ddf3e 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2048,15 +2048,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2067,15 +2067,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2086,27 +2086,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2406,15 +2406,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2436,15 +2436,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2497,7 +2497,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210707002343_cleanup.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs index ce02237f5..f6d93ab85 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210911225622_rero-cascade.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2048,15 +2048,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2067,15 +2067,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2086,27 +2086,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2407,15 +2407,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2437,15 +2437,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2498,7 +2498,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210911225622_rero-cascade.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210911225622_rero-cascade.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210911225622_rero-cascade.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210911225622_rero-cascade.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs index c685b93ef..1d52c4d8b 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912182515_boost-messages.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2060,15 +2060,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2079,15 +2079,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2098,27 +2098,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2419,15 +2419,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2449,15 +2449,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2510,7 +2510,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210912182515_boost-messages.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912182515_boost-messages.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210912182515_boost-messages.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210912182515_boost-messages.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs index c1cef4af0..3e23843a0 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912200106_logsettings-independence.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2061,15 +2061,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2080,15 +2080,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2099,27 +2099,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2411,15 +2411,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2441,15 +2441,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2502,7 +2502,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210912200106_logsettings-independence.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210912200106_logsettings-independence.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210912200106_logsettings-independence.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210912200106_logsettings-independence.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs index 3e8357a29..3ea848361 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2084,15 +2084,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2103,15 +2103,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2122,27 +2122,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2434,15 +2434,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2464,15 +2464,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2525,7 +2525,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210914180026_image-only-channels.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs index c4685881b..377152020 100644 --- a/src/NadekoBot/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210921204645_logignore-user-channel.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2088,15 +2088,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2107,15 +2107,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2126,27 +2126,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2440,15 +2440,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2470,15 +2470,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2531,7 +2531,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20210921204645_logignore-user-channel.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20210921204645_logignore-user-channel.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20210921204645_logignore-user-channel.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20210921204645_logignore-user-channel.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs index 31cfc7cf4..79533064f 100644 --- a/src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2088,15 +2088,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2107,15 +2107,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2126,27 +2126,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2433,15 +2433,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2463,15 +2463,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2524,7 +2524,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs index a3ce0645b..d1d2667ce 100644 --- a/src/NadekoBot/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211121002508_weighted-warnings.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2093,15 +2093,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2112,15 +2112,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2131,27 +2131,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2438,15 +2438,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2468,15 +2468,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2529,7 +2529,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20211121002508_weighted-warnings.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211121002508_weighted-warnings.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20211121002508_weighted-warnings.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211121002508_weighted-warnings.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs index 39b2e19d8..7fae0c42f 100644 --- a/src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.Designer.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Migrations modelBuilder .HasAnnotation("ProductVersion", "5.0.8"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -33,7 +33,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -48,7 +48,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -90,7 +90,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2149,15 +2149,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2168,15 +2168,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2187,27 +2187,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2505,15 +2505,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2535,15 +2535,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2596,7 +2596,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20211213145407_atl-rework.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs index ce371c7c8..e39be14c3 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.1"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -91,7 +91,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -156,7 +156,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2150,15 +2150,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2169,15 +2169,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2188,27 +2188,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2506,15 +2506,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2536,15 +2536,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2597,7 +2597,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220102102344_crs-rename-to-expressions-perm-rename.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs index 8baefe568..cb61ff56b 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.1"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -91,7 +91,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -156,7 +156,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2167,15 +2167,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2186,15 +2186,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2205,27 +2205,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2526,15 +2526,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2556,15 +2556,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2617,7 +2617,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs index 679dde304..10191ca18 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.1"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -91,7 +91,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -160,7 +160,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2184,15 +2184,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2203,15 +2203,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2222,27 +2222,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2543,15 +2543,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2573,15 +2573,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2634,7 +2634,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220125044401_curtrs-rework-discorduser-defaults.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs index 63def42b8..a2c1294d5 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220213123633_music-autoplay.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.2"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -91,7 +91,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -160,7 +160,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2181,15 +2181,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2200,15 +2200,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2219,27 +2219,27 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Users") .HasForeignKey("ClubId"); b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2540,15 +2540,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2570,15 +2570,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2631,7 +2631,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220213123633_music-autoplay.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220213123633_music-autoplay.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220213123633_music-autoplay.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220213123633_music-autoplay.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs index fab555085..ee1efe2d6 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.3"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -85,7 +85,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -154,7 +154,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2175,15 +2175,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2194,15 +2194,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2213,19 +2213,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2233,7 +2233,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2534,15 +2534,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2566,15 +2566,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2627,7 +2627,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220409170828_clubs-refactor.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220427200557_stondel.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220427200557_stondel.Designer.cs index e0d1e14c6..bf151e2cb 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220427200557_stondel.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.3"); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -34,7 +34,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -49,7 +49,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -85,7 +85,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -154,7 +154,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2178,15 +2178,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2197,15 +2197,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2216,19 +2216,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2236,7 +2236,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2537,15 +2537,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2569,15 +2569,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2630,7 +2630,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220427200557_stondel.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220427200557_stondel.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220428051304_bank.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220428051304_bank.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.Designer.cs index aa91e5e14..28bb4b459 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220428051304_bank.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.3"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2201,15 +2201,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2220,15 +2220,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2239,19 +2239,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2259,7 +2259,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2560,15 +2560,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2592,15 +2592,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2653,7 +2653,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220428051304_bank.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220428051304_bank.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220428051304_bank.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.Designer.cs similarity index 98% rename from src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.Designer.cs index ba4cdc7dd..a20a6a0da 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.3"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2186,15 +2186,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2205,15 +2205,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2224,19 +2224,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2244,7 +2244,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2526,15 +2526,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2558,15 +2558,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2619,7 +2619,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220503234243_new-rero.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs index 6e25b6178..69ad7b235 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.5"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -2241,15 +2241,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2260,15 +2260,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2279,19 +2279,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2299,7 +2299,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2581,15 +2581,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2613,15 +2613,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2674,7 +2674,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220614071359_patronage-system.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs index 41161c8f5..b4d85a103 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -264,7 +264,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2268,15 +2268,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2287,15 +2287,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2306,19 +2306,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2326,7 +2326,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2608,15 +2608,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2640,15 +2640,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2701,7 +2701,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220623073903_stondel-db-cache.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220703194348_logwarns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220703194348_logwarns.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220703194348_logwarns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220703194348_logwarns.Designer.cs index c277d88d2..9be16aba7 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220703194348_logwarns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220703194348_logwarns.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -264,7 +264,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2270,15 +2270,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2289,15 +2289,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2308,19 +2308,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2328,7 +2328,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2610,15 +2610,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2642,15 +2642,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2703,7 +2703,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220703194348_logwarns.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220703194348_logwarns.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220703194348_logwarns.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220703194348_logwarns.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs index 8d19646d3..eb6365716 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -264,7 +264,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -290,7 +290,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2300,15 +2300,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2319,15 +2319,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2338,19 +2338,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2358,7 +2358,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2640,15 +2640,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2672,15 +2672,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2733,7 +2733,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220725112348_xpitemshop.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs index 0df0a9cca..e3f36ab13 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220727005807_linkonly-channels.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -177,7 +177,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -211,7 +211,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -238,7 +238,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -264,7 +264,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -290,7 +290,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2303,15 +2303,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2322,15 +2322,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2341,19 +2341,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2361,7 +2361,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2643,15 +2643,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2675,15 +2675,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2736,7 +2736,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220727005807_linkonly-channels.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220727005807_linkonly-channels.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220727005807_linkonly-channels.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220727005807_linkonly-channels.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs index 07df5560c..fff3829a0 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -167,7 +167,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -201,7 +201,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -228,7 +228,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -254,7 +254,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -280,7 +280,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2288,15 +2288,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2307,15 +2307,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2326,19 +2326,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2346,7 +2346,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2628,15 +2628,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2660,15 +2660,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2721,7 +2721,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220831142504_banprune.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220831142504_banprune.Designer.cs index 9ecdf5709..be96a5b2c 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220831142504_banprune.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -167,7 +167,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -201,7 +201,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -228,7 +228,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -254,7 +254,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -280,7 +280,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2291,15 +2291,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2310,15 +2310,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2329,19 +2329,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2349,7 +2349,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2631,15 +2631,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2663,15 +2663,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2724,7 +2724,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220831142504_banprune.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220831142504_banprune.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs index 5efa7f13a..e55fe258d 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -57,7 +57,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -72,7 +72,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -167,7 +167,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -201,7 +201,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -228,7 +228,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -254,7 +254,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -280,7 +280,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2294,15 +2294,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2313,15 +2313,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2332,19 +2332,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2352,7 +2352,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2634,15 +2634,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2666,15 +2666,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2727,7 +2727,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220913190532_shop-role-req.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220913190532_shop-role-req.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.Designer.cs index 5a0ba3d39..f4464e495 100644 --- a/src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel"); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -65,7 +65,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -80,7 +80,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -95,7 +95,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,7 +224,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -251,7 +251,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -303,7 +303,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2317,15 +2317,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2336,15 +2336,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2355,19 +2355,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2375,7 +2375,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2657,15 +2657,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2689,15 +2689,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2750,7 +2750,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20220916191702_autopub.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs index a45af3306..c3fb2af24 100644 --- a/src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel"); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -65,7 +65,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -80,7 +80,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -95,7 +95,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,7 +224,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -251,7 +251,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -303,7 +303,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2343,15 +2343,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2362,15 +2362,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2381,19 +2381,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2401,7 +2401,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2683,15 +2683,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2715,15 +2715,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2776,7 +2776,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221003111019_gambling-stats.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs index 51ffa5c5b..e4e64eea9 100644 --- a/src/NadekoBot/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221021192121_toggle-global-expressions.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel"); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -65,7 +65,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -80,7 +80,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -95,7 +95,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,7 +224,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -251,7 +251,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -303,7 +303,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2346,15 +2346,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2365,15 +2365,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2384,19 +2384,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2404,7 +2404,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2686,15 +2686,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2718,15 +2718,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2779,7 +2779,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20221021192121_toggle-global-expressions.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221021192121_toggle-global-expressions.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20221021192121_toggle-global-expressions.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221021192121_toggle-global-expressions.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221118195152_log-thread.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221118195152_log-thread.Designer.cs index d31da8a8f..8216fe43a 100644 --- a/src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221118195152_log-thread.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel"); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -65,7 +65,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -80,7 +80,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -95,7 +95,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,7 +224,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -251,7 +251,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -303,7 +303,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2352,15 +2352,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2371,15 +2371,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2390,19 +2390,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2410,7 +2410,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2692,15 +2692,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2724,15 +2724,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2785,7 +2785,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221118195152_log-thread.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221118195152_log-thread.cs diff --git a/src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.Designer.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221122204324_feed-text.Designer.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.Designer.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221122204324_feed-text.Designer.cs index 2a0192063..7b801fd5b 100644 --- a/src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.Designer.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221122204324_feed-text.Designer.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -42,7 +42,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel"); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -65,7 +65,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -80,7 +80,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -95,7 +95,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,7 +224,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -251,7 +251,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas"); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -277,7 +277,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons"); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -303,7 +303,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages"); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2355,15 +2355,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2374,15 +2374,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2393,19 +2393,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2413,7 +2413,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2695,15 +2695,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2727,15 +2727,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2788,7 +2788,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/20221122204324_feed-text.cs similarity index 100% rename from src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/20221122204324_feed-text.cs diff --git a/src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs b/src/Nadeko.Bot.Db/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs similarity index 97% rename from src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs rename to src/Nadeko.Bot.Db/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs index 9ea7a20d2..fd91599f8 100644 --- a/src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs +++ b/src/Nadeko.Bot.Db/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace NadekoBot.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.7"); - modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.AutoPublishChannel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -40,7 +40,7 @@ namespace NadekoBot.Migrations b.ToTable("AutoPublishChannel", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.BankUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -63,7 +63,7 @@ namespace NadekoBot.Migrations b.ToTable("BankUsers", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -78,7 +78,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubApplicants", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { b.Property("ClubId") .HasColumnType("INTEGER"); @@ -93,7 +93,7 @@ namespace NadekoBot.Migrations b.ToTable("ClubBans", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -129,7 +129,7 @@ namespace NadekoBot.Migrations b.ToTable("Clubs", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -188,7 +188,7 @@ namespace NadekoBot.Migrations b.ToTable("DiscordUser", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -222,7 +222,7 @@ namespace NadekoBot.Migrations b.ToTable("FollowedStream", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronQuota", b => { b.Property("UserId") .HasColumnType("INTEGER"); @@ -249,7 +249,7 @@ namespace NadekoBot.Migrations b.ToTable("PatronQuotas", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.PatronUser", b => { b.Property("UserId") .ValueGeneratedOnAdd() @@ -275,7 +275,7 @@ namespace NadekoBot.Migrations b.ToTable("Patrons", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.StreamOnlineMessage", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -301,7 +301,7 @@ namespace NadekoBot.Migrations b.ToTable("StreamOnlineMessages", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.XpShopOwnedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -2353,15 +2353,15 @@ namespace NadekoBot.Migrations b.ToTable("XpSettings", (string)null); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubApplicants", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Applicants") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2372,15 +2372,15 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubBans", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Bans") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2391,19 +2391,19 @@ namespace NadekoBot.Migrations b.Navigation("User"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Owner") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Owner") .WithOne() - .HasForeignKey("NadekoBot.Db.Models.ClubInfo", "OwnerId") + .HasForeignKey("Nadeko.Bot.Db.Models.ClubInfo", "OwnerId") .OnDelete(DeleteBehavior.SetNull); b.Navigation("Owner"); }); - modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.DiscordUser", b => { - b.HasOne("NadekoBot.Db.Models.ClubInfo", "Club") + b.HasOne("Nadeko.Bot.Db.Models.ClubInfo", "Club") .WithMany("Members") .HasForeignKey("ClubId") .OnDelete(DeleteBehavior.NoAction); @@ -2411,7 +2411,7 @@ namespace NadekoBot.Migrations b.Navigation("Club"); }); - modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.FollowedStream", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null) .WithMany("FollowedStreams") @@ -2693,15 +2693,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Affinity") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Affinity") .WithMany() .HasForeignKey("AffinityId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Claimer") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Claimer") .WithMany() .HasForeignKey("ClaimerId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Waifu") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Waifu") .WithOne() .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") .OnDelete(DeleteBehavior.Cascade) @@ -2725,15 +2725,15 @@ namespace NadekoBot.Migrations modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => { - b.HasOne("NadekoBot.Db.Models.DiscordUser", "New") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "New") .WithMany() .HasForeignKey("NewId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "Old") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "Old") .WithMany() .HasForeignKey("OldId"); - b.HasOne("NadekoBot.Db.Models.DiscordUser", "User") + b.HasOne("Nadeko.Bot.Db.Models.DiscordUser", "User") .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -2786,7 +2786,7 @@ namespace NadekoBot.Migrations b.Navigation("GuildConfig"); }); - modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b => + modelBuilder.Entity("Nadeko.Bot.Db.Models.ClubInfo", b => { b.Navigation("Applicants"); diff --git a/src/NadekoBot/Db/Models/AntiProtection.cs b/src/Nadeko.Bot.Db/Models/AntiProtection.cs similarity index 98% rename from src/NadekoBot/Db/Models/AntiProtection.cs rename to src/Nadeko.Bot.Db/Models/AntiProtection.cs index 26024be6f..08c487d2c 100644 --- a/src/NadekoBot/Db/Models/AntiProtection.cs +++ b/src/Nadeko.Bot.Db/Models/AntiProtection.cs @@ -1,6 +1,8 @@ #nullable disable namespace NadekoBot.Services.Database.Models; + +// todo db required, nullable? public class AntiRaidSetting : DbEntity { public int GuildConfigId { get; set; } diff --git a/src/NadekoBot/Db/Models/AutoCommand.cs b/src/Nadeko.Bot.Db/Models/AutoCommand.cs similarity index 100% rename from src/NadekoBot/Db/Models/AutoCommand.cs rename to src/Nadeko.Bot.Db/Models/AutoCommand.cs diff --git a/src/NadekoBot/Db/Models/AutoPublishChannel.cs b/src/Nadeko.Bot.Db/Models/AutoPublishChannel.cs similarity index 100% rename from src/NadekoBot/Db/Models/AutoPublishChannel.cs rename to src/Nadeko.Bot.Db/Models/AutoPublishChannel.cs diff --git a/src/NadekoBot/Db/Models/AutoTranslateChannel.cs b/src/Nadeko.Bot.Db/Models/AutoTranslateChannel.cs similarity index 100% rename from src/NadekoBot/Db/Models/AutoTranslateChannel.cs rename to src/Nadeko.Bot.Db/Models/AutoTranslateChannel.cs diff --git a/src/NadekoBot/Db/Models/AutoTranslateUser.cs b/src/Nadeko.Bot.Db/Models/AutoTranslateUser.cs similarity index 100% rename from src/NadekoBot/Db/Models/AutoTranslateUser.cs rename to src/Nadeko.Bot.Db/Models/AutoTranslateUser.cs diff --git a/src/NadekoBot/Db/Models/BanTemplate.cs b/src/Nadeko.Bot.Db/Models/BanTemplate.cs similarity index 100% rename from src/NadekoBot/Db/Models/BanTemplate.cs rename to src/Nadeko.Bot.Db/Models/BanTemplate.cs diff --git a/src/NadekoBot/Db/Models/BankUser.cs b/src/Nadeko.Bot.Db/Models/BankUser.cs similarity index 100% rename from src/NadekoBot/Db/Models/BankUser.cs rename to src/Nadeko.Bot.Db/Models/BankUser.cs diff --git a/src/NadekoBot/Db/Models/BlacklistEntry.cs b/src/Nadeko.Bot.Db/Models/BlacklistEntry.cs similarity index 100% rename from src/NadekoBot/Db/Models/BlacklistEntry.cs rename to src/Nadeko.Bot.Db/Models/BlacklistEntry.cs diff --git a/src/NadekoBot/Db/Models/ClubInfo.cs b/src/Nadeko.Bot.Db/Models/ClubInfo.cs similarity index 100% rename from src/NadekoBot/Db/Models/ClubInfo.cs rename to src/Nadeko.Bot.Db/Models/ClubInfo.cs diff --git a/src/NadekoBot/Db/Models/CommandAlias.cs b/src/Nadeko.Bot.Db/Models/CommandAlias.cs similarity index 100% rename from src/NadekoBot/Db/Models/CommandAlias.cs rename to src/Nadeko.Bot.Db/Models/CommandAlias.cs diff --git a/src/NadekoBot/Db/Models/CommandCooldown.cs b/src/Nadeko.Bot.Db/Models/CommandCooldown.cs similarity index 100% rename from src/NadekoBot/Db/Models/CommandCooldown.cs rename to src/Nadeko.Bot.Db/Models/CommandCooldown.cs diff --git a/src/NadekoBot/Db/Models/CurrencyTransaction.cs b/src/Nadeko.Bot.Db/Models/CurrencyTransaction.cs similarity index 100% rename from src/NadekoBot/Db/Models/CurrencyTransaction.cs rename to src/Nadeko.Bot.Db/Models/CurrencyTransaction.cs diff --git a/src/NadekoBot/Db/Models/DbEntity.cs b/src/Nadeko.Bot.Db/Models/DbEntity.cs similarity index 100% rename from src/NadekoBot/Db/Models/DbEntity.cs rename to src/Nadeko.Bot.Db/Models/DbEntity.cs diff --git a/src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs b/src/Nadeko.Bot.Db/Models/DelMsgOnCmdChannel.cs similarity index 100% rename from src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs rename to src/Nadeko.Bot.Db/Models/DelMsgOnCmdChannel.cs diff --git a/src/NadekoBot/Db/Models/DiscordPemOverride.cs b/src/Nadeko.Bot.Db/Models/DiscordPemOverride.cs similarity index 91% rename from src/NadekoBot/Db/Models/DiscordPemOverride.cs rename to src/Nadeko.Bot.Db/Models/DiscordPemOverride.cs index c3d2ba404..3a5caf48d 100644 --- a/src/NadekoBot/Db/Models/DiscordPemOverride.cs +++ b/src/Nadeko.Bot.Db/Models/DiscordPemOverride.cs @@ -1,4 +1,6 @@ #nullable disable +using Nadeko.Bot.Db; + namespace NadekoBot.Services.Database.Models; public class DiscordPermOverride : DbEntity diff --git a/src/NadekoBot/Db/Models/DiscordUser.cs b/src/Nadeko.Bot.Db/Models/DiscordUser.cs similarity index 100% rename from src/NadekoBot/Db/Models/DiscordUser.cs rename to src/Nadeko.Bot.Db/Models/DiscordUser.cs diff --git a/src/NadekoBot/Db/Models/Event.cs b/src/Nadeko.Bot.Db/Models/Event.cs similarity index 100% rename from src/NadekoBot/Db/Models/Event.cs rename to src/Nadeko.Bot.Db/Models/Event.cs diff --git a/src/NadekoBot/Db/Models/FeedSub.cs b/src/Nadeko.Bot.Db/Models/FeedSub.cs similarity index 100% rename from src/NadekoBot/Db/Models/FeedSub.cs rename to src/Nadeko.Bot.Db/Models/FeedSub.cs diff --git a/src/NadekoBot/Db/Models/FilterChannelId.cs b/src/Nadeko.Bot.Db/Models/FilterChannelId.cs similarity index 100% rename from src/NadekoBot/Db/Models/FilterChannelId.cs rename to src/Nadeko.Bot.Db/Models/FilterChannelId.cs diff --git a/src/NadekoBot/Db/Models/FilterLinksChannelId.cs b/src/Nadeko.Bot.Db/Models/FilterLinksChannelId.cs similarity index 100% rename from src/NadekoBot/Db/Models/FilterLinksChannelId.cs rename to src/Nadeko.Bot.Db/Models/FilterLinksChannelId.cs diff --git a/src/NadekoBot/Db/Models/FilteredWord.cs b/src/Nadeko.Bot.Db/Models/FilteredWord.cs similarity index 100% rename from src/NadekoBot/Db/Models/FilteredWord.cs rename to src/Nadeko.Bot.Db/Models/FilteredWord.cs diff --git a/src/NadekoBot/Db/Models/FollowedStream.cs b/src/Nadeko.Bot.Db/Models/FollowedStream.cs similarity index 88% rename from src/NadekoBot/Db/Models/FollowedStream.cs rename to src/Nadeko.Bot.Db/Models/FollowedStream.cs index 58e2f9472..ea4e40b47 100644 --- a/src/NadekoBot/Db/Models/FollowedStream.cs +++ b/src/Nadeko.Bot.Db/Models/FollowedStream.cs @@ -1,5 +1,4 @@ #nullable disable -using NadekoBot.Modules.Searches.Common; using NadekoBot.Services.Database.Models; namespace NadekoBot.Db.Models; @@ -32,6 +31,5 @@ public class FollowedStream : DbEntity public override bool Equals(object obj) => obj is FollowedStream fs && Equals(fs); - public StreamDataKey CreateKey() - => new(Type, Username.ToLower()); + } \ No newline at end of file diff --git a/src/NadekoBot/Db/Models/GCChannelId.cs b/src/Nadeko.Bot.Db/Models/GCChannelId.cs similarity index 100% rename from src/NadekoBot/Db/Models/GCChannelId.cs rename to src/Nadeko.Bot.Db/Models/GCChannelId.cs diff --git a/src/NadekoBot/Db/Models/GamblingStats.cs b/src/Nadeko.Bot.Db/Models/GamblingStats.cs similarity index 100% rename from src/NadekoBot/Db/Models/GamblingStats.cs rename to src/Nadeko.Bot.Db/Models/GamblingStats.cs diff --git a/src/NadekoBot/Db/Models/GroupName.cs b/src/Nadeko.Bot.Db/Models/GroupName.cs similarity index 100% rename from src/NadekoBot/Db/Models/GroupName.cs rename to src/Nadeko.Bot.Db/Models/GroupName.cs diff --git a/src/NadekoBot/Db/Models/GuildConfig.cs b/src/Nadeko.Bot.Db/Models/GuildConfig.cs similarity index 100% rename from src/NadekoBot/Db/Models/GuildConfig.cs rename to src/Nadeko.Bot.Db/Models/GuildConfig.cs diff --git a/src/NadekoBot/Db/Models/IgnoredLogItem.cs b/src/Nadeko.Bot.Db/Models/IgnoredLogItem.cs similarity index 100% rename from src/NadekoBot/Db/Models/IgnoredLogItem.cs rename to src/Nadeko.Bot.Db/Models/IgnoredLogItem.cs diff --git a/src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs b/src/Nadeko.Bot.Db/Models/IgnoredVoicePresenceChannel.cs similarity index 100% rename from src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs rename to src/Nadeko.Bot.Db/Models/IgnoredVoicePresenceChannel.cs diff --git a/src/NadekoBot/Db/Models/ImageOnlyChannel.cs b/src/Nadeko.Bot.Db/Models/ImageOnlyChannel.cs similarity index 100% rename from src/NadekoBot/Db/Models/ImageOnlyChannel.cs rename to src/Nadeko.Bot.Db/Models/ImageOnlyChannel.cs diff --git a/src/NadekoBot/Db/Models/LogSetting.cs b/src/Nadeko.Bot.Db/Models/LogSetting.cs similarity index 100% rename from src/NadekoBot/Db/Models/LogSetting.cs rename to src/Nadeko.Bot.Db/Models/LogSetting.cs diff --git a/src/NadekoBot/Db/Models/MusicPlaylist.cs b/src/Nadeko.Bot.Db/Models/MusicPlaylist.cs similarity index 100% rename from src/NadekoBot/Db/Models/MusicPlaylist.cs rename to src/Nadeko.Bot.Db/Models/MusicPlaylist.cs diff --git a/src/NadekoBot/Db/Models/MusicSettings.cs b/src/Nadeko.Bot.Db/Models/MusicSettings.cs similarity index 100% rename from src/NadekoBot/Db/Models/MusicSettings.cs rename to src/Nadeko.Bot.Db/Models/MusicSettings.cs diff --git a/src/NadekoBot/Db/Models/MutedUserId.cs b/src/Nadeko.Bot.Db/Models/MutedUserId.cs similarity index 100% rename from src/NadekoBot/Db/Models/MutedUserId.cs rename to src/Nadeko.Bot.Db/Models/MutedUserId.cs diff --git a/src/NadekoBot/Db/Models/NadekoExpression.cs b/src/Nadeko.Bot.Db/Models/NadekoExpression.cs similarity index 100% rename from src/NadekoBot/Db/Models/NadekoExpression.cs rename to src/Nadeko.Bot.Db/Models/NadekoExpression.cs diff --git a/src/NadekoBot/Db/Models/NsfwBlacklistedTag.cs b/src/Nadeko.Bot.Db/Models/NsfwBlacklistedTag.cs similarity index 100% rename from src/NadekoBot/Db/Models/NsfwBlacklistedTag.cs rename to src/Nadeko.Bot.Db/Models/NsfwBlacklistedTag.cs diff --git a/src/NadekoBot/Db/Models/PatronQuota.cs b/src/Nadeko.Bot.Db/Models/PatronQuota.cs similarity index 100% rename from src/NadekoBot/Db/Models/PatronQuota.cs rename to src/Nadeko.Bot.Db/Models/PatronQuota.cs diff --git a/src/NadekoBot/Db/Models/Permission.cs b/src/Nadeko.Bot.Db/Models/Permission.cs similarity index 98% rename from src/NadekoBot/Db/Models/Permission.cs rename to src/Nadeko.Bot.Db/Models/Permission.cs index 05fa4b727..66b12aad6 100644 --- a/src/NadekoBot/Db/Models/Permission.cs +++ b/src/Nadeko.Bot.Db/Models/Permission.cs @@ -1,6 +1,7 @@ #nullable disable using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics; +using Nadeko.Common; namespace NadekoBot.Services.Database.Models; diff --git a/src/NadekoBot/Db/Models/PlantedCurrency.cs b/src/Nadeko.Bot.Db/Models/PlantedCurrency.cs similarity index 100% rename from src/NadekoBot/Db/Models/PlantedCurrency.cs rename to src/Nadeko.Bot.Db/Models/PlantedCurrency.cs diff --git a/src/NadekoBot/Db/Models/PlaylistSong.cs b/src/Nadeko.Bot.Db/Models/PlaylistSong.cs similarity index 100% rename from src/NadekoBot/Db/Models/PlaylistSong.cs rename to src/Nadeko.Bot.Db/Models/PlaylistSong.cs diff --git a/src/NadekoBot/Db/Models/Poll.cs b/src/Nadeko.Bot.Db/Models/Poll.cs similarity index 95% rename from src/NadekoBot/Db/Models/Poll.cs rename to src/Nadeko.Bot.Db/Models/Poll.cs index 6649217f6..75ec95cc5 100644 --- a/src/NadekoBot/Db/Models/Poll.cs +++ b/src/Nadeko.Bot.Db/Models/Poll.cs @@ -1,4 +1,6 @@ #nullable disable +using Nadeko.Common; + namespace NadekoBot.Services.Database.Models; public class Poll : DbEntity diff --git a/src/NadekoBot/Db/Models/PollVote.cs b/src/Nadeko.Bot.Db/Models/PollVote.cs similarity index 100% rename from src/NadekoBot/Db/Models/PollVote.cs rename to src/Nadeko.Bot.Db/Models/PollVote.cs diff --git a/src/NadekoBot/Db/Models/Quote.cs b/src/Nadeko.Bot.Db/Models/Quote.cs similarity index 100% rename from src/NadekoBot/Db/Models/Quote.cs rename to src/Nadeko.Bot.Db/Models/Quote.cs diff --git a/src/NadekoBot/Db/Models/ReactionRole.cs b/src/Nadeko.Bot.Db/Models/ReactionRole.cs similarity index 100% rename from src/NadekoBot/Db/Models/ReactionRole.cs rename to src/Nadeko.Bot.Db/Models/ReactionRole.cs diff --git a/src/NadekoBot/Db/Models/Reminder.cs b/src/Nadeko.Bot.Db/Models/Reminder.cs similarity index 100% rename from src/NadekoBot/Db/Models/Reminder.cs rename to src/Nadeko.Bot.Db/Models/Reminder.cs diff --git a/src/NadekoBot/Db/Models/Repeater.cs b/src/Nadeko.Bot.Db/Models/Repeater.cs similarity index 100% rename from src/NadekoBot/Db/Models/Repeater.cs rename to src/Nadeko.Bot.Db/Models/Repeater.cs diff --git a/src/NadekoBot/Db/Models/RewardedUser.cs b/src/Nadeko.Bot.Db/Models/RewardedUser.cs similarity index 100% rename from src/NadekoBot/Db/Models/RewardedUser.cs rename to src/Nadeko.Bot.Db/Models/RewardedUser.cs diff --git a/src/NadekoBot/Db/Models/RotatingPlayingStatus.cs b/src/Nadeko.Bot.Db/Models/RotatingPlayingStatus.cs similarity index 89% rename from src/NadekoBot/Db/Models/RotatingPlayingStatus.cs rename to src/Nadeko.Bot.Db/Models/RotatingPlayingStatus.cs index 7350e5961..db09d3753 100644 --- a/src/NadekoBot/Db/Models/RotatingPlayingStatus.cs +++ b/src/Nadeko.Bot.Db/Models/RotatingPlayingStatus.cs @@ -1,4 +1,6 @@ #nullable disable +using Nadeko.Bot.Db; + namespace NadekoBot.Services.Database.Models; public class RotatingPlayingStatus : DbEntity diff --git a/src/NadekoBot/Db/Models/SelfAssignableRole.cs b/src/Nadeko.Bot.Db/Models/SelfAssignableRole.cs similarity index 100% rename from src/NadekoBot/Db/Models/SelfAssignableRole.cs rename to src/Nadeko.Bot.Db/Models/SelfAssignableRole.cs diff --git a/src/NadekoBot/Db/Models/ShopEntry.cs b/src/Nadeko.Bot.Db/Models/ShopEntry.cs similarity index 97% rename from src/NadekoBot/Db/Models/ShopEntry.cs rename to src/Nadeko.Bot.Db/Models/ShopEntry.cs index 519456c77..dc228a009 100644 --- a/src/NadekoBot/Db/Models/ShopEntry.cs +++ b/src/Nadeko.Bot.Db/Models/ShopEntry.cs @@ -1,4 +1,6 @@ #nullable disable +using Nadeko.Common; + namespace NadekoBot.Services.Database.Models; public enum ShopEntryType diff --git a/src/NadekoBot/Db/Models/SlowmodeIgnoredRole.cs b/src/Nadeko.Bot.Db/Models/SlowmodeIgnoredRole.cs similarity index 100% rename from src/NadekoBot/Db/Models/SlowmodeIgnoredRole.cs rename to src/Nadeko.Bot.Db/Models/SlowmodeIgnoredRole.cs diff --git a/src/NadekoBot/Db/Models/SlowmodeIgnoredUser.cs b/src/Nadeko.Bot.Db/Models/SlowmodeIgnoredUser.cs similarity index 100% rename from src/NadekoBot/Db/Models/SlowmodeIgnoredUser.cs rename to src/Nadeko.Bot.Db/Models/SlowmodeIgnoredUser.cs diff --git a/src/NadekoBot/Db/Models/StreamOnlineMessage.cs b/src/Nadeko.Bot.Db/Models/StreamOnlineMessage.cs similarity index 100% rename from src/NadekoBot/Db/Models/StreamOnlineMessage.cs rename to src/Nadeko.Bot.Db/Models/StreamOnlineMessage.cs diff --git a/src/NadekoBot/Db/Models/StreamRoleSettings.cs b/src/Nadeko.Bot.Db/Models/StreamRoleSettings.cs similarity index 100% rename from src/NadekoBot/Db/Models/StreamRoleSettings.cs rename to src/Nadeko.Bot.Db/Models/StreamRoleSettings.cs diff --git a/src/NadekoBot/Db/Models/UnbanTimer.cs b/src/Nadeko.Bot.Db/Models/UnbanTimer.cs similarity index 100% rename from src/NadekoBot/Db/Models/UnbanTimer.cs rename to src/Nadeko.Bot.Db/Models/UnbanTimer.cs diff --git a/src/NadekoBot/Db/Models/UnmuteTimer.cs b/src/Nadeko.Bot.Db/Models/UnmuteTimer.cs similarity index 100% rename from src/NadekoBot/Db/Models/UnmuteTimer.cs rename to src/Nadeko.Bot.Db/Models/UnmuteTimer.cs diff --git a/src/NadekoBot/Db/Models/UnroleTimer.cs b/src/Nadeko.Bot.Db/Models/UnroleTimer.cs similarity index 100% rename from src/NadekoBot/Db/Models/UnroleTimer.cs rename to src/Nadeko.Bot.Db/Models/UnroleTimer.cs diff --git a/src/NadekoBot/Db/Models/UserXpStats.cs b/src/Nadeko.Bot.Db/Models/UserXpStats.cs similarity index 100% rename from src/NadekoBot/Db/Models/UserXpStats.cs rename to src/Nadeko.Bot.Db/Models/UserXpStats.cs diff --git a/src/NadekoBot/Db/Models/VcRoleInfo.cs b/src/Nadeko.Bot.Db/Models/VcRoleInfo.cs similarity index 100% rename from src/NadekoBot/Db/Models/VcRoleInfo.cs rename to src/Nadeko.Bot.Db/Models/VcRoleInfo.cs diff --git a/src/Nadeko.Bot.Db/Models/Waifu.cs b/src/Nadeko.Bot.Db/Models/Waifu.cs new file mode 100644 index 000000000..0705f7992 --- /dev/null +++ b/src/Nadeko.Bot.Db/Models/Waifu.cs @@ -0,0 +1,33 @@ +#nullable disable +using NadekoBot.Db.Models; + +namespace NadekoBot.Services.Database.Models; + +public class WaifuInfo : DbEntity +{ + public int WaifuId { get; set; } + public DiscordUser Waifu { get; set; } + + public int? ClaimerId { get; set; } + public DiscordUser Claimer { get; set; } + + public int? AffinityId { get; set; } + public DiscordUser Affinity { get; set; } + + public long Price { get; set; } + public List Items { get; set; } = new(); +} + +public class WaifuLbResult +{ + public string Username { get; set; } + public string Discrim { get; set; } + + public string Claimer { get; set; } + public string ClaimerDiscrim { get; set; } + + public string Affinity { get; set; } + public string AffinityDiscrim { get; set; } + + public long Price { get; set; } +} \ No newline at end of file diff --git a/src/NadekoBot/Db/Models/WaifuItem.cs b/src/Nadeko.Bot.Db/Models/WaifuItem.cs similarity index 100% rename from src/NadekoBot/Db/Models/WaifuItem.cs rename to src/Nadeko.Bot.Db/Models/WaifuItem.cs diff --git a/src/NadekoBot/Db/Models/WaifuUpdate.cs b/src/Nadeko.Bot.Db/Models/WaifuUpdate.cs similarity index 100% rename from src/NadekoBot/Db/Models/WaifuUpdate.cs rename to src/Nadeko.Bot.Db/Models/WaifuUpdate.cs diff --git a/src/NadekoBot/Db/Models/WarnExpireAction.cs b/src/Nadeko.Bot.Db/Models/WarnExpireAction.cs similarity index 100% rename from src/NadekoBot/Db/Models/WarnExpireAction.cs rename to src/Nadeko.Bot.Db/Models/WarnExpireAction.cs diff --git a/src/NadekoBot/Db/Models/Warning.cs b/src/Nadeko.Bot.Db/Models/Warning.cs similarity index 100% rename from src/NadekoBot/Db/Models/Warning.cs rename to src/Nadeko.Bot.Db/Models/Warning.cs diff --git a/src/NadekoBot/Db/Models/WarningPunishment.cs b/src/Nadeko.Bot.Db/Models/WarningPunishment.cs similarity index 100% rename from src/NadekoBot/Db/Models/WarningPunishment.cs rename to src/Nadeko.Bot.Db/Models/WarningPunishment.cs diff --git a/src/NadekoBot/Db/Models/XpSettings.cs b/src/Nadeko.Bot.Db/Models/XpSettings.cs similarity index 100% rename from src/NadekoBot/Db/Models/XpSettings.cs rename to src/Nadeko.Bot.Db/Models/XpSettings.cs diff --git a/src/NadekoBot/Db/Models/XpShopOwnedItem.cs b/src/Nadeko.Bot.Db/Models/XpShopOwnedItem.cs similarity index 100% rename from src/NadekoBot/Db/Models/XpShopOwnedItem.cs rename to src/Nadeko.Bot.Db/Models/XpShopOwnedItem.cs diff --git a/src/NadekoBot/Db/MysqlContext.cs b/src/Nadeko.Bot.Db/MysqlContext.cs similarity index 100% rename from src/NadekoBot/Db/MysqlContext.cs rename to src/Nadeko.Bot.Db/MysqlContext.cs diff --git a/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj b/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj new file mode 100644 index 000000000..6eac7839f --- /dev/null +++ b/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj @@ -0,0 +1,36 @@ + + + + net7.0 + enable + enable + NadekoBot.Db + false + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + diff --git a/src/NadekoBot/Db/NadekoContext.cs b/src/Nadeko.Bot.Db/NadekoContext.cs similarity index 100% rename from src/NadekoBot/Db/NadekoContext.cs rename to src/Nadeko.Bot.Db/NadekoContext.cs diff --git a/src/NadekoBot/Db/PostgreSqlContext.cs b/src/Nadeko.Bot.Db/PostgreSqlContext.cs similarity index 100% rename from src/NadekoBot/Db/PostgreSqlContext.cs rename to src/Nadeko.Bot.Db/PostgreSqlContext.cs diff --git a/src/NadekoBot/Db/SqliteContext.cs b/src/Nadeko.Bot.Db/SqliteContext.cs similarity index 100% rename from src/NadekoBot/Db/SqliteContext.cs rename to src/Nadeko.Bot.Db/SqliteContext.cs diff --git a/src/Nadeko.Common/Extensions/EnumerableExtensions.cs b/src/Nadeko.Common/Extensions/EnumerableExtensions.cs index e3591d291..08e405386 100644 --- a/src/Nadeko.Common/Extensions/EnumerableExtensions.cs +++ b/src/Nadeko.Common/Extensions/EnumerableExtensions.cs @@ -37,7 +37,9 @@ public static class EnumerableExtensions /// public static string Join(this IEnumerable data, string separator, Func? func = null) => string.Join(separator, data.Select(func ?? (x => x?.ToString() ?? string.Empty))); - + + + // todo have 2 different shuffles /// /// Randomize element order by performing the Fisher-Yates shuffle /// diff --git a/src/NadekoBot/_Extensions/StringExtensions.cs b/src/Nadeko.Common/Extensions/StringExtensions.cs similarity index 97% rename from src/NadekoBot/_Extensions/StringExtensions.cs rename to src/Nadeko.Common/Extensions/StringExtensions.cs index 9721b27f2..c44478893 100644 --- a/src/NadekoBot/_Extensions/StringExtensions.cs +++ b/src/Nadeko.Common/Extensions/StringExtensions.cs @@ -1,7 +1,7 @@ using NadekoBot.Common.Yml; -using Newtonsoft.Json; using System.Text; using System.Text.RegularExpressions; +using Humanizer; using Nadeko.Common; namespace NadekoBot.Extensions; @@ -27,9 +27,6 @@ public static class StringExtensions return str.PadLeft(padLeft, ' ').PadRight(length, ' '); } - public static T? MapJson(this string str) - => JsonConvert.DeserializeObject(str); - public static string StripHtml(this string input) => Regex.Replace(input, "<.*?>", string.Empty); diff --git a/src/Nadeko.Common/Nadeko.Common.csproj b/src/Nadeko.Common/Nadeko.Common.csproj index b15687d62..d6c83a15f 100644 --- a/src/Nadeko.Common/Nadeko.Common.csproj +++ b/src/Nadeko.Common/Nadeko.Common.csproj @@ -7,6 +7,7 @@ + diff --git a/src/NadekoBot/Common/Yml/YamlHelper.cs b/src/Nadeko.Common/YamlHelper.cs similarity index 92% rename from src/NadekoBot/Common/Yml/YamlHelper.cs rename to src/Nadeko.Common/YamlHelper.cs index d1159d801..e1e81b9f0 100644 --- a/src/NadekoBot/Common/Yml/YamlHelper.cs +++ b/src/Nadeko.Common/YamlHelper.cs @@ -1,7 +1,7 @@ #nullable disable namespace NadekoBot.Common.Yml; -public class YamlHelper +public static class YamlHelper { // https://github.com/aaubry/YamlDotNet/blob/0f4cc205e8b2dd8ef6589d96de32bf608a687c6f/YamlDotNet/Core/Scanner.cs#L1687 /// @@ -10,7 +10,7 @@ public class YamlHelper /// /// Unicode code point /// Actual character - public static string UnescapeUnicodeCodePoint(string point) + public static string UnescapeUnicodeCodePoint(this string point) { var character = 0; diff --git a/src/NadekoBot.Generators/LocalizedStringsGenerator.cs b/src/NadekoBot.Generators/LocalizedStringsGenerator.cs index 52d2491bd..4fe5cce09 100644 --- a/src/NadekoBot.Generators/LocalizedStringsGenerator.cs +++ b/src/NadekoBot.Generators/LocalizedStringsGenerator.cs @@ -26,20 +26,20 @@ namespace NadekoBot.Generators [Generator] public class LocalizedStringsGenerator : ISourceGenerator { - private const string LOC_STR_SOURCE = @"namespace NadekoBot -{ - public readonly struct LocStr - { - public readonly string Key; - public readonly object[] Params; - - public LocStr(string key, params object[] data) - { - Key = key; - Params = data; - } - } -}"; +// private const string LOC_STR_SOURCE = @"namespace NadekoBot +// { +// public readonly struct LocStr +// { +// public readonly string Key; +// public readonly object[] Params; +// +// public LocStr(string key, params object[] data) +// { +// Key = key; +// Params = data; +// } +// } +// }"; public void Initialize(GeneratorInitializationContext context) { @@ -106,7 +106,7 @@ namespace NadekoBot.Generators context.AddSource("strs.g.cs", stringWriter.ToString()); } - context.AddSource("LocStr.g.cs", LOC_STR_SOURCE); + // context.AddSource("LocStr.g.cs", LOC_STR_SOURCE); } private List GetFields(string? dataText) diff --git a/src/NadekoBot.Modules.Expresssions/GlobalUsings.cs b/src/NadekoBot.Modules.Expresssions/GlobalUsings.cs new file mode 100644 index 000000000..9f214124f --- /dev/null +++ b/src/NadekoBot.Modules.Expresssions/GlobalUsings.cs @@ -0,0 +1,31 @@ +// // global using System.Collections.Concurrent; +global using NonBlocking; +// +// // packages +// global using Serilog; +// global using Humanizer; +// +// // nadekobot +// global using NadekoBot; +// global using NadekoBot.Services; +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; + +// discord +global using Discord; +global using Discord.Commands; +global using Discord.Net; +global using Discord.WebSocket; + +// aliases +global using GuildPerm = Discord.GuildPermission; +global using ChannelPerm = Discord.ChannelPermission; +// global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute; +// global using LeftoverAttribute = Discord.Commands.RemainderAttribute; +// global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult; + +// non-essential +// global using JetBrains.Annotations; \ No newline at end of file diff --git a/src/NadekoBot.Modules.Expresssions/NadekoBot.Modules.Expresssions.csproj b/src/NadekoBot.Modules.Expresssions/NadekoBot.Modules.Expresssions.csproj index 6836c6808..aaa592d84 100644 --- a/src/NadekoBot.Modules.Expresssions/NadekoBot.Modules.Expresssions.csproj +++ b/src/NadekoBot.Modules.Expresssions/NadekoBot.Modules.Expresssions.csproj @@ -6,4 +6,15 @@ enable + + + + + + + + + + + diff --git a/src/NadekoBot.Modules.Expresssions/NadekoExpressionExtensions.cs b/src/NadekoBot.Modules.Expresssions/NadekoExpressionExtensions.cs index 856733206..c944a89b5 100644 --- a/src/NadekoBot.Modules.Expresssions/NadekoExpressionExtensions.cs +++ b/src/NadekoBot.Modules.Expresssions/NadekoExpressionExtensions.cs @@ -1,6 +1,7 @@ #nullable disable using NadekoBot.Services.Database.Models; using System.Runtime.CompilerServices; +using NadekoBot.Extensions; namespace NadekoBot.Modules.NadekoExpressions; diff --git a/src/NadekoBot.Modules.Expresssions/NadekoExpressionsService.cs b/src/NadekoBot.Modules.Expresssions/NadekoExpressionsService.cs index 2101e6a3c..21683c562 100644 --- a/src/NadekoBot.Modules.Expresssions/NadekoExpressionsService.cs +++ b/src/NadekoBot.Modules.Expresssions/NadekoExpressionsService.cs @@ -9,6 +9,7 @@ using NadekoBot.Services.Database.Models; using System.Runtime.CompilerServices; using LinqToDB.EntityFrameworkCore; using Nadeko.Common; +using Serilog; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; diff --git a/src/NadekoBot.Tests/BotStringsTests.cs b/src/NadekoBot.Tests/BotStringsTests.cs index b9b39cab6..ce98cc989 100644 --- a/src/NadekoBot.Tests/BotStringsTests.cs +++ b/src/NadekoBot.Tests/BotStringsTests.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Reflection; using Discord.Commands; +using NadekoBot.Common; using NadekoBot.Common.Attributes; using NadekoBot.Services; using NadekoBot.Modules; diff --git a/src/NadekoBot/Common/Creds.cs b/src/NadekoBot/Common/Creds.cs index 8c8056694..00955513b 100644 --- a/src/NadekoBot/Common/Creds.cs +++ b/src/NadekoBot/Common/Creds.cs @@ -47,16 +47,16 @@ public sealed class Creds : IBotCredentials Do all steps again but enable image search for the ImageSearchId """)] - public GoogleApiConfig Google { get; set; } + public IGoogleApiConfig Google { get; set; } [Comment("""Settings for voting system for discordbots. Meant for use on global Nadeko.""")] - public VotesSettings Votes { get; set; } + public IVotesSettings Votes { get; set; } [Comment(""" Patreon auto reward system settings. go to https://www.patreon.com/portal -> my clients -> create client """)] - public PatreonSettings Patreon { get; set; } + public IPatreonSettings Patreon { get; set; } [Comment("""Api key for sending stats to DiscordBotList.""")] public string BotListToken { get; set; } @@ -81,7 +81,7 @@ public sealed class Creds : IBotCredentials public string RedisOptions { get; set; } [Comment("""Database options. Don't change if you don't know what you're doing. Leave null for default values""")] - public DbOptions Db { get; set; } + public IDbOptions Db { get; set; } [Comment(""" Address and port of the coordinator endpoint. Leave empty for default. @@ -143,7 +143,7 @@ public sealed class Creds : IBotCredentials cmd: NadekoBot.exe args: "{0}" """)] - public RestartConfig RestartCommand { get; set; } + public IRestartConfig RestartCommand { get; set; } public Creds() { @@ -153,14 +153,14 @@ public sealed class Creds : IBotCredentials OwnerIds = new List(); TotalShards = 1; GoogleApiKey = string.Empty; - Votes = new(string.Empty, string.Empty, string.Empty, string.Empty); - Patreon = new(string.Empty, string.Empty, string.Empty, string.Empty); + Votes = new VotesSettings(string.Empty, string.Empty, string.Empty, string.Empty); + Patreon = new PatreonSettings(string.Empty, string.Empty, string.Empty, string.Empty); BotListToken = string.Empty; CleverbotApiKey = string.Empty; Gpt3ApiKey = string.Empty; BotCache = BotCacheImplemenation.Memory; RedisOptions = "localhost:6379,syncTimeout=30000,responseTimeout=30000,allowAdmin=true,password="; - Db = new() + Db = new DbOptions() { Type = "sqlite", ConnectionString = "Data Source=data/NadekoBot.db" @@ -168,12 +168,12 @@ public sealed class Creds : IBotCredentials CoordinatorUrl = "http://localhost:3442"; - RestartCommand = new(); - Google = new(); + RestartCommand = new RestartConfig(); + Google = new GoogleApiConfig(); } - - + public class DbOptions + : IDbOptions { [Comment(""" Database type. "sqlite", "mysql" and "postgresql" are supported. @@ -191,7 +191,7 @@ public sealed class Creds : IBotCredentials public string ConnectionString { get; set; } } - public sealed record PatreonSettings + public sealed record PatreonSettings : IPatreonSettings { public string ClientId { get; set; } public string AccessToken { get; set; } @@ -219,7 +219,7 @@ public sealed class Creds : IBotCredentials } } - public sealed record VotesSettings + public sealed record VotesSettings : IVotesSettings { [Comment(""" top.gg votes service url @@ -265,14 +265,11 @@ public sealed class Creds : IBotCredentials } } -public class GoogleApiConfig +public class GoogleApiConfig : IGoogleApiConfig { public string SearchId { get; init; } public string ImageSearchId { get; init; } } -public enum BotCacheImplemenation -{ - Memory, - Redis -} \ No newline at end of file + + diff --git a/src/NadekoBot/Common/IBotCredentials.cs b/src/NadekoBot/Common/IBotCredentials.cs deleted file mode 100644 index a106deab6..000000000 --- a/src/NadekoBot/Common/IBotCredentials.cs +++ /dev/null @@ -1,37 +0,0 @@ -#nullable disable -namespace NadekoBot; - -public interface IBotCredentials -{ - string Token { get; } - string GoogleApiKey { get; } - ICollection OwnerIds { get; } - bool UsePrivilegedIntents { get; } - string RapidApiKey { get; } - - Creds.DbOptions Db { get; } - string OsuApiKey { get; } - int TotalShards { get; } - Creds.PatreonSettings Patreon { get; } - string CleverbotApiKey { get; } - string Gpt3ApiKey { get; } - RestartConfig RestartCommand { get; } - Creds.VotesSettings Votes { get; } - string BotListToken { get; } - string RedisOptions { get; } - string LocationIqApiKey { get; } - string TimezoneDbApiKey { get; } - string CoinmarketcapApiKey { get; } - string TrovoClientId { get; } - string CoordinatorUrl { get; set; } - string TwitchClientId { get; set; } - string TwitchClientSecret { get; set; } - GoogleApiConfig Google { get; set; } - BotCacheImplemenation BotCache { get; set; } -} - -public class RestartConfig -{ - public string Cmd { get; set; } - public string Args { get; set; } -} \ No newline at end of file diff --git a/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs b/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs index 35d5b40cb..85aad392b 100644 --- a/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs +++ b/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs @@ -915,21 +915,4 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor, Command: {m.Name} ParamName: {pi.Name} ParamType: {pi.ParameterType.Name}"; -} - -public enum MedusaLoadResult -{ - Success, - NotFound, - AlreadyLoaded, - Empty, - UnknownError, -} - -public enum MedusaUnloadResult -{ - Success, - NotLoaded, - PossiblyUnable, - NotFound, } \ No newline at end of file diff --git a/src/NadekoBot/_Extensions/ServiceCollectionExtensions.cs b/src/NadekoBot/Common/ServiceCollectionExtensions.cs similarity index 100% rename from src/NadekoBot/_Extensions/ServiceCollectionExtensions.cs rename to src/NadekoBot/Common/ServiceCollectionExtensions.cs diff --git a/src/NadekoBot/Db/Models/Waifu.cs b/src/NadekoBot/Db/Models/Waifu.cs deleted file mode 100644 index 39bb3de41..000000000 --- a/src/NadekoBot/Db/Models/Waifu.cs +++ /dev/null @@ -1,75 +0,0 @@ -#nullable disable -using NadekoBot.Db.Models; - -namespace NadekoBot.Services.Database.Models; - -public class WaifuInfo : DbEntity -{ - public int WaifuId { get; set; } - public DiscordUser Waifu { get; set; } - - public int? ClaimerId { get; set; } - public DiscordUser Claimer { get; set; } - - public int? AffinityId { get; set; } - public DiscordUser Affinity { get; set; } - - public long Price { get; set; } - public List Items { get; set; } = new(); - - public override string ToString() - { - var claimer = "no one"; - var status = string.Empty; - - var waifuUsername = Waifu.Username.TrimTo(20); - var claimerUsername = Claimer?.Username.TrimTo(20); - - if (ClaimerId is not null) - claimer = $"{claimerUsername}#{Claimer.Discriminator}"; - if (AffinityId is null) - status = $"... but {waifuUsername}'s heart is empty"; - else if (AffinityId == ClaimerId) - status = $"... and {waifuUsername} likes {claimerUsername} too <3"; - else - { - status = - $"... but {waifuUsername}'s heart belongs to {Affinity.Username.TrimTo(20)}#{Affinity.Discriminator}"; - } - - return $"**{waifuUsername}#{Waifu.Discriminator}** - claimed by **{claimer}**\n\t{status}"; - } -} - -public class WaifuLbResult -{ - public string Username { get; set; } - public string Discrim { get; set; } - - public string Claimer { get; set; } - public string ClaimerDiscrim { get; set; } - - public string Affinity { get; set; } - public string AffinityDiscrim { get; set; } - - public long Price { get; set; } - - public override string ToString() - { - var claimer = "no one"; - var status = string.Empty; - - var waifuUsername = Username.TrimTo(20); - var claimerUsername = Claimer?.TrimTo(20); - - if (Claimer is not null) - claimer = $"{claimerUsername}#{ClaimerDiscrim}"; - if (Affinity is null) - status = $"... but {waifuUsername}'s heart is empty"; - else if (Affinity + AffinityDiscrim == Claimer + ClaimerDiscrim) - status = $"... and {waifuUsername} likes {claimerUsername} too <3"; - else - status = $"... but {waifuUsername}'s heart belongs to {Affinity.TrimTo(20)}#{AffinityDiscrim}"; - return $"**{waifuUsername}#{Discrim}** - claimed by **{claimer}**\n\t{status}"; - } -} \ No newline at end of file diff --git a/src/NadekoBot/Modules/Gambling/Waifus/Common/Extensions.cs b/src/NadekoBot/Modules/Gambling/Waifus/Common/Extensions.cs new file mode 100644 index 000000000..6018319e9 --- /dev/null +++ b/src/NadekoBot/Modules/Gambling/Waifus/Common/Extensions.cs @@ -0,0 +1,6 @@ +namespace NadekoBot.Modules.Gambling.Common.Waifu; + +public class Extensions +{ + +} \ No newline at end of file diff --git a/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs index 84d8499e9..880f1c12d 100644 --- a/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs @@ -3,6 +3,7 @@ using Nadeko.Common; using NadekoBot.Modules.Gambling.Common; using NadekoBot.Modules.Gambling.Common.Waifu; using NadekoBot.Modules.Gambling.Services; +using NadekoBot.Services.Database.Models; namespace NadekoBot.Modules.Gambling; @@ -214,12 +215,31 @@ public partial class Gambling foreach (var w in waifus) { var j = i++; - embed.AddField("#" + ((page * 9) + j + 1) + " - " + N(w.Price), w.ToString()); + embed.AddField("#" + ((page * 9) + j + 1) + " - " + N(w.Price), GetLbString(w)); } await ctx.Channel.EmbedAsync(embed); } + private string GetLbString(WaifuLbResult w) + { + var claimer = "no one"; + var status = string.Empty; + + var waifuUsername = w.Username.TrimTo(20); + var claimerUsername = w.Claimer?.TrimTo(20); + + if (w.Claimer is not null) + claimer = $"{claimerUsername}#{w.ClaimerDiscrim}"; + if (w.Affinity is null) + status = $"... but {waifuUsername}'s heart is empty"; + else if (w.Affinity + w.AffinityDiscrim == w.Claimer + w.ClaimerDiscrim) + status = $"... and {waifuUsername} likes {claimerUsername} too <3"; + else + status = $"... but {waifuUsername}'s heart belongs to {w.Affinity.TrimTo(20)}#{w.AffinityDiscrim}"; + return $"**{waifuUsername}#{w.Discrim}** - claimed by **{claimer}**\n\t{status}"; + } + [Cmd] [RequireContext(ContextType.Guild)] [Priority(1)] @@ -250,23 +270,24 @@ public partial class Gambling ? "-" : string.Join("\n", itemList.Where(x => waifuItems.TryGetValue(x.ItemEmoji, out _)) - .OrderBy(x => waifuItems[x.ItemEmoji].Price) - .GroupBy(x => x.ItemEmoji) - .Select(x => $"{x.Key} x{x.Count(),-3}") - .Chunk(2) - .Select(x => string.Join(" ", x))); + .OrderBy(x => waifuItems[x.ItemEmoji].Price) + .GroupBy(x => x.ItemEmoji) + .Select(x => $"{x.Key} x{x.Count(),-3}") + .Chunk(2) + .Select(x => string.Join(" ", x))); var claimsNames = (await _service.GetClaimNames(wi.WaifuId)); var claimsStr = claimsNames - .Shuffle() - .Take(30) - .Join('\n'); + .Shuffle() + .Take(30) + .Join('\n'); var fansList = await _service.GetFansNames(wi.WaifuId); var fansStr = fansList - .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x).Join('\n'); + .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x) + .Join('\n'); + - if (string.IsNullOrWhiteSpace(fansStr)) fansStr = "-"; diff --git a/src/NadekoBot/Modules/Searches/_Common/Extensions.cs b/src/NadekoBot/Modules/Searches/_Common/Extensions.cs new file mode 100644 index 000000000..718f09742 --- /dev/null +++ b/src/NadekoBot/Modules/Searches/_Common/Extensions.cs @@ -0,0 +1,10 @@ +using NadekoBot.Db.Models; +using NadekoBot.Modules.Searches.Common; + +namespace NadekoBot.Modules.Searches._Common; + +public static class Extensions +{ + public static StreamDataKey CreateKey(this FollowedStream fs) + => new(fs.Type, fs.Username.ToLower()); +} \ No newline at end of file diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index f998acd33..34b9c5dc6 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -28,7 +28,6 @@ - @@ -92,13 +91,12 @@ + + - - - @@ -140,9 +138,6 @@ PreserveNewest - - - 5.0.0 diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 6a8006819..8671007bd 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -7,7 +7,7 @@ using PreconditionResult = Discord.Commands.PreconditionResult; namespace NadekoBot.Services; -public class CommandHandler : INService, IReadyExecutor +public class CommandHandler : INService, IReadyExecutor, ICommandHandler { private const int GLOBAL_COMMANDS_COOLDOWN = 750; diff --git a/src/NadekoBot/Services/Impl/BotCredsProvider.cs b/src/NadekoBot/Services/Impl/BotCredsProvider.cs index a7dcd3d15..2876e64ad 100644 --- a/src/NadekoBot/Services/Impl/BotCredsProvider.cs +++ b/src/NadekoBot/Services/Impl/BotCredsProvider.cs @@ -6,13 +6,6 @@ using Newtonsoft.Json; namespace NadekoBot.Services; -public interface IBotCredsProvider -{ - public void Reload(); - public IBotCredentials GetCreds(); - public void ModifyCredsFile(Action func); -} - public sealed class BotCredsProvider : IBotCredsProvider { private const string CREDS_FILE_NAME = "creds.yml"; @@ -94,7 +87,7 @@ public sealed class BotCredsProvider : IBotCredsProvider { if (Environment.OSVersion.Platform == PlatformID.Unix) { - _creds.RestartCommand = new() + _creds.RestartCommand = new RestartConfig() { Args = "dotnet", Cmd = "NadekoBot.dll -- {0}" @@ -102,7 +95,7 @@ public sealed class BotCredsProvider : IBotCredsProvider } else { - _creds.RestartCommand = new() + _creds.RestartCommand = new RestartConfig() { Args = "NadekoBot.exe", Cmd = "{0}" @@ -122,7 +115,7 @@ public sealed class BotCredsProvider : IBotCredsProvider } } - public void ModifyCredsFile(Action func) + public void ModifyCredsFile(Action func) { var ymlData = File.ReadAllText(CREDS_FILE_NAME); var creds = Yaml.Deserializer.Deserialize(ymlData); @@ -163,8 +156,8 @@ public sealed class BotCredsProvider : IBotCredsProvider OsuApiKey = oldCreds.OsuApiKey, CleverbotApiKey = oldCreds.CleverbotApiKey, TotalShards = oldCreds.TotalShards <= 1 ? 1 : oldCreds.TotalShards, - Patreon = new(oldCreds.PatreonAccessToken, null, null, oldCreds.PatreonCampaignId), - Votes = new(oldCreds.VotesUrl, oldCreds.VotesToken, string.Empty, string.Empty), + Patreon = new Creds.PatreonSettings(oldCreds.PatreonAccessToken, null, null, oldCreds.PatreonCampaignId), + Votes = new Creds.VotesSettings(oldCreds.VotesUrl, oldCreds.VotesToken, string.Empty, string.Empty), BotListToken = oldCreds.BotListToken, RedisOptions = oldCreds.RedisOptions, LocationIqApiKey = oldCreds.LocationIqApiKey, diff --git a/src/NadekoBot/Services/strings/impl/BotStrings.cs b/src/NadekoBot/Services/strings/impl/BotStrings.cs index 990159f3e..ef2be4608 100644 --- a/src/NadekoBot/Services/strings/impl/BotStrings.cs +++ b/src/NadekoBot/Services/strings/impl/BotStrings.cs @@ -101,7 +101,9 @@ public class BotStrings : IBotStrings => _stringsProvider.Reload(); } -public class CommandStrings + +public sealed class CommandStrings + : ICommandStrings { [YamlMember(Alias = "desc")] public string Desc { get; set; } diff --git a/src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs b/src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs index 109fc553f..a3fb28032 100644 --- a/src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs +++ b/src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs @@ -40,11 +40,11 @@ public class LocalFileStringsSource : IStringsSource return outputDict; } - public Dictionary> GetCommandStrings() + public Dictionary> GetCommandStrings() { var deserializer = new DeserializerBuilder().Build(); - var outputDict = new Dictionary>(); + var outputDict = new Dictionary>().; foreach (var file in Directory.GetFiles(_commandsPath)) { try diff --git a/src/NadekoBot/Services/strings/impl/MemoryBotStringsProvider.cs b/src/NadekoBot/Services/strings/impl/MemoryBotStringsProvider.cs index b75b94cf0..a0865e17e 100644 --- a/src/NadekoBot/Services/strings/impl/MemoryBotStringsProvider.cs +++ b/src/NadekoBot/Services/strings/impl/MemoryBotStringsProvider.cs @@ -27,7 +27,7 @@ public class MemoryBotStringsProvider : IBotStringsProvider commandStrings = _source.GetCommandStrings(); } - public CommandStrings GetCommandStrings(string localeName, string commandName) + public ICommandStrings GetCommandStrings(string localeName, string commandName) { if (commandStrings.TryGetValue(localeName, out var langStrings) && langStrings.TryGetValue(commandName, out var strings))