One of the last major cleanups. All NadekoBot.Core.* namespaces renamed to NadekoBot.*

src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LinqToDB;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/DbExtensions.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Discord;
 using System.Collections.Generic;
-using NadekoBot.Core.Services.Database;
+using NadekoBot.Services.Database;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -1,9 +1,9 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System;
-using NadekoBot.Core.Services.Database;
+using NadekoBot.Services.Database;
 using NadekoBot.Db.Models;
 
 namespace NadekoBot.Db

src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/PollExtensions.cs

@@ -2,8 +2,8 @@
 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.Services.Database.Models;
 using NadekoBot.Db;
 
 namespace NadekoBot.Db

src/NadekoBot/Db/Extensions/QuoteExtensions.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

src/NadekoBot/Db/Extensions/ReminderExtensions.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;

src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;

src/NadekoBot/Db/Extensions/UserXpExtensions.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using LinqToDB;
-using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db
 {

src/NadekoBot/Db/Extensions/WaifuExtensions.cs

@@ -2,8 +2,8 @@
 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.Services.Database.Models;
 using NadekoBot.Db.Models;
 
 namespace NadekoBot.Db

src/NadekoBot/Db/Extensions/WarningExtensions.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;

src/NadekoBot/Db/Models/AntiProtection.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class AntiRaidSetting : DbEntity
     {

src/NadekoBot/Db/Models/AutoCommand.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class AutoCommand : DbEntity
     {

src/NadekoBot/Db/Models/BanTemplate.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class BanTemplate : DbEntity 
     {

src/NadekoBot/Db/Models/BlacklistEntry.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class BlacklistEntry : DbEntity
     {

src/NadekoBot/Db/Models/ClubInfo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db.Models
 {

src/NadekoBot/Db/Models/CommandAlias.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class CommandAlias : DbEntity
     {

src/NadekoBot/Db/Models/CommandCooldown.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class CommandCooldown : DbEntity
     {

src/NadekoBot/Db/Models/CurrencyTransaction.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class CurrencyTransaction : DbEntity
     {

src/NadekoBot/Db/Models/CustomReaction.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class CustomReaction : DbEntity
     {

src/NadekoBot/Db/Models/DbEntity.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class DbEntity
     {

src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class DelMsgOnCmdChannel : DbEntity
     {

src/NadekoBot/Db/Models/DiscordPemOverride.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class DiscordPermOverride : DbEntity
     {

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -1,5 +1,5 @@
 using System;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Db.Models
 {

src/NadekoBot/Db/Models/Event.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class CurrencyEvent
     {

src/NadekoBot/Db/Models/FeedSub.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class FeedSub : DbEntity
     {

src/NadekoBot/Db/Models/FilterChannelId.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class FilterChannelId : DbEntity
     {

src/NadekoBot/Db/Models/FilterLinksChannelId.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class FilterLinksChannelId : DbEntity
     {

src/NadekoBot/Db/Models/FilteredWord.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class FilteredWord : DbEntity
     {

src/NadekoBot/Db/Models/FollowedStream.cs

@@ -1,5 +1,5 @@
 using System;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Modules.Searches.Common;
 
 namespace NadekoBot.Db.Models

src/NadekoBot/Db/Models/GCChannelId.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class GCChannelId : DbEntity
     {

src/NadekoBot/Db/Models/GroupName.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class GroupName : DbEntity
     {

src/NadekoBot/Db/Models/GuildConfig.cs

@@ -3,7 +3,7 @@ using NadekoBot.Common.Collections;
 using System.Collections.Generic;
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class GuildConfig : DbEntity
     {

src/NadekoBot/Db/Models/IgnoredLogChannel.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class IgnoredLogChannel : DbEntity
     {

src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class IgnoredVoicePresenceChannel : DbEntity
     {

src/NadekoBot/Db/Models/LogSetting.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
 
     public class LogSetting : DbEntity

src/NadekoBot/Db/Models/MusicPlaylist.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class MusicPlaylist : DbEntity
     {

src/NadekoBot/Db/Models/MusicSettings.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class MusicPlayerSettings
     {

src/NadekoBot/Db/Models/MutedUserId.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class MutedUserId : DbEntity
     {

src/NadekoBot/Db/Models/NsfwBlacklitedTag.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class NsfwBlacklitedTag : DbEntity
     {

src/NadekoBot/Db/Models/Permission.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     [DebuggerDisplay("{global::NadekoBot.Modules.Permissions.PermissionExtensions.GetCommand(this)}", Target = typeof(Permission))]
     public class Permission : DbEntity

src/NadekoBot/Db/Models/PlantedCurrency.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class PlantedCurrency : DbEntity
     {

src/NadekoBot/Db/Models/PlaylistSong.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class PlaylistSong : DbEntity
     {

src/NadekoBot/Db/Models/Poll.cs

@@ -1,7 +1,7 @@
 using NadekoBot.Common.Collections;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class Poll : DbEntity
     {

src/NadekoBot/Db/Models/PollVote.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class PollVote : DbEntity
     {

src/NadekoBot/Db/Models/Quote.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class Quote : DbEntity
     {

src/NadekoBot/Db/Models/ReactionRole.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class ReactionRoleMessage : DbEntity, IIndexed
     {

src/NadekoBot/Db/Models/Reminder.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class Reminder : DbEntity
     {

src/NadekoBot/Db/Models/Repeater.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class Repeater
     {

src/NadekoBot/Db/Models/RewardedUser.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class RewardedUser : DbEntity
     {

src/NadekoBot/Db/Models/RotatingPlayingStatus.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class RotatingPlayingStatus : DbEntity
     {

src/NadekoBot/Db/Models/SelfAssignableRole.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class SelfAssignedRole : DbEntity
     {

src/NadekoBot/Db/Models/ShopEntry.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public enum ShopEntryType
     {

src/NadekoBot/Db/Models/SlowmodeIgnoredRole.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class SlowmodeIgnoredRole : DbEntity
     {

src/NadekoBot/Db/Models/SlowmodeIgnoredUser.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class SlowmodeIgnoredUser : DbEntity
     {

src/NadekoBot/Db/Models/Stake.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     /// <summary>
     /// Used to set stakes for gambling games which don't reward right away -

src/NadekoBot/Db/Models/StreamRoleSettings.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class StreamRoleSettings : DbEntity
     {

src/NadekoBot/Db/Models/UnbanTimer.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class UnbanTimer : DbEntity
     {

src/NadekoBot/Db/Models/UnmuteTimer.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class UnmuteTimer : DbEntity
     {

src/NadekoBot/Db/Models/UnroleTimer.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class UnroleTimer : DbEntity
     {

src/NadekoBot/Db/Models/UserXpStats.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class UserXpStats : DbEntity
     {

src/NadekoBot/Db/Models/VcRoleInfo.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class VcRoleInfo : DbEntity
     {

src/NadekoBot/Db/Models/Waifu.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class WaifuInfo : DbEntity
     {

src/NadekoBot/Db/Models/WaifuItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class WaifuItem : DbEntity
     {

src/NadekoBot/Db/Models/WaifuUpdate.cs

@@ -1,6 +1,6 @@
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class WaifuUpdate : DbEntity
     {

src/NadekoBot/Db/Models/WarnExpireAction.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public enum WarnExpireAction
     {

src/NadekoBot/Db/Models/Warning.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class Warning : DbEntity
     {

src/NadekoBot/Db/Models/WarningPunishment.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class WarningPunishment : DbEntity
     {

src/NadekoBot/Db/Models/XpSettings.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class XpSettings : DbEntity
     {

src/NadekoBot/Db/Models/YtFollowedChannel.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services.Database.Models
+namespace NadekoBot.Services.Database.Models
 {
     public class YtFollowedChannel : DbEntity
     {

src/NadekoBot/Db/NadekoContext.cs

@@ -1,14 +1,14 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
-using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services.Database.Models;
+using NadekoBot.Services;
 using System;
 using System.IO;
 using Microsoft.Extensions.Logging;
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Core.Services.Database
+namespace NadekoBot.Services.Database
 {
     public class NadekoContextFactory : IDesignTimeDbContextFactory<NadekoContext>
     {