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

src/NadekoBot/Services/CommandHandler.cs

@@ -15,13 +15,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common.Configs;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Common.Configs;
+using NadekoBot.Services;
 using NadekoBot.Db;
 using NadekoBot.Modules.Administration;
 using Serilog;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class GuildUserComparer : IEqualityComparer<IGuildUser>
     {

src/NadekoBot/Services/Common/GreetGrouper.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class GreetGrouper<T>
     {

src/NadekoBot/Services/Common/ImageLoader.cs

@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Common
+namespace NadekoBot.Services.Common
 {
     public class ImageLoader
     {

src/NadekoBot/Services/Common/RedisImageArray.cs

@@ -4,7 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Core.Services.Common
+namespace NadekoBot.Services.Common
 {
     public sealed class RedisImageArray : IReadOnlyList<byte[]>
     {

src/NadekoBot/Services/DbService.cs

@@ -1,12 +1,12 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database;
+using NadekoBot.Services.Database;
 using System;
 using System.IO;
 using System.Linq;
 using NadekoBot.Db;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class DbService
     {

src/NadekoBot/Services/GreetSettingsService.cs

@@ -2,7 +2,7 @@
 using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Concurrent;
@@ -13,7 +13,7 @@ using NadekoBot.Db;
 using NadekoBot.Modules.Administration;
 using Serilog;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class GreetSettingsService : INService
     {

src/NadekoBot/Services/IBotCredentials.cs

@@ -1,7 +1,7 @@
 using Discord;
 using System.Collections.Immutable;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IBotCredentials
     {

src/NadekoBot/Services/ICurrencyService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface ICurrencyService : INService
     {

src/NadekoBot/Services/IDataCache.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IDataCache
     {

src/NadekoBot/Services/IGoogleApiService.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IGoogleApiService : INService
     {

src/NadekoBot/Services/IImageCache.cs

@@ -1,8 +1,8 @@
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IImageCache
     {

src/NadekoBot/Services/ILocalDataCache.cs

@@ -1,8 +1,8 @@
-using NadekoBot.Core.Common.Pokemon;
+using NadekoBot.Common.Pokemon;
 using NadekoBot.Modules.Games.Common.Trivia;
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface ILocalDataCache
     {

src/NadekoBot/Services/ILocalization.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using Discord;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface ILocalization : INService
     {

src/NadekoBot/Services/INService.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// All services must implement this interface in order to be auto-discovered by the DI system

src/NadekoBot/Services/IStatsService.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IStatsService : INService
     {

src/NadekoBot/Services/Impl/BotCredentials.cs

@@ -6,10 +6,9 @@ using System;
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
-using NadekoBot.Core.Common;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class BotCredentials : IBotCredentials
     {

src/NadekoBot/Services/Impl/CurrencyService.cs

@@ -1,7 +1,7 @@
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class CurrencyService : ICurrencyService
     {

src/NadekoBot/Services/Impl/FontProvider.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class FontProvider : INService
     {

src/NadekoBot/Services/Impl/GoogleApiService.cs

@@ -16,7 +16,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class GoogleApiService : IGoogleApiService
     {

src/NadekoBot/Services/Impl/ImagesService.cs

@@ -1,5 +1,5 @@
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services.Common;
+using NadekoBot.Common;
+using NadekoBot.Services.Common;
 using NadekoBot.Extensions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -13,7 +13,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public sealed class RedisImagesCache : IImageCache
     {

src/NadekoBot/Services/Impl/Localization.cs

@@ -9,7 +9,7 @@ using System.IO;
 using NadekoBot.Db;
 using NadekoBot.Modules.Administration;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class Localization : ILocalization
     {

src/NadekoBot/Services/Impl/RedisCache.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class RedisCache : IDataCache
     {

src/NadekoBot/Services/Impl/RedisLocalDataCache.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Common.Pokemon;
+using NadekoBot.Common.Pokemon;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Games.Common.Trivia;
 using Newtonsoft.Json;
@@ -9,7 +9,7 @@ using System.IO;
 using System.Linq;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class RedisLocalDataCache : ILocalDataCache
     {

src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs

@@ -7,7 +7,7 @@ using Discord.WebSocket;
 using Grpc.Core;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Coordinator;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using Serilog;
 

src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Serilog;
 
 namespace NadekoBot.Services

src/NadekoBot/Services/Impl/SoundCloudApiService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class SoundCloudApiService : INService
     {

src/NadekoBot/Services/Impl/StartingGuildsListService.cs

@@ -4,7 +4,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Collections;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class StartingGuildsService : IEnumerable<ulong>, INService
     {

src/NadekoBot/Services/Impl/StatsService.cs

@@ -10,7 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class StatsService : IStatsService
     {

src/NadekoBot/Services/Impl/SyncPreconditionService.cs

@@ -1,7 +0,0 @@
-namespace NadekoBot.Core.Services.Impl
-{
-    public class SyncPreconditionService
-    {
-        
-    }
-}

src/NadekoBot/Services/Impl/YtdlOperation.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using NadekoBot.Extensions;
 using Serilog;
 
-namespace NadekoBot.Core.Services.Impl
+namespace NadekoBot.Services
 {
     public class YtdlOperation
     {

src/NadekoBot/Services/LogSetup.cs

@@ -4,7 +4,7 @@ using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public static class LogSetup
     {

src/NadekoBot/Services/Settings/BotConfigMigrator.cs

@@ -2,11 +2,11 @@
 using System.Data.Common;
 using System.Globalization;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Common.Configs;
+using NadekoBot.Common.Configs;
 using Serilog;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public sealed class BotConfigMigrator : IConfigMigrator
     {

src/NadekoBot/Services/Settings/BotConfigService.cs

@@ -1,10 +1,10 @@
 using System;
 using Discord;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.Configs;
+using NadekoBot.Common;
+using NadekoBot.Common.Configs;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Settings service for bot-wide configuration.

src/NadekoBot/Services/Settings/ConfigParsers.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Custom setting value parsers for types which don't have them by default

src/NadekoBot/Services/Settings/ConfigServiceBase.cs

@@ -7,13 +7,13 @@ using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
 using NadekoBot.Common.Yml;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.Configs;
-using NadekoBot.Core.Common.JsonConverters;
-using Rgba32Converter = NadekoBot.Core.Common.JsonConverters.Rgba32Converter;
-using CultureInfoConverter = NadekoBot.Core.Common.JsonConverters.CultureInfoConverter;
+using NadekoBot.Common;
+using NadekoBot.Common.Configs;
+using NadekoBot.Common.JsonConverters;
+using Rgba32Converter = NadekoBot.Common.JsonConverters.Rgba32Converter;
+using CultureInfoConverter = NadekoBot.Common.JsonConverters.CultureInfoConverter;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Base service for all settings services

src/NadekoBot/Services/Settings/GamblingConfigMigrator.cs

@@ -5,7 +5,7 @@ using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
 using Serilog;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public sealed class GamblingConfigMigrator : IConfigMigrator
     {

src/NadekoBot/Services/Settings/IConfigMigrator.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public interface IConfigMigrator
     {

src/NadekoBot/Services/Settings/IConfigService.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Interface that all services which deal with configs should implement

src/NadekoBot/Services/Settings/SettingParser.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Delegate which describes a parser which can convert string input into given data type

src/NadekoBot/Services/StandardConversions.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public static class StandardConversions
     {

src/NadekoBot/Services/strings/IBotStrings.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Defines methods to retrieve and reload bot strings 

src/NadekoBot/Services/strings/IBotStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Implemented by classes which provide localized strings in their own ways

src/NadekoBot/Services/strings/IStringsSource.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Basic interface used for classes implementing strings loading mechanism

src/NadekoBot/Services/strings/impl/BotStrings.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using Serilog;
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class BotStrings : IBotStrings
     {

src/NadekoBot/Services/strings/impl/LocalBotStringsProvider.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     public class LocalBotStringsProvider : IBotStringsProvider
     {

src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs

@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using Serilog;
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Loads strings from the local default filepath <see cref="_responsesPath"/>

src/NadekoBot/Services/strings/impl/RedisBotStringsProvider.cs

@@ -5,7 +5,7 @@ using Discord.WebSocket;
 using NadekoBot.Extensions;
 using StackExchange.Redis;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Services
 {
     /// <summary>
     /// Uses <see cref="IStringsSource"/> to load strings into redis hash (only on Shard 0)