liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract Database to interface

Browse Source
This commit is contained in:
Ske
2020-06-13 19:36:43 +02:00
parent 70df9cd893
commit 90ac186183
27 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PluralKit.Bot/Commands/Autoproxy.cs
View File

@@ -11,9 +11,9 @@ namespace PluralKit.Bot
{
public class Autoproxy
{
private readonly Database _db;
private readonly IDatabase _db;
public Autoproxy(Database db)
public Autoproxy(IDatabase db)
{
_db = db;
}

4
PluralKit.Bot/Commands/MemberAvatar.cs
View File

@@ -14,9 +14,9 @@ namespace PluralKit.Bot
{
public class MemberAvatar
{
private readonly Database _db;
private readonly IDatabase _db;
public MemberAvatar(Database db)
public MemberAvatar(IDatabase db)
{
_db = db;
}

4
PluralKit.Bot/Commands/MemberEdit.cs
View File

@@ -12,9 +12,9 @@ namespace PluralKit.Bot
public class MemberEdit
{
private readonly IDataStore _data;
private readonly Database _db;
private readonly IDatabase _db;
public MemberEdit(IDataStore data, Database db)
public MemberEdit(IDataStore data, IDatabase db)
{
_data = data;
_db = db;

4
PluralKit.Bot/Commands/ServerConfig.cs
View File

@@ -13,9 +13,9 @@ namespace PluralKit.Bot
{
public class ServerConfig
{
private Database _db;
private IDatabase _db;
private LoggerCleanService _cleanService;
public ServerConfig(LoggerCleanService cleanService, Database db)
public ServerConfig(LoggerCleanService cleanService, IDatabase db)
{
_cleanService = cleanService;
_db = db;

4
PluralKit.Bot/Commands/SystemEdit.cs
View File

@@ -18,10 +18,10 @@ namespace PluralKit.Bot
public class SystemEdit
{
private IDataStore _data;
private Database _db;
private IDatabase _db;
private EmbedService _embeds;
public SystemEdit(IDataStore data, EmbedService embeds, Database db)
public SystemEdit(IDataStore data, EmbedService embeds, IDatabase db)
{
_data = data;
_embeds = embeds;

4
PluralKit.Bot/Commands/SystemList.cs
View File

@@ -16,10 +16,10 @@ namespace PluralKit.Bot
public class SystemList
{
private readonly IClock _clock;
private readonly Database _db;
private readonly IDatabase _db;
private readonly ILogger _logger;
public SystemList(Database db, ILogger logger, IClock clock)
public SystemList(IDatabase db, ILogger logger, IClock clock)
{
_db = db;
_logger = logger;

4
PluralKit.Bot/Handlers/MessageCreated.cs
View File

@@ -22,12 +22,12 @@ namespace PluralKit.Bot
private readonly IMetrics _metrics;
private readonly ProxyService _proxy;
private readonly ILifetimeScope _services;
private readonly Database _db;
private readonly IDatabase _db;
private readonly IDataStore _data;
public MessageCreated(LastMessageCacheService lastMessageCache, LoggerCleanService loggerClean,
IMetrics metrics, ProxyService proxy, DiscordShardedClient client,
CommandTree tree, ILifetimeScope services, Database db, IDataStore data)
CommandTree tree, ILifetimeScope services, IDatabase db, IDataStore data)
{
_lastMessageCache = lastMessageCache;
_loggerClean = loggerClean;

4
PluralKit.Bot/Handlers/MessageEdited.cs
View File

@@ -11,9 +11,9 @@ namespace PluralKit.Bot
{
private readonly LastMessageCacheService _lastMessageCache;
private readonly ProxyService _proxy;
private readonly Database _db;
private readonly IDatabase _db;
public MessageEdited(LastMessageCacheService lastMessageCache, ProxyService proxy, Database db)
public MessageEdited(LastMessageCacheService lastMessageCache, ProxyService proxy, IDatabase db)
{
_lastMessageCache = lastMessageCache;
_proxy = proxy;

2
PluralKit.Bot/Init.cs
View File

@@ -21,7 +21,7 @@ namespace PluralKit.Bot
{
// Load configuration and run global init stuff
var config = InitUtils.BuildConfiguration(args).Build();
Database.InitStatic();
InitUtils.InitStatic();
// Set up DI container and modules
var services = BuildContainer(config);

4
PluralKit.Bot/Proxy/ProxyService.cs
View File

@@ -21,14 +21,14 @@ namespace PluralKit.Bot
public static readonly TimeSpan MessageDeletionDelay = TimeSpan.FromMilliseconds(1000);
private readonly LogChannelService _logChannel;
private readonly Database _db;
private readonly IDatabase _db;
private readonly IDataStore _data;
private readonly ILogger _logger;
private readonly WebhookExecutorService _webhookExecutor;
private readonly ProxyMatcher _matcher;
public ProxyService(LogChannelService logChannel, IDataStore data, ILogger logger,
WebhookExecutorService webhookExecutor, Database db, ProxyMatcher matcher)
WebhookExecutorService webhookExecutor, IDatabase db, ProxyMatcher matcher)
{
_logChannel = logChannel;
_data = data;

4
PluralKit.Bot/Services/EmbedService.cs
View File

@@ -16,10 +16,10 @@ namespace PluralKit.Bot {
public class EmbedService
{
private IDataStore _data;
private Database _db;
private IDatabase _db;
private DiscordShardedClient _client;
public EmbedService(DiscordShardedClient client, IDataStore data, Database db)
public EmbedService(DiscordShardedClient client, IDataStore data, IDatabase db)
{
_client = client;
_data = data;

4
PluralKit.Bot/Services/LogChannelService.cs
View File

@@ -14,12 +14,12 @@ using Serilog;
namespace PluralKit.Bot {
public class LogChannelService {
private readonly EmbedService _embed;
private readonly Database _db;
private readonly IDatabase _db;
private readonly IDataStore _data;
private readonly ILogger _logger;
private readonly DiscordRestClient _rest;
public LogChannelService(EmbedService embed, ILogger logger, DiscordRestClient rest, Database db, IDataStore data)
public LogChannelService(EmbedService embed, ILogger logger, DiscordRestClient rest, IDatabase db, IDataStore data)
{
_embed = embed;
_rest = rest;

4
PluralKit.Bot/Services/LoggerCleanService.cs
View File

@@ -53,10 +53,10 @@ namespace PluralKit.Bot
.Where(b => b.WebhookName != null)
.ToDictionary(b => b.WebhookName);
private Database _db;
private IDatabase _db;
private DiscordShardedClient _client;
public LoggerCleanService(Database db, DiscordShardedClient client)
public LoggerCleanService(IDatabase db, DiscordShardedClient client)
{
_db = db;
_client = client;

4
PluralKit.Bot/Services/PeriodicStatCollector.cs
View File

@@ -23,7 +23,7 @@ namespace PluralKit.Bot
private IMetrics _metrics;
private CpuStatService _cpu;
private Database _db;
private IDatabase _db;
private WebhookCacheService _webhookCache;
@@ -31,7 +31,7 @@ namespace PluralKit.Bot
private ILogger _logger;
public PeriodicStatCollector(DiscordShardedClient client, IMetrics metrics, ILogger logger, WebhookCacheService webhookCache, DbConnectionCountHolder countHolder, CpuStatService cpu, Database db)
public PeriodicStatCollector(DiscordShardedClient client, IMetrics metrics, ILogger logger, WebhookCacheService webhookCache, DbConnectionCountHolder countHolder, CpuStatService cpu, IDatabase db)
{
_client = client;
_metrics = metrics;