minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kwoth
2021-06-20 13:03:00 +02:00
parent 44fdd4ff23
commit 49f9b96755
451 changed files with 19253 additions and 19287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NadekoBot.Coordinator/LogSetup.cs
View File

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

2
src/NadekoBot.Coordinator/Program.cs
View File

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

2
src/NadekoBot.Tests/BotStringsTests.cs
View File

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

2
src/NadekoBot.Tests/GroupGreetTests.cs
View File

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

2
src/NadekoBot.Tests/IndexedCollectionTests.cs
View File

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

2
src/NadekoBot.Tests/KwumTests.cs
View File

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

2
src/NadekoBot.Tests/PubSubTests.cs
View File

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

10
src/NadekoBot/Bot.cs
View File

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

2
src/NadekoBot/Common/Attributes/Aliases.cs
View File

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

2
src/NadekoBot/Common/Attributes/Description.cs
View File

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

2
src/NadekoBot/Common/Attributes/NadekoCommand.cs
View File

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

2
src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs
View File

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

4
src/NadekoBot/Common/Attributes/Ratelimit.cs
View File

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

2
src/NadekoBot/Common/Attributes/Usage.cs
View File

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

2
src/NadekoBot/Common/CmdStrings.cs
View File

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

2
src/NadekoBot/Common/Collections/IndexedCollection.cs
View File

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

2
src/NadekoBot/Common/Configs/BotConfig.cs
View File

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

2
src/NadekoBot/Common/Configs/IConfigSeria.cs
View File

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

4
src/NadekoBot/Common/DownloadTracker.cs
View File

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

4
src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs
View File

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

2
src/NadekoBot/Common/Helpers.cs
View File

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

2
src/NadekoBot/Common/INadekoCommandOptions.cs
View File

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

2
src/NadekoBot/Common/IPlaceholderProvider.cs
View File

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

2
src/NadekoBot/Common/ImageUrls.cs
View File

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

2
src/NadekoBot/Common/JsonConverters/Rbga32Converter.cs
View File

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

2
src/NadekoBot/Common/Kwum.cs
View File

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

2
src/NadekoBot/Common/LbOpts.cs
View File

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

2
src/NadekoBot/Common/LoginErrorHandler.cs
View File

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

2
src/NadekoBot/Common/NadekoModule.cs
View File

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

2
src/NadekoBot/Common/OptionsParser.cs
View File

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

2
src/NadekoBot/Common/OsuMapData.cs
View File

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

2
src/NadekoBot/Common/OsuUserBets.cs
View File

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

2
src/NadekoBot/Common/Pokemon/PokemonNameId.cs
View File

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

2
src/NadekoBot/Common/Pokemon/SearchPokemon.cs
View File

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

2
src/NadekoBot/Common/Pokemon/SearchPokemonAbility.cs
View File

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

2
src/NadekoBot/Common/PubSub/EventPubSub.cs
View File

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

2
src/NadekoBot/Common/PubSub/IPubSub.cs
View File

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

2
src/NadekoBot/Common/PubSub/ISeria.cs
View File

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

4
src/NadekoBot/Common/PubSub/JsonSeria.cs
View File

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

4
src/NadekoBot/Common/PubSub/RedisPubSub.cs
View File

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

2
src/NadekoBot/Common/PubSub/TypedKey.cs
View File

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

4
src/NadekoBot/Common/PubSub/YamlSeria.cs
View File

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

2
src/NadekoBot/Common/Replacements/ReplacementBuilder.cs
View File

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

2
src/NadekoBot/Common/ShmartNumber.cs
View File

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

4
src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/GuildTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/KwumTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/Models/StoopidTime.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/ModuleTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/NadekoTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/PermissionActionTypeReader.cs
View File

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

2
src/NadekoBot/Common/TypeReaders/Rgba32TypeReader.cs
View File

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

4
src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs
View File

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

4
src/NadekoBot/Common/TypeReaders/StoopidTimeTypeReader.cs
View File

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

2
src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/DbExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs
View File

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

4
src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs
View File

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

4
src/NadekoBot/Db/Extensions/PollExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/QuoteExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/ReminderExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs
View File

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

4
src/NadekoBot/Db/Extensions/UserXpExtensions.cs
View File

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

4
src/NadekoBot/Db/Extensions/WaifuExtensions.cs
View File

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

2
src/NadekoBot/Db/Extensions/WarningExtensions.cs
View File

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

2
src/NadekoBot/Db/Models/AntiProtection.cs
View File

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

2
src/NadekoBot/Db/Models/AutoCommand.cs
View File

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

2
src/NadekoBot/Db/Models/BanTemplate.cs
View File

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

2
src/NadekoBot/Db/Models/BlacklistEntry.cs
View File

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

2
src/NadekoBot/Db/Models/ClubInfo.cs
View File

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

2
src/NadekoBot/Db/Models/CommandAlias.cs
View File

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

2
src/NadekoBot/Db/Models/CommandCooldown.cs
View File

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

2
src/NadekoBot/Db/Models/CurrencyTransaction.cs
View File

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

2
src/NadekoBot/Db/Models/CustomReaction.cs
View File

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

2
src/NadekoBot/Db/Models/DbEntity.cs
View File

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

2
src/NadekoBot/Db/Models/DelMsgOnCmdChannel.cs
View File

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

2
src/NadekoBot/Db/Models/DiscordPemOverride.cs
View File

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

2
src/NadekoBot/Db/Models/DiscordUser.cs
View File

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

2
src/NadekoBot/Db/Models/Event.cs
View File

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

2
src/NadekoBot/Db/Models/FeedSub.cs
View File

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

2
src/NadekoBot/Db/Models/FilterChannelId.cs
View File

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

2
src/NadekoBot/Db/Models/FilterLinksChannelId.cs
View File

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

2
src/NadekoBot/Db/Models/FilteredWord.cs
View File

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

2
src/NadekoBot/Db/Models/FollowedStream.cs
View File

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

2
src/NadekoBot/Db/Models/GCChannelId.cs
View File

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

2
src/NadekoBot/Db/Models/GroupName.cs
View File

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

2
src/NadekoBot/Db/Models/GuildConfig.cs
View File

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

2
src/NadekoBot/Db/Models/IgnoredLogChannel.cs
View File

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

2
src/NadekoBot/Db/Models/IgnoredVoicePresenceChannel.cs
View File

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

2
src/NadekoBot/Db/Models/LogSetting.cs
View File

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

2
src/NadekoBot/Db/Models/MusicPlaylist.cs
View File

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

2
src/NadekoBot/Db/Models/MusicSettings.cs
View File

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

2
src/NadekoBot/Db/Models/MutedUserId.cs
View File

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

2
src/NadekoBot/Db/Models/NsfwBlacklitedTag.cs
View File

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

2
src/NadekoBot/Db/Models/Permission.cs
View File

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

2
src/NadekoBot/Db/Models/PlantedCurrency.cs
View File

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

Some files were not shown because too many files have changed in this diff Show More