diff --git a/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs b/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs index 8f12fbb54..bbc2a26c6 100644 --- a/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs +++ b/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs @@ -5,6 +5,7 @@ using NadekoBot.Core.Services; using System; using System.Text.RegularExpressions; using System.Threading.Tasks; +using NadekoBot.Db; using NadekoBot.Modules.Gambling.Services; namespace NadekoBot.Core.Common.TypeReaders diff --git a/src/NadekoBot/Services/Database/Extensions/ClubExtensions.cs b/src/NadekoBot/Db/Extensions/ClubExtensions.cs similarity index 92% rename from src/NadekoBot/Services/Database/Extensions/ClubExtensions.cs rename to src/NadekoBot/Db/Extensions/ClubExtensions.cs index 1b1ba27a9..4e1c760e6 100644 --- a/src/NadekoBot/Services/Database/Extensions/ClubExtensions.cs +++ b/src/NadekoBot/Db/Extensions/ClubExtensions.cs @@ -1,10 +1,9 @@ -using NadekoBot.Core.Services.Database.Models; -using System.Linq; +using System.Linq; using Microsoft.EntityFrameworkCore; using System.Collections.Generic; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; -namespace NadekoBot.Modules.Xp.Common +namespace NadekoBot.Db { public static class ClubExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/CurrencyTransactionExtensions.cs b/src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs similarity index 93% rename from src/NadekoBot/Services/Database/Extensions/CurrencyTransactionExtensions.cs rename to src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs index 11da4f0c7..1e7fba6c3 100644 --- a/src/NadekoBot/Services/Database/Extensions/CurrencyTransactionExtensions.cs +++ b/src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs @@ -3,7 +3,7 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Core.Services.Database +namespace NadekoBot.Db { public static class CurrencyTransactionExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/CustomReactionsExtensions.cs b/src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs similarity index 87% rename from src/NadekoBot/Services/Database/Extensions/CustomReactionsExtensions.cs rename to src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs index 5710ba464..03d6ca53c 100644 --- a/src/NadekoBot/Services/Database/Extensions/CustomReactionsExtensions.cs +++ b/src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs @@ -1,11 +1,10 @@ -using NadekoBot.Services.Database.Models; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.Linq; using LinqToDB; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Modules.CustomReactions +namespace NadekoBot.Db { public static class CustomReactionsExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/DbExtensions.cs b/src/NadekoBot/Db/Extensions/DbExtensions.cs similarity index 100% rename from src/NadekoBot/Services/Database/Extensions/DbExtensions.cs rename to src/NadekoBot/Db/Extensions/DbExtensions.cs diff --git a/src/NadekoBot/Services/Database/Extensions/DiscordUserExtensions.cs b/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs similarity index 97% rename from src/NadekoBot/Services/Database/Extensions/DiscordUserExtensions.cs rename to src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs index 1d8fc9f45..34d6016f5 100644 --- a/src/NadekoBot/Services/Database/Extensions/DiscordUserExtensions.cs +++ b/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs @@ -1,13 +1,11 @@ -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using System.Linq; using Microsoft.EntityFrameworkCore; using Discord; using System.Collections.Generic; -using System; using NadekoBot.Core.Services.Database; -using NadekoBot.Core.Services.Database.Repositories; -namespace NadekoBot.Core.Services +namespace NadekoBot.Db { public static class DiscordUserExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/GuildConfigExtensions.cs b/src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs similarity index 99% rename from src/NadekoBot/Services/Database/Extensions/GuildConfigExtensions.cs rename to src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs index 069689d3f..121323acb 100644 --- a/src/NadekoBot/Services/Database/Extensions/GuildConfigExtensions.cs +++ b/src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs @@ -4,9 +4,9 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using System; using NadekoBot.Core.Services.Database; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; -namespace NadekoBot.Modules.Administration +namespace NadekoBot.Db { public static class GuildConfigExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/MusicPlayerSettingsExtensions.cs b/src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs similarity index 93% rename from src/NadekoBot/Services/Database/Extensions/MusicPlayerSettingsExtensions.cs rename to src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs index f7d1ee061..d578b2095 100644 --- a/src/NadekoBot/Services/Database/Extensions/MusicPlayerSettingsExtensions.cs +++ b/src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Core.Services.Database.Repositories.Impl +namespace NadekoBot.Db { public static class MusicPlayerSettingsExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/MusicPlaylistExtensions.cs b/src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs similarity index 89% rename from src/NadekoBot/Services/Database/Extensions/MusicPlaylistExtensions.cs rename to src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs index d6f1d9f83..b26575ac7 100644 --- a/src/NadekoBot/Services/Database/Extensions/MusicPlaylistExtensions.cs +++ b/src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs @@ -1,11 +1,10 @@ -using NadekoBot.Services.Database.Models; -using System; +using System; using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Modules.Music +namespace NadekoBot.Db { public static class MusicPlaylistExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/PollExtensions.cs b/src/NadekoBot/Db/Extensions/PollExtensions.cs similarity index 90% rename from src/NadekoBot/Services/Database/Extensions/PollExtensions.cs rename to src/NadekoBot/Db/Extensions/PollExtensions.cs index 132a81cb0..d5243a7c5 100644 --- a/src/NadekoBot/Services/Database/Extensions/PollExtensions.cs +++ b/src/NadekoBot/Db/Extensions/PollExtensions.cs @@ -1,12 +1,12 @@ -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database; +using NadekoBot.Db; -namespace NadekoBot.Modules.Games.Common +namespace NadekoBot.Db { public static class PollExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/QuoteExtensions.cs b/src/NadekoBot/Db/Extensions/QuoteExtensions.cs similarity index 97% rename from src/NadekoBot/Services/Database/Extensions/QuoteExtensions.cs rename to src/NadekoBot/Db/Extensions/QuoteExtensions.cs index 7623fd102..9cb25a900 100644 --- a/src/NadekoBot/Services/Database/Extensions/QuoteExtensions.cs +++ b/src/NadekoBot/Db/Extensions/QuoteExtensions.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using NadekoBot.Common; -namespace NadekoBot.Core.Services.Database.Repositories.Impl +namespace NadekoBot.Db { public static class QuoteExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/ReminderExtensions.cs b/src/NadekoBot/Db/Extensions/ReminderExtensions.cs similarity index 94% rename from src/NadekoBot/Services/Database/Extensions/ReminderExtensions.cs rename to src/NadekoBot/Db/Extensions/ReminderExtensions.cs index 2988d2346..994504c3e 100644 --- a/src/NadekoBot/Services/Database/Extensions/ReminderExtensions.cs +++ b/src/NadekoBot/Db/Extensions/ReminderExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.Linq; -namespace NadekoBot.Modules.Utility.Common +namespace NadekoBot.Db { public static class ReminderExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/SelfAssignableRolesExtensions.cs b/src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs similarity index 94% rename from src/NadekoBot/Services/Database/Extensions/SelfAssignableRolesExtensions.cs rename to src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs index a78f27bc4..2daa67c6e 100644 --- a/src/NadekoBot/Services/Database/Extensions/SelfAssignableRolesExtensions.cs +++ b/src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; -namespace NadekoBot.Modules.Administration.Common +namespace NadekoBot.Db { public static class SelfAssignableRolesExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/UserXpExtensions.cs b/src/NadekoBot/Db/Extensions/UserXpExtensions.cs similarity index 95% rename from src/NadekoBot/Services/Database/Extensions/UserXpExtensions.cs rename to src/NadekoBot/Db/Extensions/UserXpExtensions.cs index 581c7c8e3..4b3f92839 100644 --- a/src/NadekoBot/Services/Database/Extensions/UserXpExtensions.cs +++ b/src/NadekoBot/Db/Extensions/UserXpExtensions.cs @@ -1,13 +1,11 @@ -using NadekoBot.Services.Database.Models; -using System.Linq; +using System.Linq; using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using LinqToDB; using NadekoBot.Core.Services.Database; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database; -namespace NadekoBot.Modules.Xp.Common +namespace NadekoBot.Db { public static class UserXpExtensions { diff --git a/src/NadekoBot/Services/Database/Extensions/WaifuExtensions.cs b/src/NadekoBot/Db/Extensions/WaifuExtensions.cs similarity index 98% rename from src/NadekoBot/Services/Database/Extensions/WaifuExtensions.cs rename to src/NadekoBot/Db/Extensions/WaifuExtensions.cs index 9571be76f..d38f22e44 100644 --- a/src/NadekoBot/Services/Database/Extensions/WaifuExtensions.cs +++ b/src/NadekoBot/Db/Extensions/WaifuExtensions.cs @@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database; using NadekoBot.Core.Services.Database.Models; using NadekoBot.Migrations; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; -namespace NadekoBot.Modules.Gambling +namespace NadekoBot.Db { public class WaifuInfoStats { diff --git a/src/NadekoBot/Services/Database/Extensions/WarningExtensions.cs b/src/NadekoBot/Db/Extensions/WarningExtensions.cs similarity index 97% rename from src/NadekoBot/Services/Database/Extensions/WarningExtensions.cs rename to src/NadekoBot/Db/Extensions/WarningExtensions.cs index acaf39bae..f63efd856 100644 --- a/src/NadekoBot/Services/Database/Extensions/WarningExtensions.cs +++ b/src/NadekoBot/Db/Extensions/WarningExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using System; -namespace NadekoBot.Modules.Administration.Common +namespace NadekoBot.Db { public static class WarningExtensions { diff --git a/src/NadekoBot/Services/Database/Models/AntiProtection.cs b/src/NadekoBot/Db/Models/AntiProtection.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/AntiProtection.cs rename to src/NadekoBot/Db/Models/AntiProtection.cs diff --git a/src/NadekoBot/Services/Database/Models/AutoCommand.cs b/src/NadekoBot/Db/Models/AutoCommand.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/AutoCommand.cs rename to src/NadekoBot/Db/Models/AutoCommand.cs diff --git a/src/NadekoBot/Services/Database/Models/BanTemplate.cs b/src/NadekoBot/Db/Models/BanTemplate.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/BanTemplate.cs rename to src/NadekoBot/Db/Models/BanTemplate.cs diff --git a/src/NadekoBot/Services/Database/Models/BlacklistEntry.cs b/src/NadekoBot/Db/Models/BlacklistEntry.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/BlacklistEntry.cs rename to src/NadekoBot/Db/Models/BlacklistEntry.cs diff --git a/src/NadekoBot/Services/Database/Models/ClubInfo.cs b/src/NadekoBot/Db/Models/ClubInfo.cs similarity index 96% rename from src/NadekoBot/Services/Database/Models/ClubInfo.cs rename to src/NadekoBot/Db/Models/ClubInfo.cs index f7f97995d..ac28dbc8b 100644 --- a/src/NadekoBot/Services/Database/Models/ClubInfo.cs +++ b/src/NadekoBot/Db/Models/ClubInfo.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Services.Database.Models +namespace NadekoBot.Db.Models { public class ClubInfo : DbEntity { diff --git a/src/NadekoBot/Services/Database/Models/CommandAlias.cs b/src/NadekoBot/Db/Models/CommandAlias.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/CommandAlias.cs rename to src/NadekoBot/Db/Models/CommandAlias.cs diff --git a/src/NadekoBot/Services/Database/Models/CommandCooldown.cs b/src/NadekoBot/Db/Models/CommandCooldown.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/CommandCooldown.cs rename to src/NadekoBot/Db/Models/CommandCooldown.cs diff --git a/src/NadekoBot/Services/Database/Models/CurrencyTransaction.cs b/src/NadekoBot/Db/Models/CurrencyTransaction.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/CurrencyTransaction.cs rename to src/NadekoBot/Db/Models/CurrencyTransaction.cs diff --git a/src/NadekoBot/Services/Database/Models/CustomReaction.cs b/src/NadekoBot/Db/Models/CustomReaction.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/CustomReaction.cs rename to src/NadekoBot/Db/Models/CustomReaction.cs diff --git a/src/NadekoBot/Services/Database/Models/DbEntity.cs b/src/NadekoBot/Db/Models/DbEntity.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/DbEntity.cs rename to src/NadekoBot/Db/Models/DbEntity.cs diff --git a/src/NadekoBot/Services/Database/Models/DelMsgOnCmdChannel.cs b/src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/DelMsgOnCmdChannel.cs rename to src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs diff --git a/src/NadekoBot/Services/Database/Models/DiscordPemOverride.cs b/src/NadekoBot/Db/Models/DiscordPemOverride.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/DiscordPemOverride.cs rename to src/NadekoBot/Db/Models/DiscordPemOverride.cs diff --git a/src/NadekoBot/Services/Database/Models/DiscordUser.cs b/src/NadekoBot/Db/Models/DiscordUser.cs similarity index 95% rename from src/NadekoBot/Services/Database/Models/DiscordUser.cs rename to src/NadekoBot/Db/Models/DiscordUser.cs index bd9395604..e2878462b 100644 --- a/src/NadekoBot/Services/Database/Models/DiscordUser.cs +++ b/src/NadekoBot/Db/Models/DiscordUser.cs @@ -1,7 +1,7 @@ using System; using NadekoBot.Core.Services.Database.Models; -namespace NadekoBot.Services.Database.Models +namespace NadekoBot.Db.Models { public class DiscordUser : DbEntity { diff --git a/src/NadekoBot/Services/Database/Models/Event.cs b/src/NadekoBot/Db/Models/Event.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Event.cs rename to src/NadekoBot/Db/Models/Event.cs diff --git a/src/NadekoBot/Services/Database/Models/FeedSub.cs b/src/NadekoBot/Db/Models/FeedSub.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/FeedSub.cs rename to src/NadekoBot/Db/Models/FeedSub.cs diff --git a/src/NadekoBot/Services/Database/Models/FilterChannelId.cs b/src/NadekoBot/Db/Models/FilterChannelId.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/FilterChannelId.cs rename to src/NadekoBot/Db/Models/FilterChannelId.cs diff --git a/src/NadekoBot/Services/Database/Models/FilterLinksChannelId.cs b/src/NadekoBot/Db/Models/FilterLinksChannelId.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/FilterLinksChannelId.cs rename to src/NadekoBot/Db/Models/FilterLinksChannelId.cs diff --git a/src/NadekoBot/Services/Database/Models/FilteredWord.cs b/src/NadekoBot/Db/Models/FilteredWord.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/FilteredWord.cs rename to src/NadekoBot/Db/Models/FilteredWord.cs diff --git a/src/NadekoBot/Services/Database/Models/FollowedStream.cs b/src/NadekoBot/Db/Models/FollowedStream.cs similarity index 97% rename from src/NadekoBot/Services/Database/Models/FollowedStream.cs rename to src/NadekoBot/Db/Models/FollowedStream.cs index 421761c7e..12db085d5 100644 --- a/src/NadekoBot/Services/Database/Models/FollowedStream.cs +++ b/src/NadekoBot/Db/Models/FollowedStream.cs @@ -2,7 +2,7 @@ using NadekoBot.Core.Services.Database.Models; using NadekoBot.Modules.Searches.Common; -namespace NadekoBot.Services.Database.Models +namespace NadekoBot.Db.Models { public class FollowedStream : DbEntity { diff --git a/src/NadekoBot/Services/Database/Models/GCChannelId.cs b/src/NadekoBot/Db/Models/GCChannelId.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/GCChannelId.cs rename to src/NadekoBot/Db/Models/GCChannelId.cs diff --git a/src/NadekoBot/Services/Database/Models/GroupName.cs b/src/NadekoBot/Db/Models/GroupName.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/GroupName.cs rename to src/NadekoBot/Db/Models/GroupName.cs diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Db/Models/GuildConfig.cs similarity index 99% rename from src/NadekoBot/Services/Database/Models/GuildConfig.cs rename to src/NadekoBot/Db/Models/GuildConfig.cs index 98149635e..0a9992143 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Db/Models/GuildConfig.cs @@ -1,7 +1,7 @@ using System; using NadekoBot.Common.Collections; using System.Collections.Generic; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Core.Services.Database.Models { diff --git a/src/NadekoBot/Services/Database/Models/IgnoredLogChannel.cs b/src/NadekoBot/Db/Models/IgnoredLogChannel.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/IgnoredLogChannel.cs rename to src/NadekoBot/Db/Models/IgnoredLogChannel.cs diff --git a/src/NadekoBot/Services/Database/Models/IgnoredVoicePresenceChannel.cs b/src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/IgnoredVoicePresenceChannel.cs rename to src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs diff --git a/src/NadekoBot/Services/Database/Models/LogSetting.cs b/src/NadekoBot/Db/Models/LogSetting.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/LogSetting.cs rename to src/NadekoBot/Db/Models/LogSetting.cs diff --git a/src/NadekoBot/Services/Database/Models/MusicPlaylist.cs b/src/NadekoBot/Db/Models/MusicPlaylist.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/MusicPlaylist.cs rename to src/NadekoBot/Db/Models/MusicPlaylist.cs diff --git a/src/NadekoBot/Services/Database/Models/MusicSettings.cs b/src/NadekoBot/Db/Models/MusicSettings.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/MusicSettings.cs rename to src/NadekoBot/Db/Models/MusicSettings.cs diff --git a/src/NadekoBot/Services/Database/Models/MutedUserId.cs b/src/NadekoBot/Db/Models/MutedUserId.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/MutedUserId.cs rename to src/NadekoBot/Db/Models/MutedUserId.cs diff --git a/src/NadekoBot/Services/Database/Models/NsfwBlacklitedTag.cs b/src/NadekoBot/Db/Models/NsfwBlacklitedTag.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/NsfwBlacklitedTag.cs rename to src/NadekoBot/Db/Models/NsfwBlacklitedTag.cs diff --git a/src/NadekoBot/Services/Database/Models/Permission.cs b/src/NadekoBot/Db/Models/Permission.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Permission.cs rename to src/NadekoBot/Db/Models/Permission.cs diff --git a/src/NadekoBot/Services/Database/Models/PlantedCurrency.cs b/src/NadekoBot/Db/Models/PlantedCurrency.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/PlantedCurrency.cs rename to src/NadekoBot/Db/Models/PlantedCurrency.cs diff --git a/src/NadekoBot/Services/Database/Models/PlaylistSong.cs b/src/NadekoBot/Db/Models/PlaylistSong.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/PlaylistSong.cs rename to src/NadekoBot/Db/Models/PlaylistSong.cs diff --git a/src/NadekoBot/Services/Database/Models/Poll.cs b/src/NadekoBot/Db/Models/Poll.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Poll.cs rename to src/NadekoBot/Db/Models/Poll.cs diff --git a/src/NadekoBot/Services/Database/Models/PollVote.cs b/src/NadekoBot/Db/Models/PollVote.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/PollVote.cs rename to src/NadekoBot/Db/Models/PollVote.cs diff --git a/src/NadekoBot/Services/Database/Models/Quote.cs b/src/NadekoBot/Db/Models/Quote.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Quote.cs rename to src/NadekoBot/Db/Models/Quote.cs diff --git a/src/NadekoBot/Services/Database/Models/ReactionRole.cs b/src/NadekoBot/Db/Models/ReactionRole.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/ReactionRole.cs rename to src/NadekoBot/Db/Models/ReactionRole.cs diff --git a/src/NadekoBot/Services/Database/Models/Reminder.cs b/src/NadekoBot/Db/Models/Reminder.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Reminder.cs rename to src/NadekoBot/Db/Models/Reminder.cs diff --git a/src/NadekoBot/Services/Database/Models/Repeater.cs b/src/NadekoBot/Db/Models/Repeater.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Repeater.cs rename to src/NadekoBot/Db/Models/Repeater.cs diff --git a/src/NadekoBot/Services/Database/Models/RewardedUser.cs b/src/NadekoBot/Db/Models/RewardedUser.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/RewardedUser.cs rename to src/NadekoBot/Db/Models/RewardedUser.cs diff --git a/src/NadekoBot/Services/Database/Models/RotatingPlayingStatus.cs b/src/NadekoBot/Db/Models/RotatingPlayingStatus.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/RotatingPlayingStatus.cs rename to src/NadekoBot/Db/Models/RotatingPlayingStatus.cs diff --git a/src/NadekoBot/Services/Database/Models/SelfAssignableRole.cs b/src/NadekoBot/Db/Models/SelfAssignableRole.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/SelfAssignableRole.cs rename to src/NadekoBot/Db/Models/SelfAssignableRole.cs diff --git a/src/NadekoBot/Services/Database/Models/ShopEntry.cs b/src/NadekoBot/Db/Models/ShopEntry.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/ShopEntry.cs rename to src/NadekoBot/Db/Models/ShopEntry.cs diff --git a/src/NadekoBot/Services/Database/Models/SlowmodeIgnoredRole.cs b/src/NadekoBot/Db/Models/SlowmodeIgnoredRole.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/SlowmodeIgnoredRole.cs rename to src/NadekoBot/Db/Models/SlowmodeIgnoredRole.cs diff --git a/src/NadekoBot/Services/Database/Models/SlowmodeIgnoredUser.cs b/src/NadekoBot/Db/Models/SlowmodeIgnoredUser.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/SlowmodeIgnoredUser.cs rename to src/NadekoBot/Db/Models/SlowmodeIgnoredUser.cs diff --git a/src/NadekoBot/Services/Database/Models/Stake.cs b/src/NadekoBot/Db/Models/Stake.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Stake.cs rename to src/NadekoBot/Db/Models/Stake.cs diff --git a/src/NadekoBot/Services/Database/Models/StreamRoleSettings.cs b/src/NadekoBot/Db/Models/StreamRoleSettings.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/StreamRoleSettings.cs rename to src/NadekoBot/Db/Models/StreamRoleSettings.cs diff --git a/src/NadekoBot/Services/Database/Models/UnbanTimer.cs b/src/NadekoBot/Db/Models/UnbanTimer.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/UnbanTimer.cs rename to src/NadekoBot/Db/Models/UnbanTimer.cs diff --git a/src/NadekoBot/Services/Database/Models/UnmuteTimer.cs b/src/NadekoBot/Db/Models/UnmuteTimer.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/UnmuteTimer.cs rename to src/NadekoBot/Db/Models/UnmuteTimer.cs diff --git a/src/NadekoBot/Services/Database/Models/UnroleTimer.cs b/src/NadekoBot/Db/Models/UnroleTimer.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/UnroleTimer.cs rename to src/NadekoBot/Db/Models/UnroleTimer.cs diff --git a/src/NadekoBot/Services/Database/Models/UserXpStats.cs b/src/NadekoBot/Db/Models/UserXpStats.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/UserXpStats.cs rename to src/NadekoBot/Db/Models/UserXpStats.cs diff --git a/src/NadekoBot/Services/Database/Models/VcRoleInfo.cs b/src/NadekoBot/Db/Models/VcRoleInfo.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/VcRoleInfo.cs rename to src/NadekoBot/Db/Models/VcRoleInfo.cs diff --git a/src/NadekoBot/Services/Database/Models/Waifu.cs b/src/NadekoBot/Db/Models/Waifu.cs similarity index 98% rename from src/NadekoBot/Services/Database/Models/Waifu.cs rename to src/NadekoBot/Db/Models/Waifu.cs index 66432f232..9d15d01f8 100644 --- a/src/NadekoBot/Services/Database/Models/Waifu.cs +++ b/src/NadekoBot/Db/Models/Waifu.cs @@ -1,7 +1,7 @@ using NadekoBot.Extensions; using System.Collections.Generic; using NadekoBot.Modules.Gambling.Common; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Core.Services.Database.Models { diff --git a/src/NadekoBot/Services/Database/Models/WaifuItem.cs b/src/NadekoBot/Db/Models/WaifuItem.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/WaifuItem.cs rename to src/NadekoBot/Db/Models/WaifuItem.cs diff --git a/src/NadekoBot/Services/Database/Models/WaifuUpdate.cs b/src/NadekoBot/Db/Models/WaifuUpdate.cs similarity index 91% rename from src/NadekoBot/Services/Database/Models/WaifuUpdate.cs rename to src/NadekoBot/Db/Models/WaifuUpdate.cs index 3bd8ccc9d..4a420deba 100644 --- a/src/NadekoBot/Services/Database/Models/WaifuUpdate.cs +++ b/src/NadekoBot/Db/Models/WaifuUpdate.cs @@ -1,4 +1,4 @@ -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Core.Services.Database.Models { diff --git a/src/NadekoBot/Services/Database/Models/WarnExpireAction.cs b/src/NadekoBot/Db/Models/WarnExpireAction.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/WarnExpireAction.cs rename to src/NadekoBot/Db/Models/WarnExpireAction.cs diff --git a/src/NadekoBot/Services/Database/Models/Warning.cs b/src/NadekoBot/Db/Models/Warning.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/Warning.cs rename to src/NadekoBot/Db/Models/Warning.cs diff --git a/src/NadekoBot/Services/Database/Models/WarningPunishment.cs b/src/NadekoBot/Db/Models/WarningPunishment.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/WarningPunishment.cs rename to src/NadekoBot/Db/Models/WarningPunishment.cs diff --git a/src/NadekoBot/Services/Database/Models/XpSettings.cs b/src/NadekoBot/Db/Models/XpSettings.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/XpSettings.cs rename to src/NadekoBot/Db/Models/XpSettings.cs diff --git a/src/NadekoBot/Services/Database/Models/YtFollowedChannel.cs b/src/NadekoBot/Db/Models/YtFollowedChannel.cs similarity index 100% rename from src/NadekoBot/Services/Database/Models/YtFollowedChannel.cs rename to src/NadekoBot/Db/Models/YtFollowedChannel.cs diff --git a/src/NadekoBot/Services/Database/NadekoContext.cs b/src/NadekoBot/Db/NadekoContext.cs similarity index 99% rename from src/NadekoBot/Services/Database/NadekoContext.cs rename to src/NadekoBot/Db/NadekoContext.cs index 0dd56dc37..a46e0f790 100644 --- a/src/NadekoBot/Services/Database/NadekoContext.cs +++ b/src/NadekoBot/Db/NadekoContext.cs @@ -6,7 +6,7 @@ using NadekoBot.Core.Services.Impl; using System; using System.IO; using Microsoft.Extensions.Logging; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Core.Services.Database { diff --git a/src/NadekoBot/Modules/Administration/Services/AdministrationService.cs b/src/NadekoBot/Modules/Administration/Services/AdministrationService.cs index 151baa6a5..1cdf85d72 100644 --- a/src/NadekoBot/Modules/Administration/Services/AdministrationService.cs +++ b/src/NadekoBot/Modules/Administration/Services/AdministrationService.cs @@ -12,7 +12,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NadekoBot.Core.Services.Database.Repositories.Impl; +using NadekoBot.Db; namespace NadekoBot.Modules.Administration.Services { diff --git a/src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs b/src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs index d47d02ae7..0582b9bb2 100644 --- a/src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs +++ b/src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs @@ -9,7 +9,7 @@ using System.Threading.Channels; using LinqToDB; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Core.Services.Database.Repositories.Impl; +using NadekoBot.Db; using NadekoBot.Extensions; using Serilog; diff --git a/src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs b/src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs index 9b0a67671..0aebabaa1 100644 --- a/src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs +++ b/src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs @@ -5,7 +5,7 @@ using Discord.WebSocket; using NadekoBot.Common.Collections; using NadekoBot.Extensions; using NadekoBot.Core.Services; -using NadekoBot.Core.Services.Database.Repositories.Impl; +using NadekoBot.Db; using Serilog; namespace NadekoBot.Modules.Administration.Services diff --git a/src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs b/src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs index 2b3054a5f..0bd2018f8 100644 --- a/src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs +++ b/src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs @@ -6,6 +6,7 @@ using NadekoBot.Extensions; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; using System.Threading.Tasks; +using NadekoBot.Db; namespace NadekoBot.Modules.Administration.Services { diff --git a/src/NadekoBot/Modules/Administration/Services/LogCommandService.cs b/src/NadekoBot/Modules/Administration/Services/LogCommandService.cs index f08832b2d..d7d02313a 100644 --- a/src/NadekoBot/Modules/Administration/Services/LogCommandService.cs +++ b/src/NadekoBot/Modules/Administration/Services/LogCommandService.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Caching.Memory; using NadekoBot.Common.Collections; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Extensions; using NadekoBot.Modules.Administration.Common; diff --git a/src/NadekoBot/Modules/Administration/Services/MuteService.cs b/src/NadekoBot/Modules/Administration/Services/MuteService.cs index 7c04445a9..b0b63fbf9 100644 --- a/src/NadekoBot/Modules/Administration/Services/MuteService.cs +++ b/src/NadekoBot/Modules/Administration/Services/MuteService.cs @@ -10,6 +10,7 @@ using NadekoBot.Common.Collections; using NadekoBot.Extensions; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using Serilog; namespace NadekoBot.Modules.Administration.Services diff --git a/src/NadekoBot/Modules/Administration/Services/ProtectionService.cs b/src/NadekoBot/Modules/Administration/Services/ProtectionService.cs index c8a0a1ea5..3bd0efaae 100644 --- a/src/NadekoBot/Modules/Administration/Services/ProtectionService.cs +++ b/src/NadekoBot/Modules/Administration/Services/ProtectionService.cs @@ -11,6 +11,7 @@ using NadekoBot.Core.Services.Database.Models; using NadekoBot.Extensions; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Common.TypeReaders.Models; +using NadekoBot.Db; using Serilog; namespace NadekoBot.Modules.Administration.Services diff --git a/src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs b/src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs index e71f105a9..3084f5051 100644 --- a/src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs +++ b/src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs @@ -8,6 +8,7 @@ using NadekoBot.Extensions; using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Db; using Serilog; namespace NadekoBot.Modules.Administration.Services diff --git a/src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs b/src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs index b63c71fe2..a819ae3dc 100644 --- a/src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs +++ b/src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs @@ -1,15 +1,13 @@ using Discord; -using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NadekoBot.Modules.Administration; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Db; using NadekoBot.Modules.Xp; -using NadekoBot.Modules.Administration.Common; -using NadekoBot.Modules.Xp.Common; namespace NadekoBot.Modules.Administration.Services { diff --git a/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs b/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs index 47f454514..6c9265a92 100644 --- a/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs +++ b/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs @@ -12,8 +12,8 @@ using NadekoBot.Common.Replacements; using NadekoBot.Core.Common.TypeReaders.Models; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Extensions; -using NadekoBot.Modules.Administration.Common; using NadekoBot.Modules.Permissions.Services; using Newtonsoft.Json; using Serilog; diff --git a/src/NadekoBot/Modules/Administration/Services/VcRoleService.cs b/src/NadekoBot/Modules/Administration/Services/VcRoleService.cs index 61acd956b..3f2739c75 100644 --- a/src/NadekoBot/Modules/Administration/Services/VcRoleService.cs +++ b/src/NadekoBot/Modules/Administration/Services/VcRoleService.cs @@ -8,6 +8,7 @@ using Discord.WebSocket; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using Serilog; namespace NadekoBot.Modules.Administration.Services diff --git a/src/NadekoBot/Modules/Gambling/BlackJackCommands.cs b/src/NadekoBot/Modules/Gambling/BlackJackCommands.cs index f31a4acd7..074c98add 100644 --- a/src/NadekoBot/Modules/Gambling/BlackJackCommands.cs +++ b/src/NadekoBot/Modules/Gambling/BlackJackCommands.cs @@ -5,7 +5,6 @@ using NadekoBot.Common; using NadekoBot.Modules.Gambling.Common; using NadekoBot.Modules.Gambling.Common.Blackjack; using NadekoBot.Modules.Gambling.Services; -using NadekoBot.Services; using NadekoBot.Extensions; using System.Linq; using System.Threading.Tasks; diff --git a/src/NadekoBot/Modules/Gambling/DiceRollCommands.cs b/src/NadekoBot/Modules/Gambling/DiceRollCommands.cs index 0b2341be1..eed0fbd97 100644 --- a/src/NadekoBot/Modules/Gambling/DiceRollCommands.cs +++ b/src/NadekoBot/Modules/Gambling/DiceRollCommands.cs @@ -2,7 +2,6 @@ using Discord; using Discord.Commands; using NadekoBot.Common; using NadekoBot.Common.Attributes; -using NadekoBot.Services; using NadekoBot.Extensions; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; diff --git a/src/NadekoBot/Modules/Gambling/DrawCommands.cs b/src/NadekoBot/Modules/Gambling/DrawCommands.cs index d88f2037f..d5024bc73 100644 --- a/src/NadekoBot/Modules/Gambling/DrawCommands.cs +++ b/src/NadekoBot/Modules/Gambling/DrawCommands.cs @@ -12,7 +12,6 @@ using NadekoBot.Modules.Gambling.Common; using Image = SixLabors.ImageSharp.Image; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; -using NadekoBot.Services; namespace NadekoBot.Modules.Gambling { diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index c2a22ff5e..ee1d01344 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -4,7 +4,7 @@ using Discord.WebSocket; using NadekoBot.Common; using NadekoBot.Common.Attributes; using NadekoBot.Modules.Gambling.Common; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using NadekoBot.Modules.Gambling.Services; using System; @@ -17,6 +17,7 @@ using NadekoBot.Core.Common; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; namespace NadekoBot.Modules.Gambling { diff --git a/src/NadekoBot/Modules/Gambling/Services/GamblingService.cs b/src/NadekoBot/Modules/Gambling/Services/GamblingService.cs index c3267c965..479c9a0da 100644 --- a/src/NadekoBot/Modules/Gambling/Services/GamblingService.cs +++ b/src/NadekoBot/Modules/Gambling/Services/GamblingService.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using NadekoBot.Common; +using NadekoBot.Db; using NadekoBot.Modules.Gambling.Services; using Serilog; diff --git a/src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs b/src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs index 7ef7735f2..4592b83fa 100644 --- a/src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs +++ b/src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs @@ -5,6 +5,7 @@ using NadekoBot.Common.Collections; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Extensions; using NadekoBot.Modules.Administration; diff --git a/src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs b/src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs index 77f6ad3e1..635474369 100644 --- a/src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs +++ b/src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs @@ -19,7 +19,7 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using NadekoBot.Modules.Administration; +using NadekoBot.Db; using Image = SixLabors.ImageSharp.Image; using Color = SixLabors.ImageSharp.Color; diff --git a/src/NadekoBot/Modules/Gambling/Services/WaifuService.cs b/src/NadekoBot/Modules/Gambling/Services/WaifuService.cs index f32a62384..f49e739ce 100644 --- a/src/NadekoBot/Modules/Gambling/Services/WaifuService.cs +++ b/src/NadekoBot/Modules/Gambling/Services/WaifuService.cs @@ -1,16 +1,15 @@ using Discord; -using Microsoft.EntityFrameworkCore; using NadekoBot.Modules.Gambling.Common.Waifu; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Core.Services.Database.Repositories; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Db; using NadekoBot.Modules.Gambling.Common; -using NadekoBot.Modules.Gambling.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Gambling.Services { diff --git a/src/NadekoBot/Modules/Gambling/ShopCommands.cs b/src/NadekoBot/Modules/Gambling/ShopCommands.cs index 69b6c42ae..e490ac219 100644 --- a/src/NadekoBot/Modules/Gambling/ShopCommands.cs +++ b/src/NadekoBot/Modules/Gambling/ShopCommands.cs @@ -12,6 +12,7 @@ using NadekoBot.Modules.Gambling.Common; using NadekoBot.Modules.Gambling.Services; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Extensions; using NadekoBot.Modules.Administration; using Serilog; diff --git a/src/NadekoBot/Modules/Games/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/CleverBotCommands.cs index 540c348a1..e3037644e 100644 --- a/src/NadekoBot/Modules/Games/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/CleverBotCommands.cs @@ -1,10 +1,10 @@ using Discord; using Discord.Commands; -using NadekoBot.Services; using System; using System.Threading.Tasks; using NadekoBot.Common.Attributes; using NadekoBot.Core.Services; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using NadekoBot.Modules.Games.Services; using NadekoBot.Modules.Games.Common.ChatterBot; diff --git a/src/NadekoBot/Modules/Games/Common/PollRunner.cs b/src/NadekoBot/Modules/Games/Common/PollRunner.cs index fcd01d93d..3e203266c 100644 --- a/src/NadekoBot/Modules/Games/Common/PollRunner.cs +++ b/src/NadekoBot/Modules/Games/Common/PollRunner.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using Discord; -using NadekoBot.Services.Database.Models; -using NadekoBot.Services; +using NadekoBot.Db.Models; using System; using System.Linq; using System.Threading; diff --git a/src/NadekoBot/Modules/Games/Common/TicTacToe.cs b/src/NadekoBot/Modules/Games/Common/TicTacToe.cs index ee5048e25..e7295564f 100644 --- a/src/NadekoBot/Modules/Games/Common/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Common/TicTacToe.cs @@ -9,7 +9,6 @@ using CommandLine; using NadekoBot.Common; using NadekoBot.Core.Common; using NadekoBot.Core.Services; -using NadekoBot.Services; namespace NadekoBot.Modules.Games.Common { diff --git a/src/NadekoBot/Modules/Games/Services/PollService.cs b/src/NadekoBot/Modules/Games/Services/PollService.cs index 4f7c7f94e..2d9ccc102 100644 --- a/src/NadekoBot/Modules/Games/Services/PollService.cs +++ b/src/NadekoBot/Modules/Games/Services/PollService.cs @@ -6,11 +6,11 @@ using Discord; using Discord.WebSocket; using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Modules.Games.Common; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Common.Collections; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Extensions; using Serilog; diff --git a/src/NadekoBot/Modules/Music/PlaylistCommands.cs b/src/NadekoBot/Modules/Music/PlaylistCommands.cs index 427452e56..a12571e6a 100644 --- a/src/NadekoBot/Modules/Music/PlaylistCommands.cs +++ b/src/NadekoBot/Modules/Music/PlaylistCommands.cs @@ -8,8 +8,8 @@ using Discord.Commands; using NadekoBot.Common.Attributes; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using NadekoBot.Modules; using NadekoBot.Modules.Music; diff --git a/src/NadekoBot/Modules/Music/Services/MusicService.cs b/src/NadekoBot/Modules/Music/Services/MusicService.cs index 7cf24902f..146b209e8 100644 --- a/src/NadekoBot/Modules/Music/Services/MusicService.cs +++ b/src/NadekoBot/Modules/Music/Services/MusicService.cs @@ -9,10 +9,9 @@ using Discord; using Discord.WebSocket; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Core.Services.Database.Repositories.Impl; +using NadekoBot.Db; using NadekoBot.Modules.Music; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using Serilog; diff --git a/src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs b/src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs index 2ad16e59c..da0ff6656 100644 --- a/src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs +++ b/src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using NadekoBot.Common.Attributes; using NadekoBot.Common.Collections; using NadekoBot.Common.TypeReaders; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using NadekoBot.Modules.Permissions.Services; diff --git a/src/NadekoBot/Modules/Permissions/FilterCommands.cs b/src/NadekoBot/Modules/Permissions/FilterCommands.cs index e4339d55a..eb5ad526f 100644 --- a/src/NadekoBot/Modules/Permissions/FilterCommands.cs +++ b/src/NadekoBot/Modules/Permissions/FilterCommands.cs @@ -9,6 +9,7 @@ using NadekoBot.Common.Attributes; using NadekoBot.Common.Collections; using NadekoBot.Modules.Permissions.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Permissions diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 0d839e2d4..47dbc0d87 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -10,6 +10,7 @@ using Discord.WebSocket; using NadekoBot.Common.Attributes; using NadekoBot.Common.TypeReaders; using NadekoBot.Common.TypeReaders.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using NadekoBot.Modules.Permissions.Common; using NadekoBot.Modules.Permissions.Services; diff --git a/src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs b/src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs index 7d1ad46e0..2996cb628 100644 --- a/src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs +++ b/src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs @@ -8,6 +8,7 @@ using NadekoBot.Core.Services.Database.Models; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Common; +using NadekoBot.Db; namespace NadekoBot.Modules.Permissions.Services { diff --git a/src/NadekoBot/Modules/Permissions/Services/FilterService.cs b/src/NadekoBot/Modules/Permissions/Services/FilterService.cs index 69bed43fc..33384b2c9 100644 --- a/src/NadekoBot/Modules/Permissions/Services/FilterService.cs +++ b/src/NadekoBot/Modules/Permissions/Services/FilterService.cs @@ -11,6 +11,7 @@ using NadekoBot.Core.Services; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Internal; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using Serilog; diff --git a/src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs b/src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs index f12c0497f..1eb6f1685 100644 --- a/src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs +++ b/src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs @@ -11,6 +11,7 @@ using NadekoBot.Extensions; using NadekoBot.Modules.Permissions.Common; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Permissions.Services diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs index 1591e0d06..1a5b65b11 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs @@ -1,5 +1,5 @@ using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Searches.Common { diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs index 476419a3c..cb0499413 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs @@ -1,5 +1,5 @@ using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Searches.Common { diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs index 848c4c057..9813613d7 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Threading.Tasks; using NadekoBot.Modules.Searches.Common.StreamNotifications.Providers; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using Newtonsoft.Json; using Serilog; using StackExchange.Redis; diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs index 4464178d9..45fff6e86 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs @@ -6,7 +6,7 @@ using System.Net.Http.Headers; using System.Text.RegularExpressions; using System.Threading.Tasks; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using Newtonsoft.Json; using Serilog; diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs index 0bcf695b2..5be2202e5 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; #nullable enable namespace NadekoBot.Modules.Searches.Common.StreamNotifications.Providers diff --git a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs index 6b2c04f45..6806960e6 100644 --- a/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs +++ b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Text.RegularExpressions; using System.Threading.Tasks; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using Newtonsoft.Json; using Serilog; diff --git a/src/NadekoBot/Modules/Searches/Services/FeedsService.cs b/src/NadekoBot/Modules/Searches/Services/FeedsService.cs index 3a6459fca..8af6f0828 100644 --- a/src/NadekoBot/Modules/Searches/Services/FeedsService.cs +++ b/src/NadekoBot/Modules/Searches/Services/FeedsService.cs @@ -10,6 +10,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Searches.Services diff --git a/src/NadekoBot/Modules/Searches/Services/SearchesService.cs b/src/NadekoBot/Modules/Searches/Services/SearchesService.cs index 57bbf1e22..3fe6c1410 100644 --- a/src/NadekoBot/Modules/Searches/Services/SearchesService.cs +++ b/src/NadekoBot/Modules/Searches/Services/SearchesService.cs @@ -24,6 +24,7 @@ using System.Threading; using System.Threading.Tasks; using AngleSharp.Html.Dom; using AngleSharp.Html.Parser; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using Serilog; using HorizontalAlignment = SixLabors.Fonts.HorizontalAlignment; diff --git a/src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs b/src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs index 5dc11fcce..25c78fcab 100644 --- a/src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs +++ b/src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs @@ -17,8 +17,9 @@ using Discord; using Discord.WebSocket; using NadekoBot.Common.Collections; using NadekoBot.Common.Replacements; +using NadekoBot.Db; using NadekoBot.Modules.Administration; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using Serilog; namespace NadekoBot.Modules.Searches.Services diff --git a/src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs index 51697308c..e23db4336 100644 --- a/src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs +++ b/src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs @@ -10,8 +10,9 @@ using NadekoBot.Common.Attributes; using NadekoBot.Extensions; using NadekoBot.Modules.Searches.Services; using Discord.WebSocket; +using NadekoBot.Db; using NadekoBot.Modules.Administration; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Searches { diff --git a/src/NadekoBot/Modules/Utility/CommandMapCommands.cs b/src/NadekoBot/Modules/Utility/CommandMapCommands.cs index f9664e4fa..18e78e716 100644 --- a/src/NadekoBot/Modules/Utility/CommandMapCommands.cs +++ b/src/NadekoBot/Modules/Utility/CommandMapCommands.cs @@ -3,8 +3,7 @@ using Discord.Commands; using Discord.WebSocket; using Microsoft.EntityFrameworkCore; using NadekoBot.Extensions; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; @@ -12,6 +11,7 @@ using System.Threading.Tasks; using NadekoBot.Common.Attributes; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using NadekoBot.Modules.Utility.Services; diff --git a/src/NadekoBot/Modules/Utility/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/QuoteCommands.cs index e3ee66650..91491025a 100644 --- a/src/NadekoBot/Modules/Utility/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/QuoteCommands.cs @@ -3,15 +3,13 @@ using Discord.Commands; using NadekoBot.Common; using NadekoBot.Common.Attributes; using NadekoBot.Common.Replacements; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Core.Services.Database.Repositories.Impl; using NadekoBot.Db; namespace NadekoBot.Modules.Utility diff --git a/src/NadekoBot/Modules/Utility/RemindCommands.cs b/src/NadekoBot/Modules/Utility/RemindCommands.cs index 53b460a66..19ac8108f 100644 --- a/src/NadekoBot/Modules/Utility/RemindCommands.cs +++ b/src/NadekoBot/Modules/Utility/RemindCommands.cs @@ -7,8 +7,8 @@ using Discord.Commands; using NadekoBot.Common.Attributes; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using NadekoBot.Modules.Administration.Services; using NadekoBot.Modules.Utility.Common; diff --git a/src/NadekoBot/Modules/Utility/Services/CommandMapService.cs b/src/NadekoBot/Modules/Utility/Services/CommandMapService.cs index 6c4e1adfa..7df7fb7e8 100644 --- a/src/NadekoBot/Modules/Utility/Services/CommandMapService.cs +++ b/src/NadekoBot/Modules/Utility/Services/CommandMapService.cs @@ -5,13 +5,13 @@ using System.Threading.Tasks; using Discord; using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Extensions; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using System; using Discord.WebSocket; using Microsoft.EntityFrameworkCore; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Utility.Services diff --git a/src/NadekoBot/Modules/Utility/Services/RepeaterService.cs b/src/NadekoBot/Modules/Utility/Services/RepeaterService.cs index 8515055c3..59ae495c9 100644 --- a/src/NadekoBot/Modules/Utility/Services/RepeaterService.cs +++ b/src/NadekoBot/Modules/Utility/Services/RepeaterService.cs @@ -1,8 +1,7 @@ #nullable enable using Discord.WebSocket; using Microsoft.EntityFrameworkCore; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using System; using System.Collections.Generic; diff --git a/src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs b/src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs index 05f5e0401..515dfaba0 100644 --- a/src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs +++ b/src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs @@ -11,6 +11,7 @@ using NadekoBot.Common.TypeReaders; using NadekoBot.Modules.Utility.Common; using NadekoBot.Modules.Utility.Common.Exceptions; using Discord.Net; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using Serilog; diff --git a/src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs b/src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs index 4fad8dcaa..8d1e2bc54 100644 --- a/src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs +++ b/src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs @@ -6,6 +6,7 @@ using NadekoBot.Common.Collections; using NadekoBot.Extensions; using NadekoBot.Modules.Help.Services; using NadekoBot.Core.Services; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Utility.Services diff --git a/src/NadekoBot/Modules/Xp/Club.cs b/src/NadekoBot/Modules/Xp/Club.cs index 27eb34fb4..29a222a28 100644 --- a/src/NadekoBot/Modules/Xp/Club.cs +++ b/src/NadekoBot/Modules/Xp/Club.cs @@ -7,7 +7,7 @@ using NadekoBot.Modules.Xp.Services; using System; using System.Linq; using System.Threading.Tasks; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Xp { diff --git a/src/NadekoBot/Modules/Xp/Common/FullUserStats.cs b/src/NadekoBot/Modules/Xp/Common/FullUserStats.cs index 712cce5b4..1cad0058b 100644 --- a/src/NadekoBot/Modules/Xp/Common/FullUserStats.cs +++ b/src/NadekoBot/Modules/Xp/Common/FullUserStats.cs @@ -1,5 +1,5 @@ using NadekoBot.Core.Services.Database.Models; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Modules.Xp { diff --git a/src/NadekoBot/Modules/Xp/Services/ClubService.cs b/src/NadekoBot/Modules/Xp/Services/ClubService.cs index a67d803bc..be68fb82f 100644 --- a/src/NadekoBot/Modules/Xp/Services/ClubService.cs +++ b/src/NadekoBot/Modules/Xp/Services/ClubService.cs @@ -1,14 +1,13 @@ -using NadekoBot.Services; -using System; +using System; using System.Collections.Generic; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using Discord; using System.Linq; using NadekoBot.Extensions; using System.Net.Http; using System.Threading.Tasks; using NadekoBot.Core.Services; -using NadekoBot.Modules.Xp.Common; +using NadekoBot.Db; namespace NadekoBot.Modules.Xp.Services { diff --git a/src/NadekoBot/Modules/Xp/Services/XpConfigService.cs b/src/NadekoBot/Modules/Xp/Services/XpConfigService.cs index 7794adfe9..3757f2539 100644 --- a/src/NadekoBot/Modules/Xp/Services/XpConfigService.cs +++ b/src/NadekoBot/Modules/Xp/Services/XpConfigService.cs @@ -1,5 +1,4 @@ -using System; -using NadekoBot.Core.Common; +using NadekoBot.Core.Common; using NadekoBot.Core.Common.Configs; using NadekoBot.Core.Services; diff --git a/src/NadekoBot/Modules/Xp/Services/XpService.cs b/src/NadekoBot/Modules/Xp/Services/XpService.cs index f696080cd..e1d507587 100644 --- a/src/NadekoBot/Modules/Xp/Services/XpService.cs +++ b/src/NadekoBot/Modules/Xp/Services/XpService.cs @@ -2,8 +2,7 @@ using Discord; using Discord.WebSocket; using NadekoBot.Common; using NadekoBot.Common.Collections; -using NadekoBot.Services; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; using NadekoBot.Extensions; using Newtonsoft.Json; using SixLabors.Fonts; @@ -19,15 +18,11 @@ using System.IO; using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using AngleSharp.Common; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Internal; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; using NadekoBot.Core.Services.Impl; -using NadekoBot.Modules.Administration; -using NadekoBot.Modules.Xp; -using NadekoBot.Modules.Xp.Common; +using NadekoBot.Db; using Serilog; using StackExchange.Redis; using Image = SixLabors.ImageSharp.Image; diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 77d95bf70..1eb88d1ab 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -17,6 +17,7 @@ using System.Threading; using System.Threading.Tasks; using NadekoBot.Core.Common.Configs; using NadekoBot.Core.Services.Impl; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using Serilog; diff --git a/src/NadekoBot/Services/DbService.cs b/src/NadekoBot/Services/DbService.cs index e27d779e7..157de3b45 100644 --- a/src/NadekoBot/Services/DbService.cs +++ b/src/NadekoBot/Services/DbService.cs @@ -4,7 +4,7 @@ using NadekoBot.Core.Services.Database; using System; using System.IO; using System.Linq; -using NadekoBot.Services.Database; +using NadekoBot.Db; namespace NadekoBot.Core.Services { diff --git a/src/NadekoBot/Services/GreetSettingsService.cs b/src/NadekoBot/Services/GreetSettingsService.cs index fe695b905..17a5fe842 100644 --- a/src/NadekoBot/Services/GreetSettingsService.cs +++ b/src/NadekoBot/Services/GreetSettingsService.cs @@ -9,6 +9,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using Serilog; diff --git a/src/NadekoBot/Services/Impl/CurrencyService.cs b/src/NadekoBot/Services/Impl/CurrencyService.cs index 89c9c40ed..ccc247a9b 100644 --- a/src/NadekoBot/Services/Impl/CurrencyService.cs +++ b/src/NadekoBot/Services/Impl/CurrencyService.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Db; using NadekoBot.Modules.Gambling.Services; namespace NadekoBot.Core.Services diff --git a/src/NadekoBot/Services/Impl/Localization.cs b/src/NadekoBot/Services/Impl/Localization.cs index 55055202b..bf7cd23e8 100644 --- a/src/NadekoBot/Services/Impl/Localization.cs +++ b/src/NadekoBot/Services/Impl/Localization.cs @@ -6,6 +6,7 @@ using Discord; using NadekoBot.Common; using Newtonsoft.Json; using System.IO; +using NadekoBot.Db; using NadekoBot.Modules.Administration; namespace NadekoBot.Core.Services.Impl diff --git a/src/NadekoBot/Services/NadekoBot.cs b/src/NadekoBot/Services/NadekoBot.cs index 4e54415b3..5b0b4a6be 100644 --- a/src/NadekoBot/Services/NadekoBot.cs +++ b/src/NadekoBot/Services/NadekoBot.cs @@ -25,6 +25,7 @@ using LinqToDB.EntityFrameworkCore; using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Core.Common; using NadekoBot.Core.Common.Configs; +using NadekoBot.Db; using NadekoBot.Modules.Administration; using NadekoBot.Modules.Gambling.Services; using NadekoBot.Modules.Administration.Services; diff --git a/src/NadekoBot/_Extensions/IUserExtensions.cs b/src/NadekoBot/_Extensions/IUserExtensions.cs index 3696c5b18..9e9de9fe1 100644 --- a/src/NadekoBot/_Extensions/IUserExtensions.cs +++ b/src/NadekoBot/_Extensions/IUserExtensions.cs @@ -3,7 +3,7 @@ using NadekoBot.Core.Services.Database.Models; using System; using System.IO; using System.Threading.Tasks; -using NadekoBot.Services.Database.Models; +using NadekoBot.Db.Models; namespace NadekoBot.Extensions { diff --git a/src/NadekoBot/_libs/32/libsodium.dll b/src/NadekoBot/_libs/32/libsodium.dll deleted file mode 100644 index a9ab5078e..000000000 Binary files a/src/NadekoBot/_libs/32/libsodium.dll and /dev/null differ diff --git a/src/NadekoBot/_libs/32/opus.dll b/src/NadekoBot/_libs/32/opus.dll deleted file mode 100644 index f867793e3..000000000 Binary files a/src/NadekoBot/_libs/32/opus.dll and /dev/null differ diff --git a/src/NadekoBot/_libs/64/libsodium.dll b/src/NadekoBot/_libs/64/libsodium.dll deleted file mode 100644 index f5de830e8..000000000 Binary files a/src/NadekoBot/_libs/64/libsodium.dll and /dev/null differ diff --git a/src/NadekoBot/_libs/64/opus.dll b/src/NadekoBot/_libs/64/opus.dll deleted file mode 100644 index a962869fd..000000000 Binary files a/src/NadekoBot/_libs/64/opus.dll and /dev/null differ