Merge pull request #1887 from willysunny/patch-2

Included download link, word fix, and style fix

.gitignore

@@ -1,5 +1,10 @@
 #Manually added files
 
+patreon_rewards.json
+command_errors*.txt
+
+src/NadekoBot/Command Errors*.txt
+
 src/NadekoBot/credentials.json
 src/NadekoBot/data/NadekoBot.db
 src/NadekoBot/data/musicdata

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "Discord.Net"]
-	path = Discord.Net
-	url = https://github.com/Kwoth/Discord.Net
-	branch = rogue-dev

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceRoot}/src/NadekoBot/bin/Debug/netcoreapp1.0/NadekoBot.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}/src/NadekoBot",
+            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.1.0",
+    "command": "dotnet",
+    "isShellCommand": true,
+    "args": [],
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": [
+                "${workspaceRoot}/src/NadekoBot/project.json"
+            ],
+            "isBuildCommand": true,
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

NadekoBot.Core/Common/AsyncLazy.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace NadekoBot.DataStructures
+namespace NadekoBot.Common
 {
     public class AsyncLazy<T> : Lazy<Task<T>>
     {

NadekoBot.Core/Common/Attributes/Aliases.cs

@@ -0,0 +1,13 @@
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Core.Services.Impl;
+namespace NadekoBot.Common.Attributes
+{
+    public class Aliases : AliasAttribute
+    {
+        public Aliases([CallerMemberName] string memberName = "") : base(Localization.LoadCommand(memberName.ToLowerInvariant()).Cmd.Split(' ').Skip(1).ToArray())
+        {
+        }
+    }
+}

NadekoBot.Core/Common/Attributes/Description.cs

@@ -0,0 +1,14 @@
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Core.Services.Impl;
+
+namespace NadekoBot.Common.Attributes
+{
+    public class Description : SummaryAttribute
+    {
+        public Description([CallerMemberName] string memberName="") : base(Localization.LoadCommand(memberName.ToLowerInvariant()).Desc)
+        {
+
+        }
+    }
+}

NadekoBot.Core/Common/Attributes/NadekoCommand.cs

@@ -0,0 +1,14 @@
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Core.Services.Impl;
+
+namespace NadekoBot.Common.Attributes
+{
+    public class NadekoCommand : CommandAttribute
+    {
+        public NadekoCommand([CallerMemberName] string memberName="") : base(Localization.LoadCommand(memberName.ToLowerInvariant()).Cmd.Split(' ')[0])
+        {
+
+        }
+    }
+}

NadekoBot.Core/Common/Attributes/NadekoModuleAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using Discord.Commands;
+
+namespace NadekoBot.Common.Attributes
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    sealed class NadekoModuleAttribute : GroupAttribute
+    {
+        public NadekoModuleAttribute(string moduleName) : base(moduleName)
+        {
+        }
+    }
+}
+

NadekoBot.Core/Common/Attributes/NadekoOptions.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Common.Attributes
+{
+    public class NadekoOptions : Attribute
+    {
+        public Type OptionType { get; set; }
+
+        public NadekoOptions(Type t)
+        {
+            this.OptionType = t;
+        }
+    }
+}

NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading.Tasks;
+using Discord.Commands;
+using NadekoBot.Core.Services;
+
+namespace NadekoBot.Common.Attributes
+{
+    public class OwnerOnlyAttribute : PreconditionAttribute
+    {
+        public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo executingCommand, IServiceProvider services)
+        {
+            var creds = (IBotCredentials)services.GetService(typeof(IBotCredentials));
+
+            return Task.FromResult((creds.IsOwner(context.User) || context.Client.CurrentUser.Id == context.User.Id ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner")));
+        }
+    }
+}

NadekoBot.Core/Common/Attributes/Usage.cs

@@ -0,0 +1,23 @@
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Core.Services.Impl;
+using System.Linq;
+using Discord;
+
+namespace NadekoBot.Common.Attributes
+{
+    public class Usage : RemarksAttribute
+    {
+        public Usage([CallerMemberName] string memberName="") : base(Usage.GetUsage(memberName))
+        {
+
+        }
+
+        public static string GetUsage(string memberName)
+        {
+            var usage = Localization.LoadCommand(memberName.ToLowerInvariant()).Usage;
+            return string.Join(" or ", usage
+                .Select(x => Format.Code(x)));
+        }
+    }
+}

NadekoBot.Core/Common/BotConfigEditType.cs

@@ -0,0 +1,26 @@
+namespace NadekoBot.Common
+{
+    public enum BotConfigEditType
+    {
+        BetflipMultiplier,
+        Betroll100Multiplier,
+        Betroll67Multiplier,
+        Betroll91Multiplier,
+        CurrencyGenerationChance,
+        CurrencyGenerationCooldown,
+        CurrencyName,
+        CurrencyPluralName,
+        CurrencySign,
+        DmHelpString,
+        HelpString,
+        CurrencyDropAmount,
+        CurrencyDropAmountMax,
+        MinimumBetAmount,
+        TriviaCurrencyReward,
+        XpPerMessage,
+        XpMinutesTimeout,
+        
+        //ErrorColor, //after i fix the nadekobot.cs static variables
+        //OkColor
+    }
+}

NadekoBot.Core/Common/CREmbed.cs

@@ -1,13 +1,10 @@
-using Discord;
+using System;
+using Discord;
+using NadekoBot.Extensions;
 using Newtonsoft.Json;
 using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace NadekoBot.DataStructures
+namespace NadekoBot.Common
 {
     public class CREmbed
     {
@@ -15,6 +12,7 @@ namespace NadekoBot.DataStructures
         public string PlainText { get; set; }
         public string Title { get; set; }
         public string Description { get; set; }
+        public string Url { get; set; }
         public CREmbedFooter Footer { get; set; }
         public string Thumbnail { get; set; }
         public string Image { get; set; }
@@ -29,6 +27,7 @@ namespace NadekoBot.DataStructures
         public bool IsValid =>
             !string.IsNullOrWhiteSpace(Title) ||
             !string.IsNullOrWhiteSpace(Description) ||
+            !string.IsNullOrWhiteSpace(Url) ||
             !string.IsNullOrWhiteSpace(Thumbnail) ||
             !string.IsNullOrWhiteSpace(Image) ||
             (Footer != null && (!string.IsNullOrWhiteSpace(Footer.Text) || !string.IsNullOrWhiteSpace(Footer.IconUrl))) ||
@@ -36,19 +35,33 @@ namespace NadekoBot.DataStructures
 
         public EmbedBuilder ToEmbed()
         {
-            var embed = new EmbedBuilder()
-                .WithTitle(Title)
-                .WithDescription(Description)
-                .WithColor(new Discord.Color(Color));
+            var embed = new EmbedBuilder();
+
+            if (!string.IsNullOrWhiteSpace(Title))
+                embed.WithTitle(Title);
+            if (!string.IsNullOrWhiteSpace(Description))
+                embed.WithDescription(Description);
+            if (Url != null && Uri.IsWellFormedUriString(Url, UriKind.Absolute))
+                embed.WithUrl(Url);
+            embed.WithColor(new Discord.Color(Color));
             if (Footer != null)
-                embed.WithFooter(efb => efb.WithIconUrl(Footer.IconUrl).WithText(Footer.Text));
-            embed.WithThumbnailUrl(Thumbnail)
-                .WithImageUrl(Image);
+                embed.WithFooter(efb =>
+                {
+                    efb.WithText(Footer.Text);
+                    if (Uri.IsWellFormedUriString(Footer.IconUrl, UriKind.Absolute))
+                        efb.WithIconUrl(Footer.IconUrl);
+                });
+
+            if (Thumbnail != null && Uri.IsWellFormedUriString(Thumbnail, UriKind.Absolute))
+                embed.WithThumbnailUrl(Thumbnail);
+            if(Image != null && Uri.IsWellFormedUriString(Image, UriKind.Absolute))
+                embed.WithImageUrl(Image);
 
             if (Fields != null)
                 foreach (var f in Fields)
                 {
-                    embed.AddField(efb => efb.WithName(f.Name).WithValue(f.Value).WithIsInline(f.Inline));
+                    if(!string.IsNullOrWhiteSpace(f.Name) && !string.IsNullOrWhiteSpace(f.Value))
+                        embed.AddField(efb => efb.WithName(f.Name).WithValue(f.Value).WithIsInline(f.Inline));
                 }
 
             return embed;
@@ -63,7 +76,13 @@ namespace NadekoBot.DataStructures
             try
             {
                 var crembed = JsonConvert.DeserializeObject<CREmbed>(input);
-
+                
+                if(crembed.Fields != null && crembed.Fields.Length > 0)
+                    foreach (var f in crembed.Fields)
+                    {
+                        f.Name = f.Name.TrimTo(256);
+                        f.Value = f.Value.TrimTo(1024);
+                    }
                 if (!crembed.IsValid)
                     return false;
 

NadekoBot.Core/Common/Caching/FactoryCache.cs

@@ -0,0 +1,49 @@
+using System;
+
+namespace NadekoBot.Core.Common.Caching
+{
+    /// <summary>
+    /// A caching object which loads its value with a factory method when it expires.
+    /// </summary>
+    /// <typeparam name="T">Type of the value which is cached.</typeparam>
+    public class FactoryCache<T> : IFactoryCache
+    {
+        public DateTime LastUpdate { get; set; } = DateTime.MinValue;
+        private readonly object _locker = new object();
+        private TimeSpan _expireAfter;
+        private readonly Func<T> _factory;
+        private T Value;
+
+        /// <summary>
+        /// Creates a new factory cache object.
+        /// </summary>
+        /// <param name="factory">Method which loads the value when it expires or if it's not loaded the first time.</param>
+        /// <param name="expireAfter">Time after which the value will be reloaded.</param>
+        /// <param name="loadImmediately">Should the value be loaded right away. If set to false, value will load when it's first retrieved.</param>
+        public FactoryCache(Func<T> factory, TimeSpan expireAfter, 
+            bool loadImmediately = false)
+        {
+            _expireAfter = expireAfter;
+            _factory = factory;
+            if (loadImmediately)
+            {
+                Value = _factory();
+                LastUpdate = DateTime.UtcNow;
+            }
+        }
+
+        public T GetValue()
+        {
+            lock (_locker)
+            {
+                if (DateTime.UtcNow - LastUpdate > _expireAfter)
+                {
+                    LastUpdate = DateTime.UtcNow;
+                    return Value = _factory();
+                }
+
+                return Value;
+            }
+        }
+    }
+}

NadekoBot.Core/Common/Caching/IFactoryCache.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Core.Common.Caching
+{
+    public interface IFactoryCache
+    {
+        
+    }
+}

NadekoBot.Core/Common/Collections/ConcurrentHashSet.cs

@@ -1,13 +1,14 @@
 // License MIT
 // Source: https://github.com/i3arnon/ConcurrentHashSet
 
-using ConcurrentCollections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 
-namespace System.Collections.Concurrent
+namespace NadekoBot.Common.Collections
 {
     /// <summary>
     /// Represents a thread-safe hash-based unique collection.

NadekoBot.Core/Common/Collections/DisposableImutableList.cs

@@ -1,14 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace NadekoBot.DataStructures
+namespace NadekoBot.Common.Collections
 {
-
     public static class DisposableReadOnlyListExtensions
     {
         public static IDisposableReadOnlyList<T> AsDisposable<T>(this IReadOnlyList<T> arr) where T : IDisposable

NadekoBot.Core/Common/Collections/IndexedCollection.cs

@@ -1,15 +1,19 @@
-using NadekoBot.Services.Database.Models;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.DataStructures
+namespace NadekoBot.Common.Collections
 {
-    public class IndexedCollection<T> : IList<T> where T : IIndexed
+    public class IndexedCollection<T> : IList<T> where T : class, IIndexed
     {
         public List<T> Source { get; }
         private readonly object _locker = new object();
 
+        public IndexedCollection()
+        {
+            Source = new List<T>();
+        }
         public IndexedCollection(IEnumerable<T> source)
         {
             lock (_locker)

NadekoBot.Core/Common/Collections/PoopyRingBuffer.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Threading;
+
+namespace NadekoBot.Common.Collections
+{
+    public class PoopyRingBuffer : IDisposable
+    {
+        // readpos == writepos means empty
+        // writepos == readpos - 1 means full 
+
+        private byte[] _buffer;
+        public int Capacity { get; }
+
+        private int ReadPos { get; set; } = 0;
+        private int WritePos { get; set; } = 0;
+
+        public int Length => ReadPos <= WritePos 
+            ? WritePos - ReadPos 
+            : Capacity - (ReadPos - WritePos);
+
+        public int RemainingCapacity
+        {
+            get => Capacity - Length - 1;
+        }
+
+        private readonly SemaphoreSlim _locker = new SemaphoreSlim(1, 1);
+
+        public PoopyRingBuffer(int capacity = 81920 * 100)
+        {
+            this.Capacity = capacity + 1;
+            this._buffer = new byte[this.Capacity];
+        }
+
+        public int Read(byte[] b, int offset, int toRead)
+        {
+            if (WritePos == ReadPos)
+                return 0;
+
+            if (toRead > Length)
+                toRead = Length;
+
+            if (WritePos > ReadPos)
+            {
+                Array.Copy(_buffer, ReadPos, b, offset, toRead);
+                ReadPos += toRead;
+            }
+            else
+            {
+                var toEnd = Capacity - ReadPos;
+                var firstRead = toRead > toEnd ?
+                    toEnd :
+                    toRead;
+                Array.Copy(_buffer, ReadPos, b, offset, firstRead);
+                ReadPos += firstRead;
+                var secondRead = toRead - firstRead;
+                if (secondRead > 0)
+                {
+                    Array.Copy(_buffer, 0, b, offset + firstRead, secondRead);
+                    ReadPos = secondRead;
+                }
+            }
+            return toRead;
+        }
+
+        public bool Write(byte[] b, int offset, int toWrite)
+        {
+            while (toWrite > RemainingCapacity)
+                return false;
+
+            if (toWrite == 0)
+                return true;
+
+            if (WritePos < ReadPos)
+            {
+                Array.Copy(b, offset, _buffer, WritePos, toWrite);
+                WritePos += toWrite;
+            }
+            else
+            {
+                var toEnd = Capacity - WritePos;
+                var firstWrite = toWrite > toEnd ?
+                    toEnd :
+                    toWrite;
+                Array.Copy(b, offset, _buffer, WritePos, firstWrite);
+                var secondWrite = toWrite - firstWrite;
+                if (secondWrite > 0)
+                {
+                    Array.Copy(b, offset + firstWrite, _buffer, 0, secondWrite);
+                    WritePos = secondWrite;
+                }
+                else
+                {
+                    WritePos += firstWrite;
+                    if (WritePos == Capacity)
+                        WritePos = 0;
+                }
+            }
+            return true;
+        }
+
+        public void Dispose()
+        {
+            _buffer = null;
+        }
+    }
+}

NadekoBot.Core/Common/CommandData.cs

@@ -0,0 +1,9 @@
+namespace NadekoBot.Common
+{
+    public class CommandData
+    {
+        public string Cmd { get; set; }
+        public string Desc { get; set; }
+        public string[] Usage { get; set; }
+    }
+}

NadekoBot.Core/Common/INadekoCommandOptions.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Core.Common
+{
+    public interface INadekoCommandOptions
+    {
+        void NormalizeOptions();
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/IEarlyBlocker.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using Discord;
+
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    /// <summary>
+    /// Implemented by modules which block execution before anything is executed
+    /// </summary>
+    public interface IEarlyBlocker
+    {
+        Task<bool> TryBlockEarly(IGuild guild, IUserMessage msg);
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/IEarlyBlockingExecutor.cs

@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using Discord;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    /// <summary>
+    /// Implemented by modules which can execute something and prevent further commands from being executed.
+    /// </summary>
+    public interface IEarlyBlockingExecutor
+    {
+        /// <summary>
+        /// Try to execute some logic within some module's service.
+        /// </summary>
+        /// <returns>Whether it should block other command executions after it.</returns>
+        Task<bool> TryExecuteEarly(DiscordSocketClient client, IGuild guild, IUserMessage msg);
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/IEarlyExecutor.cs

@@ -0,0 +1,7 @@
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    public interface IEarlyExecutor
+    {
+        
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/IINputTransformer.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Discord;
+
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    public interface IInputTransformer
+    {
+        Task<string> TransformInput(IGuild guild, IMessageChannel channel, IUser user, string input);
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/ILateBlocker.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Discord;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    public interface ILateBlocker
+    {
+        Task<bool> TryBlockLate(DiscordSocketClient client, IUserMessage msg, IGuild guild, 
+            IMessageChannel channel, IUser user, string moduleName, string commandName);
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/ILateBlockingExecutor.cs

@@ -0,0 +1,7 @@
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    public interface ILateBlockingExecutor
+    {
+        
+    }
+}

NadekoBot.Core/Common/ModuleBehaviors/ILateExecutor.cs

@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+using Discord;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.ModuleBehaviors
+{
+    /// <summary>
+    /// Last thing to be executed, won't stop further executions
+    /// </summary>
+    public interface ILateExecutor
+    {
+        Task LateExecute(DiscordSocketClient client, IGuild guild, IUserMessage msg);
+    }
+}

NadekoBot.Core/Common/NadekoModule.cs

@@ -1,11 +1,12 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
+using NadekoBot.Core.Services;
 using NLog;
-using System;
-using System.Collections.Concurrent;
 using System.Globalization;
 using System.Threading.Tasks;
+using Discord.WebSocket;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Modules
 {
@@ -13,26 +14,27 @@ namespace NadekoBot.Modules
     {
         protected readonly Logger _log;
         protected CultureInfo _cultureInfo;
-        public readonly string Prefix;
+
         public readonly string ModuleTypeName;
         public readonly string LowerModuleTypeName;
 
+        public NadekoStrings _strings { get; set; }
+        public CommandHandler _cmdHandler { get; set; }
+        public ILocalization _localization { get; set; }
+
+        public string Prefix => _cmdHandler.GetPrefix(Context.Guild);
+
         protected NadekoTopLevelModule(bool isTopLevelModule = true)
         {
             //if it's top level module
             ModuleTypeName = isTopLevelModule ? this.GetType().Name : this.GetType().DeclaringType.Name;
             LowerModuleTypeName = ModuleTypeName.ToLowerInvariant();
-
-            if (!NadekoBot.ModulePrefixes.TryGetValue(ModuleTypeName, out Prefix))
-                Prefix = "?err?";
             _log = LogManager.GetCurrentClassLogger();
         }
 
-        protected override void BeforeExecute()
+        protected override void BeforeExecute(CommandInfo cmd)
         {
-            _cultureInfo = NadekoBot.Localization.GetCultureInfo(Context.Guild?.Id);
-
-            _log.Info("Culture info is {0}", _cultureInfo);
+            _cultureInfo = _localization.GetCultureInfo(Context.Guild?.Id);
         }
 
         //public Task<IUserMessage> ReplyConfirmLocalized(string titleKey, string textKey, string url = null, string footer = null)
@@ -55,45 +57,11 @@ namespace NadekoBot.Modules
         //    return Context.Channel.SendErrorAsync(title, text, url, footer);
         //}
 
-        /// <summary>
-        /// Used as failsafe in case response key doesn't exist in the selected or default language.
-        /// </summary>
-        private static readonly CultureInfo _usCultureInfo = new CultureInfo("en-US");
-
-        public static string GetTextStatic(string key, CultureInfo cultureInfo, string lowerModuleTypeName)
-        {
-            var text = NadekoBot.ResponsesResourceManager.GetString(lowerModuleTypeName + "_" + key, cultureInfo);
-
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                LogManager.GetCurrentClassLogger().Warn(lowerModuleTypeName + "_" + key + " key is missing from " + cultureInfo + " response strings. PLEASE REPORT THIS.");
-                text = NadekoBot.ResponsesResourceManager.GetString(lowerModuleTypeName + "_" + key, _usCultureInfo) ?? $"Error: dkey {lowerModuleTypeName + "_" + key} not found!";
-                if (string.IsNullOrWhiteSpace(text))
-                    return "I can't tell you if the command is executed, because there was an error printing out the response. Key '" +
-                        lowerModuleTypeName + "_" + key + "' " + "is missing from resources. Please report this.";
-            }
-            return text;
-        }
-
-        public static string GetTextStatic(string key, CultureInfo cultureInfo, string lowerModuleTypeName,
-            params object[] replacements)
-        {
-            try
-            {
-                return string.Format(GetTextStatic(key, cultureInfo, lowerModuleTypeName), replacements);
-            }
-            catch (FormatException)
-            {
-                return "I can't tell you if the command is executed, because there was an error printing out the response. Key '" +
-                       lowerModuleTypeName + "_" + key + "' " + "is not properly formatted. Please report this.";
-            }
-        }
-
         protected string GetText(string key) =>
-            GetTextStatic(key, _cultureInfo, LowerModuleTypeName);
+            _strings.GetText(key, _cultureInfo, LowerModuleTypeName);
 
         protected string GetText(string key, params object[] replacements) =>
-            GetTextStatic(key, _cultureInfo, LowerModuleTypeName, replacements);
+            _strings.GetText(key, _cultureInfo, LowerModuleTypeName, replacements);
 
         public Task<IUserMessage> ErrorLocalized(string textKey, params object[] replacements)
         {
@@ -118,9 +86,66 @@ namespace NadekoBot.Modules
             var text = GetText(textKey, replacements);
             return Context.Channel.SendConfirmAsync(Context.User.Mention + " " + text);
         }
+        
+        // TypeConverter typeConverter = TypeDescriptor.GetConverter(propType); ?
+        public async Task<string> GetUserInputAsync(ulong userId, ulong channelId)
+        {
+            var userInputTask = new TaskCompletionSource<string>();
+            var dsc = (DiscordSocketClient)Context.Client;
+            try
+            {
+                dsc.MessageReceived += MessageReceived;
+
+                if ((await Task.WhenAny(userInputTask.Task, Task.Delay(10000))) != userInputTask.Task)
+                {
+                    return null;
+                }
+
+                return await userInputTask.Task;
+            }
+            finally
+            {
+                dsc.MessageReceived -= MessageReceived;
+            }
+
+            Task MessageReceived(SocketMessage arg)
+            {
+                var _ = Task.Run(() =>
+                {
+                    if (!(arg is SocketUserMessage userMsg) ||
+                        !(userMsg.Channel is ITextChannel chan) ||
+                        userMsg.Author.Id != userId ||
+                        userMsg.Channel.Id != channelId)
+                    {
+                        return Task.CompletedTask;
+                    }
+
+                    if (userInputTask.TrySetResult(arg.Content))
+                    {
+                        userMsg.DeleteAfter(1);
+                    }
+                    return Task.CompletedTask;
+                });
+                return Task.CompletedTask;
+            }
+        }
+    }
+    
+    public abstract class NadekoTopLevelModule<TService> : NadekoTopLevelModule where TService : INService
+    {
+        public TService _service { get; set; }
+
+        public NadekoTopLevelModule(bool isTopLevel = true) : base(isTopLevel)
+        {
+        }
     }
 
     public abstract class NadekoSubmodule : NadekoTopLevelModule
+    {
+        protected NadekoSubmodule() : base(false) { }
+    }
+
+    public abstract class NadekoSubmodule<TService> : NadekoTopLevelModule<TService> where TService : INService
     {
         protected NadekoSubmodule() : base(false)
         {

NadekoBot.Core/Common/NadekoModuleExtensions.cs

@@ -0,0 +1,7 @@
+namespace NadekoBot.Modules
+{
+    public static class NadekoModuleExtensions
+    {
+        
+    }
+}

NadekoBot.Core/Common/NadekoRandom.cs

@@ -1,26 +1,21 @@
 using System;
 using System.Security.Cryptography;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Common
 {
     public class NadekoRandom : Random
     {
-        RandomNumberGenerator rng;
+        readonly RandomNumberGenerator _rng;
 
         public NadekoRandom() : base()
         {
-            rng = RandomNumberGenerator.Create();
-        }
-
-        private NadekoRandom(int Seed) : base(Seed)
-        {
-            rng = RandomNumberGenerator.Create();
+            _rng = RandomNumberGenerator.Create();
         }
 
         public override int Next()
         {
             var bytes = new byte[sizeof(int)];
-            rng.GetBytes(bytes);
+            _rng.GetBytes(bytes);
             return Math.Abs(BitConverter.ToInt32(bytes, 0));
         }
 
@@ -29,7 +24,7 @@ namespace NadekoBot.Services
             if (maxValue <= 0)
                 throw new ArgumentOutOfRangeException();
             var bytes = new byte[sizeof(int)];
-            rng.GetBytes(bytes);
+            _rng.GetBytes(bytes);
             return Math.Abs(BitConverter.ToInt32(bytes, 0)) % maxValue;
         }
 
@@ -40,27 +35,27 @@ namespace NadekoBot.Services
             if (minValue == maxValue)
                 return minValue;
             var bytes = new byte[sizeof(int)];
-            rng.GetBytes(bytes);
+            _rng.GetBytes(bytes);
             var sign = Math.Sign(BitConverter.ToInt32(bytes, 0));
             return (sign * BitConverter.ToInt32(bytes, 0)) % (maxValue - minValue) + minValue;
         }
 
         public override void NextBytes(byte[] buffer)
         {
-            rng.GetBytes(buffer);
+            _rng.GetBytes(buffer);
         }
 
         protected override double Sample()
         {
             var bytes = new byte[sizeof(double)];
-            rng.GetBytes(bytes);
+            _rng.GetBytes(bytes);
             return Math.Abs(BitConverter.ToDouble(bytes, 0) / double.MaxValue + 1);
         }
 
         public override double NextDouble()
         {
             var bytes = new byte[sizeof(double)];
-            rng.GetBytes(bytes);
+            _rng.GetBytes(bytes);
             return BitConverter.ToDouble(bytes, 0);
         }
     }

NadekoBot.Core/Common/NoPublicBotPrecondition.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Threading.Tasks;
+using Discord.Commands;
+
+namespace NadekoBot.Common
+{
+    public class NoPublicBot : PreconditionAttribute
+    {
+        public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
+        {
+#if GLOBAL_NADEKo
+            return Task.FromResult(PreconditionResult.FromError("Not available on the public bot"));
+#else
+            return Task.FromResult(PreconditionResult.FromSuccess());
+#endif
+        }
+    }
+}

NadekoBot.Core/Common/OptionsParser.cs

@@ -0,0 +1,20 @@
+using CommandLine;
+
+namespace NadekoBot.Core.Common
+{
+    public class OptionsParser
+    {
+        private static OptionsParser _instance = new OptionsParser();
+        public static OptionsParser Default => _instance;
+
+        static OptionsParser() { }
+
+        public T ParseFrom<T>(T options, string[] args) where T : INadekoCommandOptions
+        {
+            var res = Parser.Default.ParseArguments<T>(args);
+            options = (T)res.MapResult(x => x, x => options);
+            options.NormalizeOptions();
+            return options;
+        }
+    }
+}

NadekoBot.Core/Common/PlatformHelper.cs

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

NadekoBot.Core/Common/Pokemon/PokemonNameId.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot.Core.Common.Pokemon
+{
+    public class PokemonNameId
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

NadekoBot.Core/Common/Pokemon/SearchPokemon.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Modules.Searches.Models
+namespace NadekoBot.Core.Common.Pokemon
 {
     public class SearchPokemon
     {
@@ -9,6 +9,7 @@ namespace NadekoBot.Modules.Searches.Models
             public float M { get; set; }
             public float F { get; set; }
         }
+
         public class BaseStatsClass
         {
             public int HP { get; set; }
@@ -21,6 +22,7 @@ namespace NadekoBot.Modules.Searches.Models
             public override string ToString() => $@"**HP:**  {HP,-4} **ATK:** {ATK,-4} **DEF:** {DEF,-4}
 **SPA:** {SPA,-4} **SPD:** {SPD,-4} **SPE:** {SPE,-4}";
         }
+
         public int Id { get; set; }
         public string Species { get; set; }
         public string[] Types { get; set; }
@@ -32,24 +34,5 @@ namespace NadekoBot.Modules.Searches.Models
         public string Color { get; set; }
         public string[] Evos { get; set; }
         public string[] EggGroups { get; set; }
-
-//        public override string ToString() => $@"`Name:` {Species}
-//`Types:` {string.Join(", ", Types)}
-//`Stats:` {BaseStats}
-//`Height:` {HeightM,4}m `Weight:` {WeightKg}kg
-//`Abilities:` {string.Join(", ", Abilities.Values)}";
-
-    }
-
-    public class SearchPokemonAbility
-    {
-        public string Desc { get; set; }
-        public string ShortDesc { get; set; }
-        public string Name { get; set; }
-        public float Rating { get; set; }
-
-//        public override string ToString() => $@"`Name:` : {Name}
-//`Rating:` {Rating}
-//`Description:` {Desc}";
     }
 }

NadekoBot.Core/Common/Pokemon/SearchPokemonAbility.cs

@@ -0,0 +1,10 @@
+namespace NadekoBot.Core.Common.Pokemon
+{
+    public class SearchPokemonAbility
+    {
+        public string Desc { get; set; }
+        public string ShortDesc { get; set; }
+        public string Name { get; set; }
+        public float Rating { get; set; }
+    }
+}

NadekoBot.Core/Common/Replacements/ReplacementBuilder.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Extensions;
+using NadekoBot.Modules.Music.Services;
+using NadekoBot.Modules.Administration.Services;
+
+namespace NadekoBot.Common.Replacements
+{
+    public class ReplacementBuilder
+    {
+        private static readonly Regex rngRegex = new Regex("%rng(?:(?<from>(?:-)?\\d+)-(?<to>(?:-)?\\d+))?%", RegexOptions.Compiled);
+        private ConcurrentDictionary<string, Func<string>> _reps = new ConcurrentDictionary<string, Func<string>>();
+        private ConcurrentDictionary<Regex, Func<Match, string>> _regex = new ConcurrentDictionary<Regex, Func<Match, string>>();
+
+        public ReplacementBuilder()
+        {
+            WithRngRegex();
+        }
+
+        public ReplacementBuilder WithDefault(IUser usr, IMessageChannel ch, IGuild g, DiscordSocketClient client)
+        {
+            return this.WithUser(usr)
+                .WithChannel(ch)
+                .WithServer(client, g)
+                .WithClient(client);
+        }
+
+        public ReplacementBuilder WithDefault(ICommandContext ctx) =>
+            WithDefault(ctx.User, ctx.Channel, ctx.Guild, (DiscordSocketClient)ctx.Client);
+
+        public ReplacementBuilder WithClient(DiscordSocketClient client)
+        {
+            _reps.TryAdd("%mention%", () => $"<@{client.CurrentUser.Id}>");
+            _reps.TryAdd("%shardid%", () => client.ShardId.ToString());
+            _reps.TryAdd("%time%", () => DateTime.Now.ToString("HH:mm " + TimeZoneInfo.Local.StandardName.GetInitials()));
+            return this;
+        }
+
+        public ReplacementBuilder WithServer(DiscordSocketClient client, IGuild g)
+        {
+
+            _reps.TryAdd("%sid%", () => g == null ? "DM" : g.Id.ToString());
+            _reps.TryAdd("%server%", () => g == null ? "DM" : g.Name);
+            _reps.TryAdd("%server_time%", () =>
+            {
+                TimeZoneInfo to = TimeZoneInfo.Local;
+                if (g != null)
+                {
+                    if (GuildTimezoneService.AllServices.TryGetValue(client.CurrentUser.Id, out var tz))
+                        to = tz.GetTimeZoneOrDefault(g.Id) ?? TimeZoneInfo.Local;
+                }
+
+                return TimeZoneInfo.ConvertTime(DateTime.UtcNow,
+                    TimeZoneInfo.Utc,
+                    to).ToString("HH:mm ") + to.StandardName.GetInitials();
+            });
+            return this;
+        }
+
+        public ReplacementBuilder WithChannel(IMessageChannel ch)
+        {
+            _reps.TryAdd("%channel%", () => (ch as ITextChannel)?.Mention ?? "#" + ch.Name);
+            _reps.TryAdd("%chname%", () => ch.Name);
+            _reps.TryAdd("%cid%", () => ch?.Id.ToString());
+            return this;
+        }
+
+        public ReplacementBuilder WithUser(IUser user)
+        {
+            _reps.TryAdd("%user%", () => user.Mention);
+            _reps.TryAdd("%userfull%", () => user.ToString());
+            _reps.TryAdd("%username%", () => user.Username);
+            _reps.TryAdd("%userdiscrim%", () => user.Discriminator);
+            _reps.TryAdd("%id%", () => user.Id.ToString());
+            _reps.TryAdd("%uid%", () => user.Id.ToString());
+            return this;
+        }
+
+        public ReplacementBuilder WithStats(DiscordSocketClient c)
+        {
+            _reps.TryAdd("%servers%", () => c.Guilds.Count.ToString());
+            _reps.TryAdd("%users%", () => c.Guilds.Sum(s => s.Users.Count).ToString());
+            return this;
+        }
+
+        public ReplacementBuilder WithMusic(MusicService ms)
+        {
+            _reps.TryAdd("%playing%", () =>
+            {
+                var cnt = ms.MusicPlayers.Count(kvp => kvp.Value.Current.Current != null);
+                if (cnt != 1) return cnt.ToString();
+                try
+                {
+                    var mp = ms.MusicPlayers.FirstOrDefault();
+                    var title = mp.Value?.Current.Current?.Title;
+                    return title ?? "No songs";
+                }
+                catch
+                {
+                    return "error";
+                }
+            });
+            _reps.TryAdd("%queued%", () => ms.MusicPlayers.Sum(kvp => kvp.Value.QueueArray().Songs.Length).ToString());
+            return this;
+        }
+
+        public ReplacementBuilder WithRngRegex()
+        {
+            var rng = new NadekoRandom();
+            _regex.TryAdd(rngRegex, (match) =>
+            {
+                int from = 0;
+                int.TryParse(match.Groups["from"].ToString(), out from);
+
+                int to = 0;
+                int.TryParse(match.Groups["to"].ToString(), out to);
+
+                if (from == 0 && to == 0)
+                {
+                    return rng.Next(0, 11).ToString();
+                }
+
+                if (from >= to)
+                    return string.Empty;
+
+                return rng.Next(from, to + 1).ToString();
+            });
+            return this;
+        }
+
+        public ReplacementBuilder WithOverride(string key, Func<string> output)
+        {
+            _reps.AddOrUpdate(key, output, delegate { return output; });
+            return this;
+        }
+
+        public Replacer Build()
+        {
+            return new Replacer(_reps.Select(x => (x.Key, x.Value)).ToArray(), _regex.Select(x => (x.Key, x.Value)).ToArray());
+        }
+    }
+}

NadekoBot.Core/Common/Replacements/Replacer.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace NadekoBot.Common.Replacements
+{
+    public class Replacer
+    {
+        private readonly IEnumerable<(string Key, Func<string> Text)> _replacements;
+        private readonly IEnumerable<(Regex Regex, Func<Match, string> Replacement)> _regex;
+
+        public Replacer(IEnumerable<(string, Func<string>)> replacements, IEnumerable<(Regex, Func<Match, string>)> regex)
+        {
+            _replacements = replacements;
+            _regex = regex;
+        }
+
+        public string Replace(string input)
+        {
+            if (string.IsNullOrWhiteSpace(input))
+                return input;
+
+            foreach (var item in _replacements)
+            {
+                if (input.Contains(item.Key))
+                    input = input.Replace(item.Key, item.Text());
+            }
+
+            foreach (var item in _regex)
+            {
+                input = item.Regex.Replace(input, (m) => item.Replacement(m));
+            }
+
+            return input;
+        }
+
+        public void Replace(CREmbed embedData)
+        {
+            embedData.PlainText = Replace(embedData.PlainText);
+            embedData.Description = Replace(embedData.Description);
+            embedData.Title = Replace(embedData.Title);
+
+            if (embedData.Fields != null)
+                foreach (var f in embedData.Fields)
+                {
+                    f.Name = Replace(f.Name);
+                    f.Value = Replace(f.Value);
+                }
+
+            if (embedData.Footer != null)
+                embedData.Footer.Text = Replace(embedData.Footer.Text);
+        }
+    }
+}

NadekoBot.Core/Common/ShardCom/ShardComMessage.cs

@@ -0,0 +1,22 @@
+using System;
+using Discord;
+
+namespace NadekoBot.Common.ShardCom
+{
+    public class ShardComMessage
+    {
+        public int ShardId { get; set; }
+        public ConnectionState ConnectionState { get; set; }
+        public int Guilds { get; set; }
+        public DateTime Time { get; set; }
+
+        public ShardComMessage Clone() =>
+            new ShardComMessage
+            {
+                ShardId = ShardId,
+                ConnectionState = ConnectionState,
+                Guilds = Guilds,
+                Time = Time,
+            };
+    }
+}

NadekoBot.Core/Common/ShardCom/ShardComServer.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NadekoBot.Core.Services;
+
+namespace NadekoBot.Common.ShardCom
+{
+    public class ShardComServer
+    {
+        private readonly IDataCache _cache;
+
+        public ShardComServer(IDataCache cache)
+        {
+            _cache = cache;
+        }
+
+        public void Start()
+        {
+            var sub = _cache.Redis.GetSubscriber();
+            sub.SubscribeAsync("shardcoord_send", (ch, data) =>
+            {
+                var _ = OnDataReceived(JsonConvert.DeserializeObject<ShardComMessage>(data));
+            }, StackExchange.Redis.CommandFlags.FireAndForget);
+        }
+
+        public event Func<ShardComMessage, Task> OnDataReceived = delegate { return Task.CompletedTask; };
+    }
+}

NadekoBot.Core/Common/SocketMessageEventWrapper.cs

@@ -0,0 +1,91 @@
+using Discord;
+using Discord.WebSocket;
+using System;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Common
+{
+    public class ReactionEventWrapper : IDisposable
+    {
+        public IUserMessage Message { get; }
+        public event Action<SocketReaction> OnReactionAdded = delegate { };
+        public event Action<SocketReaction> OnReactionRemoved = delegate { };
+        public event Action OnReactionsCleared = delegate { };
+
+        public ReactionEventWrapper(DiscordSocketClient client, IUserMessage msg)
+        {
+            Message = msg ?? throw new ArgumentNullException(nameof(msg));
+            _client = client;
+
+            _client.ReactionAdded += Discord_ReactionAdded;
+            _client.ReactionRemoved += Discord_ReactionRemoved;
+            _client.ReactionsCleared += Discord_ReactionsCleared;
+        }
+
+        private Task Discord_ReactionsCleared(Cacheable<IUserMessage, ulong> msg, ISocketMessageChannel channel)
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    if (msg.Id == Message.Id)
+                        OnReactionsCleared?.Invoke();
+                }
+                catch { }
+            });
+
+            return Task.CompletedTask;
+        }
+
+        private Task Discord_ReactionRemoved(Cacheable<IUserMessage, ulong> msg, ISocketMessageChannel channel, SocketReaction reaction)
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    if (msg.Id == Message.Id)
+                        OnReactionRemoved?.Invoke(reaction);
+                }
+                catch { }
+            });
+
+            return Task.CompletedTask;
+        }
+
+        private Task Discord_ReactionAdded(Cacheable<IUserMessage, ulong> msg, ISocketMessageChannel channel, SocketReaction reaction)
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    if (msg.Id == Message.Id)
+                        OnReactionAdded?.Invoke(reaction);
+                }
+                catch { }
+            });
+
+            return Task.CompletedTask;
+        }
+
+        public void UnsubAll()
+        {
+            _client.ReactionAdded -= Discord_ReactionAdded;
+            _client.ReactionRemoved -= Discord_ReactionRemoved;
+            _client.ReactionsCleared -= Discord_ReactionsCleared;
+            OnReactionAdded = null;
+            OnReactionRemoved = null;
+            OnReactionsCleared = null;
+        }
+
+        private bool disposing = false;
+        private readonly DiscordSocketClient _client;
+
+        public void Dispose()
+        {
+            if (disposing)
+                return;
+            disposing = true;
+            UnsubAll();
+        }
+    }
+}

NadekoBot.Core/Common/TypeReaders/AddRemove.cs

@@ -0,0 +1,9 @@
+namespace NadekoBot.Common.TypeReaders
+{
+    public enum AddRemove
+    {
+        Add = 0,
+        Rem = 1,
+        Rm = 1,
+    }
+}

NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Discord.Commands;
+using NadekoBot.Core.Services;
+using NadekoBot.Modules.CustomReactions.Services;
+using NadekoBot.Core.Common.TypeReaders;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.TypeReaders
+{
+    public class CommandTypeReader : NadekoTypeReader<CommandInfo>
+    {
+        public CommandTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider services)
+        {
+            var _cmds = ((INServiceProvider)services).GetService<CommandService>();
+            var _cmdHandler = ((INServiceProvider)services).GetService<CommandHandler>();
+            input = input.ToUpperInvariant();
+            var prefix = _cmdHandler.GetPrefix(context.Guild);
+            if (!input.StartsWith(prefix.ToUpperInvariant()))
+                return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "No such command found."));
+
+            input = input.Substring(prefix.Length);
+
+            var cmd = _cmds.Commands.FirstOrDefault(c => 
+                c.Aliases.Select(a => a.ToUpperInvariant()).Contains(input));
+            if (cmd == null)
+                return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "No such command found."));
+
+            return Task.FromResult(TypeReaderResult.FromSuccess(cmd));
+        }
+    }
+
+    public class CommandOrCrTypeReader : NadekoTypeReader<CommandOrCrInfo>
+    {
+        private readonly DiscordSocketClient _client;
+        private readonly CommandService _cmds;
+        public CommandOrCrTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+            _client = client;
+            _cmds = cmds;
+        }
+
+        public override async Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider services)
+        {
+            input = input.ToUpperInvariant();
+
+            var _crs = ((INServiceProvider)services).GetService<CustomReactionsService>();
+
+            if (_crs.GlobalReactions.Any(x => x.Trigger.ToUpperInvariant() == input))
+            {
+                return TypeReaderResult.FromSuccess(new CommandOrCrInfo(input));
+            }
+            var guild = context.Guild;
+            if (guild != null)
+            {
+                if (_crs.GuildReactions.TryGetValue(guild.Id, out var crs))
+                {
+                    if (crs.Concat(_crs.GlobalReactions).Any(x => x.Trigger.ToUpperInvariant() == input))
+                    {
+                        return TypeReaderResult.FromSuccess(new CommandOrCrInfo(input));
+                    }
+                }
+            }
+
+            var cmd = await new CommandTypeReader(_client, _cmds).ReadAsync(context, input, services);
+            if (cmd.IsSuccess)
+            {
+                return TypeReaderResult.FromSuccess(new CommandOrCrInfo(((CommandInfo)cmd.Values.First().Value).Name));
+            }
+            return TypeReaderResult.FromError(CommandError.ParseFailed, "No such command or cr found.");
+        }
+    }
+
+    public class CommandOrCrInfo
+    {
+        public string Name { get; set; }
+
+        public CommandOrCrInfo(string input)
+        {
+            this.Name = input;
+        }
+    }
+}

