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

src/NadekoBot.Coordinator/LogSetup.cs

@@ -4,7 +4,7 @@ using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public static class LogSetup
     {
@@ -28,10 +28,13 @@ namespace NadekoBot.Core.Services
         {
             if(Environment.OSVersion.Platform == PlatformID.Unix)
                 return AnsiConsoleTheme.Code;
+            
+            
 #if DEBUG
             return AnsiConsoleTheme.Code;
-#endif
+#else
             return ConsoleTheme.None;
+#endif
         }
     }
 }

src/NadekoBot.Coordinator/Program.cs

@@ -2,7 +2,7 @@ using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using NadekoBot.Coordinator;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Serilog;
 
 // Additional configuration is required to successfully run gRPC on macOS.

src/NadekoBot.Tests/BotStringsTests.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using AngleSharp.Common;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules;
 using YamlDotNet.Serialization;
 

src/NadekoBot.Tests/GroupGreetTests.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NUnit.Framework;
 
 namespace Nadeko.Tests

src/NadekoBot.Tests/IndexedCollectionTests.cs

@@ -1,5 +1,5 @@
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;

src/NadekoBot.Tests/KwumTests.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using NUnit.Framework;
 
 namespace Nadeko.Tests

src/NadekoBot.Tests/PubSubTests.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using NUnit.Framework;
 using NUnit.Framework.Internal;
 

src/NadekoBot/Bot.cs

@@ -3,9 +3,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using Newtonsoft.Json;
 using StackExchange.Redis;
@@ -17,20 +16,17 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using Discord.Net;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.Configs;
+using NadekoBot.Common.Configs;
 using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Modules.CustomReactions.Services;
 using NadekoBot.Modules.Utility.Services;
 using Serilog;
-using NadekoBot.Services;
 
 namespace NadekoBot
 {

src/NadekoBot/Common/Attributes/Aliases.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 namespace NadekoBot.Common.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]

