Move Configuration wrapper class to separate namespace
This commit is contained in:
parent
afbb92b1e9
commit
47e6d2bed5
@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
|
|||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot
|
namespace ChaosBot.ConfigHelpers
|
||||||
{
|
{
|
||||||
public class Configuration
|
public class Configuration
|
||||||
{
|
{
|
||||||
@ -3,6 +3,7 @@ using Discord;
|
|||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.Discord.Services;
|
using ChaosBot.Discord.Services;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|||||||
@ -10,6 +10,7 @@ using ChaosBot.Services;
|
|||||||
using Discord;
|
using Discord;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.Admin
|
namespace ChaosBot.Discord.Modules.Admin
|
||||||
{
|
{
|
||||||
|
|||||||
@ -14,6 +14,7 @@ using ChaosBot.Models;
|
|||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.Admin
|
namespace ChaosBot.Discord.Modules.Admin
|
||||||
{
|
{
|
||||||
|
|||||||
@ -9,6 +9,7 @@ using ChaosBot.Discord.PreConditions;
|
|||||||
using ChaosBot.Models;
|
using ChaosBot.Models;
|
||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.Admin
|
namespace ChaosBot.Discord.Modules.Admin
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.Discord.PreConditions;
|
using ChaosBot.Discord.PreConditions;
|
||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using Discord;
|
using Discord;
|
||||||
|
|||||||
@ -11,6 +11,7 @@ using ChaosBot.Models;
|
|||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using ChaosBot.Services;
|
using ChaosBot.Services;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.User
|
namespace ChaosBot.Discord.Modules.User
|
||||||
{
|
{
|
||||||
|
|||||||
@ -10,6 +10,7 @@ using Discord;
|
|||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.User
|
namespace ChaosBot.Discord.Modules.User
|
||||||
{
|
{
|
||||||
|
|||||||
@ -9,6 +9,7 @@ using ChaosBot.Services;
|
|||||||
using Discord;
|
using Discord;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Modules.User
|
namespace ChaosBot.Discord.Modules.User
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
|
|
||||||
|
|||||||
@ -9,6 +9,7 @@ using Discord.Commands;
|
|||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Services
|
namespace ChaosBot.Discord.Services
|
||||||
{
|
{
|
||||||
|
|||||||
@ -7,6 +7,7 @@ using Discord;
|
|||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Configuration = ChaosBot.ConfigHelpers.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.Discord.Services
|
namespace ChaosBot.Discord.Services
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.Services;
|
using ChaosBot.Services;
|
||||||
using Discord;
|
using Discord;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|||||||
@ -36,7 +36,7 @@ namespace ChaosBot.Models
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ChaosBot.Configuration config = new ChaosBot.Configuration();
|
ConfigHelpers.Configuration config = new ConfigHelpers.Configuration();
|
||||||
|
|
||||||
server = config.GetValue<string>("Database:Host");
|
server = config.GetValue<string>("Database:Host");
|
||||||
port = config.GetValue<int>("Database:Port");
|
port = config.GetValue<int>("Database:Port");
|
||||||
|
|||||||
@ -4,6 +4,7 @@ using System.Reflection;
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using ChaosBot.Discord;
|
using ChaosBot.Discord;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
|
||||||
[assembly: InternalsVisibleTo("ChaosBot.UnitTests")]
|
[assembly: InternalsVisibleTo("ChaosBot.UnitTests")]
|
||||||
|
|||||||
@ -4,6 +4,7 @@ using System.Linq;
|
|||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.Discord;
|
using ChaosBot.Discord;
|
||||||
using ChaosBot.Repositories;
|
using ChaosBot.Repositories;
|
||||||
using ChaosBot.WebServer.Services;
|
using ChaosBot.WebServer.Services;
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
|
||||||
namespace ChaosBot.WebServer.Services
|
namespace ChaosBot.WebServer.Services
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using ChaosBot.WebServer.Services;
|
using ChaosBot.WebServer.Services;
|
||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.Builder;
|
using Microsoft.AspNetCore.Builder;
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using ChaosBot.ConfigHelpers;
|
||||||
using NLog.Extensions.Logging;
|
using NLog.Extensions.Logging;
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Hosting;
|
using Microsoft.AspNetCore.Hosting;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user