NadekoBot.Core/Common/TypeReaders/GuildDateTimeTypeReader.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Discord.Commands;
+using NadekoBot.Modules.Administration.Services;
+using NadekoBot.Core.Common.TypeReaders;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.TypeReaders
+{
+    public class GuildDateTimeTypeReader : NadekoTypeReader<GuildDateTime>
+    {
+        public GuildDateTimeTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider services)
+        {
+            var _gts = (GuildTimezoneService)services.GetService(typeof(GuildTimezoneService));
+            if (!DateTime.TryParse(input, out var dt))
+                return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "Input string is in an incorrect format."));
+
+            var tz = _gts.GetTimeZoneOrUtc(context.Guild.Id);
+
+            return Task.FromResult(TypeReaderResult.FromSuccess(new GuildDateTime(tz, dt)));
+        }
+    }
+
+    public class GuildDateTime
+    {
+        public TimeZoneInfo Timezone { get; }
+        public DateTime CurrentGuildTime { get; }
+        public DateTime InputTime { get; }
+        public DateTime InputTimeUtc { get; }
+
+        private GuildDateTime() { }
+
+        public GuildDateTime(TimeZoneInfo guildTimezone, DateTime inputTime)
+        {
+            var now = DateTime.UtcNow;
+            Timezone = guildTimezone;
+            CurrentGuildTime = TimeZoneInfo.ConvertTime(now, TimeZoneInfo.Utc, Timezone);
+            InputTime = inputTime;
+            InputTimeUtc = TimeZoneInfo.ConvertTime(inputTime, Timezone, TimeZoneInfo.Utc);
+        }
+    }
+}