src/NadekoBot/Common/Attributes/Description.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 
 namespace NadekoBot.Common.Attributes
 {

src/NadekoBot/Common/Attributes/NadekoCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 
 namespace NadekoBot.Common.Attributes
 {

src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace NadekoBot.Common.Attributes

src/NadekoBot/Common/Attributes/Ratelimit.cs

@@ -1,10 +1,10 @@
 using Discord.Commands;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace NadekoBot.Core.Common.Attributes
+namespace NadekoBot.Common.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
     public sealed class RatelimitAttribute : PreconditionAttribute

src/NadekoBot/Common/Attributes/Usage.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 using Newtonsoft.Json;
 
 namespace NadekoBot.Common.Attributes

src/NadekoBot/Common/CmdStrings.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class CmdStrings
     {

src/NadekoBot/Common/Collections/IndexedCollection.cs

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

src/NadekoBot/Common/Configs/BotConfig.cs

@@ -5,7 +5,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Core.Common.Configs
+namespace NadekoBot.Common.Configs
 {
     public sealed class BotConfig
     {

src/NadekoBot/Common/Configs/IConfigSeria.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common.Configs
+namespace NadekoBot.Common.Configs
 {
     /// <summary>
     /// Base interface for available config serializers

src/NadekoBot/Common/DownloadTracker.cs

@@ -1,11 +1,11 @@
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 using Discord;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class DownloadTracker : INService
     {

src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs

@@ -2,9 +2,9 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using NadekoBot.Modules.Music;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Modules.Music.Resolvers;
 using NadekoBot.Modules.Music.Services;

src/NadekoBot/Common/Helpers.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public static class Helpers
     {

src/NadekoBot/Common/INadekoCommandOptions.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public interface INadekoCommandOptions
     {

src/NadekoBot/Common/IPlaceholderProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public interface IPlaceholderProvider
     {

src/NadekoBot/Common/ImageUrls.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class ImageUrls
     {

src/NadekoBot/Common/JsonConverters/Rbga32Converter.cs

@@ -4,7 +4,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace NadekoBot.Core.Common.JsonConverters
+namespace NadekoBot.Common.JsonConverters
 {
     public class Rgba32Converter : JsonConverter<Rgba32>
     {

src/NadekoBot/Common/Kwum.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     // needs proper invalid input check (character array input out of range)
     // needs negative number support

src/NadekoBot/Common/LbOpts.cs

@@ -1,6 +1,6 @@
 using CommandLine;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class LbOpts : INadekoCommandOptions
     {

src/NadekoBot/Common/LoginErrorHandler.cs

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 using Discord.Net;
 using Serilog;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class LoginErrorHandler
     {

src/NadekoBot/Common/NadekoModule.cs

@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using System.Globalization;
 using System.Threading.Tasks;

src/NadekoBot/Common/OptionsParser.cs

@@ -1,6 +1,6 @@
 using CommandLine;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public static class OptionsParser
     {

src/NadekoBot/Common/OsuMapData.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class OsuMapData
     {

src/NadekoBot/Common/OsuUserBets.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class OsuUserBests
     {

src/NadekoBot/Common/Pokemon/PokemonNameId.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common.Pokemon
+namespace NadekoBot.Common.Pokemon
 {
     public class PokemonNameId
     {

src/NadekoBot/Common/Pokemon/SearchPokemon.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Common.Pokemon
+namespace NadekoBot.Common.Pokemon
 {
     public class SearchPokemon
     {

src/NadekoBot/Common/Pokemon/SearchPokemonAbility.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common.Pokemon
+namespace NadekoBot.Common.Pokemon
 {
     public class SearchPokemonAbility
     {

src/NadekoBot/Common/PubSub/EventPubSub.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class EventPubSub : IPubSub
     {

src/NadekoBot/Common/PubSub/IPubSub.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public interface IPubSub
     {

src/NadekoBot/Common/PubSub/ISeria.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public interface ISeria
     {

src/NadekoBot/Common/PubSub/JsonSeria.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
-using NadekoBot.Core.Common.JsonConverters;
+using NadekoBot.Common.JsonConverters;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class JsonSeria : ISeria
     {

src/NadekoBot/Common/PubSub/RedisPubSub.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using Serilog;
 using StackExchange.Redis;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public sealed class RedisPubSub : IPubSub
     {

src/NadekoBot/Common/PubSub/TypedKey.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public readonly struct TypedKey<TData>
     {

src/NadekoBot/Common/PubSub/YamlSeria.cs

@@ -1,9 +1,9 @@
 using System.Text.RegularExpressions;
 using NadekoBot.Common.Yml;
-using NadekoBot.Core.Common.Configs;
+using NadekoBot.Common.Configs;
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public class YamlSeria : IConfigSeria
     {

src/NadekoBot/Common/Replacements/ReplacementBuilder.cs

@@ -9,7 +9,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Common.Replacements
 {

src/NadekoBot/Common/ShmartNumber.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Common
+namespace NadekoBot.Common
 {
     public struct ShmartNumber : IEquatable<ShmartNumber>
     {

src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs

@@ -2,9 +2,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.CustomReactions.Services;
-using NadekoBot.Core.Common.TypeReaders;
+using NadekoBot.Common.TypeReaders;
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
 

src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Discord.Commands;
 using NadekoBot.Modules.Administration.Services;
-using NadekoBot.Core.Common.TypeReaders;
+using NadekoBot.Common.TypeReaders;
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
 

src/NadekoBot/Common/TypeReaders/GuildTypeReader.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
 using Discord.WebSocket;
-using NadekoBot.Core.Common.TypeReaders;
+using NadekoBot.Common.TypeReaders;
 using Discord;
 
 namespace NadekoBot.Common.TypeReaders

src/NadekoBot/Common/TypeReaders/KwumTypeReader.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Discord.Commands;
 using Discord.WebSocket;
 
-namespace NadekoBot.Core.Common.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     public class KwumTypeReader : NadekoTypeReader<kwum>
     {

src/NadekoBot/Common/TypeReaders/Models/StoopidTime.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Core.Common.TypeReaders.Models
+namespace NadekoBot.Common.TypeReaders.Models
 {
     public class StoopidTime
     {

src/NadekoBot/Common/TypeReaders/ModuleTypeReader.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Common.TypeReaders;
+using NadekoBot.Common.TypeReaders;
 using Discord.WebSocket;
 
 namespace NadekoBot.Common.TypeReaders

src/NadekoBot/Common/TypeReaders/NadekoTypeReader.cs

@@ -1,7 +1,7 @@
 using Discord.Commands;
 using Discord.WebSocket;
 
-namespace NadekoBot.Core.Common.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     public abstract class NadekoTypeReader<T> : TypeReader
     {

src/NadekoBot/Common/TypeReaders/PermissionActionTypeReader.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.TypeReaders.Models;
-using NadekoBot.Core.Common.TypeReaders;
+using NadekoBot.Common.TypeReaders;
 
 namespace NadekoBot.Common.TypeReaders
 {

src/NadekoBot/Common/TypeReaders/Rgba32TypeReader.cs

@@ -4,7 +4,7 @@ using Discord.Commands;
 using Discord.WebSocket;
 using SixLabors.ImageSharp;
 
-namespace NadekoBot.Core.Common.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     public class Rgba32TypeReader : NadekoTypeReader<Color>
     {

src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs

@@ -1,14 +1,14 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
 
-namespace NadekoBot.Core.Common.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     public class ShmartNumberTypeReader : NadekoTypeReader<ShmartNumber>
     {

src/NadekoBot/Common/TypeReaders/StoopidTimeTypeReader.cs

@@ -1,10 +1,10 @@
 using Discord.Commands;
 using Discord.WebSocket;
-using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Common.TypeReaders.Models;
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Common.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     public class StoopidTimeTypeReader : NadekoTypeReader<StoopidTime>
     {

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
     {