NadekoBot.Core/Common/TypeReaders/GuildTypeReader.cs

@@ -1,15 +1,26 @@
-using Discord.Commands;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Core.Common.TypeReaders;
+using Discord;
 
-namespace NadekoBot.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
-    public class GuildTypeReader : TypeReader
+    public class GuildTypeReader : NadekoTypeReader<IGuild>
     {
-        public override Task<TypeReaderResult> Read(ICommandContext context, string input)
+        private readonly DiscordSocketClient _client;
+
+        public GuildTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+            _client = client;
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider _)
         {
             input = input.Trim().ToLowerInvariant();
-            var guilds = NadekoBot.Client.GetGuilds();
+            var guilds = _client.Guilds;
             var guild = guilds.FirstOrDefault(g => g.Id.ToString().Trim().ToLowerInvariant() == input) ?? //by id
                         guilds.FirstOrDefault(g => g.Name.Trim().ToLowerInvariant() == input); //by name
 

NadekoBot.Core/Common/TypeReaders/Models/PermissionAction.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Modules.Permissions
+namespace NadekoBot.Common.TypeReaders.Models
 {
     public class PermissionAction
     {

NadekoBot.Core/Common/TypeReaders/ModuleTypeReader.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Discord.Commands;
+using NadekoBot.Extensions;
+using NadekoBot.Core.Common.TypeReaders;
+using Discord.WebSocket;
+
+namespace NadekoBot.Common.TypeReaders
+{
+    public class ModuleTypeReader : NadekoTypeReader<ModuleInfo>
+    {
+        private readonly CommandService _cmds;
+
+        public ModuleTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+            _cmds = cmds;
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider _)
+        {
+            input = input.ToUpperInvariant();
+            var module = _cmds.Modules.GroupBy(m => m.GetTopLevelModule()).FirstOrDefault(m => m.Key.Name.ToUpperInvariant() == input)?.Key;
+            if (module == null)
+                return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "No such module found."));
+
+            return Task.FromResult(TypeReaderResult.FromSuccess(module));
+        }
+    }
+
+    public class ModuleOrCrTypeReader : NadekoTypeReader<ModuleOrCrInfo>
+    {
+        private readonly CommandService _cmds;
+
+        public ModuleOrCrTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+            _cmds = cmds;
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider _)
+        {
+            input = input.ToLowerInvariant();
+            var module = _cmds.Modules.GroupBy(m => m.GetTopLevelModule()).FirstOrDefault(m => m.Key.Name.ToLowerInvariant() == input)?.Key;
+            if (module == null && input != "actualcustomreactions")
+                return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "No such module found."));
+
+            return Task.FromResult(TypeReaderResult.FromSuccess(new ModuleOrCrInfo
+            {
+                Name = input,
+            }));
+        }
+    }
+
+    public class ModuleOrCrInfo
+    {
+        public string Name { get; set; }
+    }
+}

NadekoBot.Core/Common/TypeReaders/NadekoTypeReader.cs

@@ -0,0 +1,19 @@
+using Discord.Commands;
+using Discord.WebSocket;
+
+namespace NadekoBot.Core.Common.TypeReaders
+{
+    public abstract class NadekoTypeReader<T> : TypeReader where
+        T : class
+    {
+        private readonly DiscordSocketClient _client;
+        private readonly CommandService _cmds;
+
+        private NadekoTypeReader() { }
+        public NadekoTypeReader(DiscordSocketClient client, CommandService cmds)
+        {
+            _client = client;
+            _cmds = cmds;
+        }
+    }
+}

NadekoBot.Core/Common/TypeReaders/PermissionActionTypeReader.cs

@@ -1,15 +1,22 @@
-using Discord.Commands;
+using System;
 using System.Threading.Tasks;
-using NadekoBot.Modules.Permissions;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Common.TypeReaders.Models;
+using NadekoBot.Core.Common.TypeReaders;
 
-namespace NadekoBot.TypeReaders
+namespace NadekoBot.Common.TypeReaders
 {
     /// <summary>
     /// Used instead of bool for more flexible keywords for true/false only in the permission module
     /// </summary>
-    public class PermissionActionTypeReader : TypeReader
+    public class PermissionActionTypeReader : NadekoTypeReader<PermissionAction>
     {
-        public override Task<TypeReaderResult> Read(ICommandContext context, string input)
+        public PermissionActionTypeReader(DiscordSocketClient client, CommandService cmds) : base(client, cmds)
+        {
+        }
+
+        public override Task<TypeReaderResult> ReadAsync(ICommandContext context, string input, IServiceProvider _)
         {
             input = input.ToUpperInvariant();
             switch (input)

NadekoBot.Core/Migrations/20161011200458_first.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +92,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -114,7 +114,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -132,7 +132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -148,7 +148,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -165,7 +165,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +185,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -220,7 +220,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +240,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -256,7 +256,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -278,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -359,7 +359,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -467,7 +467,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -492,7 +492,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -555,7 +555,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -573,7 +573,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -595,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -616,7 +616,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -633,124 +633,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161011200458_first.cs

@@ -702,7 +702,7 @@ namespace NadekoBot.Migrations
                 column: "BotConfigId");
 
             migrationBuilder.CreateIndex(
-                name: "IX_Repeaters_ChannelId",
+                name: "IX_Repeaters_channelId",
                 table: "Repeaters",
                 column: "ChannelId",
                 unique: true);

NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +92,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -114,7 +114,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -132,7 +132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -148,7 +148,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -165,7 +165,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -181,7 +181,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -201,7 +201,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -220,7 +220,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -236,7 +236,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -256,7 +256,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -272,7 +272,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -310,7 +310,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -449,7 +449,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -467,7 +467,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -483,7 +483,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +548,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -571,7 +571,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -589,7 +589,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -649,124 +649,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -485,7 +485,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -510,7 +510,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -526,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -550,7 +550,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -573,7 +573,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -591,7 +591,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -613,7 +613,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +634,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -651,124 +651,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -379,7 +379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -395,7 +395,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +453,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +471,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -487,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -512,7 +512,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -528,7 +528,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -552,7 +552,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -575,7 +575,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -593,7 +593,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -615,7 +615,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -636,7 +636,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,124 +653,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -397,7 +397,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -455,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -473,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -489,7 +489,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -514,7 +514,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -530,7 +530,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -554,7 +554,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -577,7 +577,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -595,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -617,7 +617,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -638,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -655,124 +655,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -417,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -459,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -518,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -534,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -558,7 +556,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -581,7 +579,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -599,7 +597,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -621,7 +619,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -642,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -659,124 +657,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -417,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -459,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -518,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -534,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -558,7 +556,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -581,7 +579,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -599,7 +597,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -621,7 +619,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -642,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -659,7 +657,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -676,124 +674,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -417,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -459,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -509,7 +507,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -534,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -550,7 +548,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -574,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -597,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -615,7 +613,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -637,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -658,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -675,7 +673,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -692,131 +690,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -417,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -489,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -507,7 +505,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -523,7 +521,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -539,7 +537,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -564,7 +562,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -580,7 +578,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -604,7 +602,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -627,7 +625,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -645,7 +643,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -667,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -688,7 +686,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -705,7 +703,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -722,131 +720,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20161224032833_logsettings.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -417,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -489,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -507,7 +505,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -523,7 +521,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -539,7 +537,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -564,7 +562,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -580,7 +578,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -604,7 +602,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -627,7 +625,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -645,7 +643,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -667,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -684,7 +682,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -701,131 +699,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20170110111159_repeater-drop.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
@@ -31,7 +30,7 @@ namespace NadekoBot.Migrations
                 });
 
             migrationBuilder.CreateIndex(
-                name: "IX_Repeaters_ChannelId",
+                name: "IX_Repeaters_channelId",
                 table: "Repeaters",
                 column: "ChannelId",
                 unique: true);

NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -36,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -96,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -118,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -136,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -169,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -205,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -224,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +405,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -423,7 +421,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -439,7 +437,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -511,7 +509,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -529,7 +527,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -545,7 +543,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -561,7 +559,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -586,7 +584,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -602,7 +600,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -626,7 +624,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -649,7 +647,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -667,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -689,7 +687,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -723,138 +721,138 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20170110111302_repeater-new.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -55,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -74,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -128,7 +126,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -152,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -174,7 +172,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -192,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -225,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -241,7 +239,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -261,7 +259,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -280,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -316,7 +314,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -332,7 +330,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -354,7 +352,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -370,7 +368,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -441,7 +439,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -463,7 +461,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -479,7 +477,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -495,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -567,7 +565,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -585,7 +583,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -601,7 +599,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -617,7 +615,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -642,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -658,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -705,7 +703,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -723,7 +721,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +743,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -779,161 +777,161 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20170110180534_protection.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -55,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -74,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -142,7 +140,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -166,7 +164,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -188,7 +186,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -227,7 +225,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -243,7 +241,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -260,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -276,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -315,7 +313,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -331,7 +329,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -351,7 +349,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -367,7 +365,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -405,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -476,7 +474,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -498,7 +496,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -514,7 +512,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -530,7 +528,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -602,7 +600,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -620,7 +618,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -636,7 +634,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -652,7 +650,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -677,7 +675,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -693,7 +691,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -717,7 +715,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -740,7 +738,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -758,7 +756,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -780,7 +778,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -797,7 +795,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -814,168 +812,168 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20170112185538_currency-modifications.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -55,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -74,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -146,7 +144,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -170,7 +168,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -192,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -210,7 +208,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -231,7 +229,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +245,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -264,7 +262,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -280,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -319,7 +317,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -335,7 +333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +353,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -480,7 +478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -502,7 +500,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -518,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -534,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -606,7 +604,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -624,7 +622,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -640,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -656,7 +654,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -681,7 +679,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -697,7 +695,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -721,7 +719,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +742,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -784,7 +782,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +799,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -818,168 +816,168 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });

NadekoBot.Core/Migrations/20170118202307_ok-error-colors.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -55,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -74,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -146,7 +144,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -170,7 +168,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -192,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -210,7 +208,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -231,7 +229,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +245,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -264,7 +262,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -280,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -320,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -339,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +353,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +373,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +389,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -500,7 +498,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -522,7 +520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -538,7 +536,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -554,7 +552,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -626,7 +624,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -644,7 +642,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -660,7 +658,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -676,7 +674,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -701,7 +699,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -717,7 +715,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -741,7 +739,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -764,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -782,7 +780,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -804,7 +802,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -821,7 +819,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -838,7 +836,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -863,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -887,199 +885,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170122044958_waifus.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -55,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -74,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -148,7 +146,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -172,7 +170,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -194,7 +192,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -212,7 +210,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -233,7 +231,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -266,7 +264,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -282,7 +280,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -302,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -322,7 +320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -341,7 +339,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -357,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -431,7 +429,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -506,7 +504,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -528,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -544,7 +542,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -560,7 +558,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +630,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -650,7 +648,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -666,7 +664,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -707,7 +705,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -723,7 +721,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -747,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -770,7 +768,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -788,7 +786,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -810,7 +808,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -827,7 +825,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -844,7 +842,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -869,7 +867,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -893,199 +891,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -288,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -590,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -608,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -702,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -720,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +781,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -809,7 +807,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -834,7 +832,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -854,7 +852,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -878,7 +876,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -897,7 +895,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -916,7 +914,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -943,7 +941,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,199 +967,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170222162505_dateadded.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -288,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -590,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -608,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -702,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -720,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -793,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -811,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -862,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -882,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -944,7 +942,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -971,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -997,206 +995,206 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170308033058_permsv2.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -288,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -590,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -608,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -702,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -720,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -793,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -811,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -862,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -882,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -964,7 +962,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -991,7 +989,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1017,213 +1015,213 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170310210952_unmute-timers.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -288,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -590,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -608,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -702,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -720,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -793,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -811,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -862,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -882,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -964,7 +962,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -984,7 +982,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1011,7 +1009,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1037,220 +1035,220 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170311054632_vcrole.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -288,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -332,7 +330,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -354,7 +352,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +373,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +431,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -457,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -552,7 +550,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -576,7 +574,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -594,7 +592,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -612,7 +610,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -686,7 +684,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -724,7 +722,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -742,7 +740,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -769,7 +767,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -797,7 +795,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -815,7 +813,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -841,7 +839,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -866,7 +864,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +884,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -910,7 +908,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -929,7 +927,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -968,7 +966,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -988,7 +986,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1015,7 +1013,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1041,220 +1039,220 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -248,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -271,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -289,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -308,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -374,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -395,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -435,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -495,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +594,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +612,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +630,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +724,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +742,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +787,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +815,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +833,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +859,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +884,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +928,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +967,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -988,7 +986,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1008,7 +1006,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1035,7 +1033,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1061,227 +1059,227 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

NadekoBot.Core/Migrations/20170320090138_command-aliasing.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -248,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -271,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -289,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -308,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -374,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -395,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -435,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -495,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -574,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -598,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -616,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -708,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -728,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -746,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -764,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -819,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -863,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -888,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -908,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -932,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -951,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -971,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -990,7 +988,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1010,7 +1008,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1037,7 +1035,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1063,7 +1061,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1087,7 +1085,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1109,235 +1107,235 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });

NadekoBot.Core/Migrations/20170330000613_warning-commands.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs

@@ -3,9 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Modules.Music.Classes;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -18,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -41,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -59,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -80,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -100,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -158,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -184,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -248,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -271,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -289,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -308,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -374,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -395,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -435,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -495,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -574,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -598,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -616,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -708,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -728,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -746,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -764,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -819,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -863,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -888,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -908,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -932,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -951,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -983,7 +981,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1003,7 +1001,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1022,7 +1020,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1042,7 +1040,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1069,7 +1067,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1095,7 +1093,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1119,7 +1117,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1141,242 +1139,242 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });

NadekoBot.Core/Migrations/20170331093025_startup-commands.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations