daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Revert "Re-use the database connection everywhere"

Browse source 
This reverts commit 77b3d612f2.
This commit is contained in:
runebaas 2020-04-06 15:51:28 +02:00
parent 77b3d612f2
commit 2a616f8c5d
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Geekbot.net/Handlers.cs
View file

@ -9,6 +9,7 @@ using Discord.Rest;
using Discord.WebSocket; using Discord.WebSocket;
using Geekbot.net.Database; using Geekbot.net.Database;
using Geekbot.net.Database.Models; using Geekbot.net.Database.Models;
using Geekbot.net.Lib.AlmostRedis;
using Geekbot.net.Lib.Extensions; using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Logger; using Geekbot.net.Lib.Logger;
using Geekbot.net.Lib.ReactionListener; using Geekbot.net.Lib.ReactionListener;
@ -22,20 +23,24 @@ namespace Geekbot.net
private readonly DatabaseContext _database; private readonly DatabaseContext _database;
private readonly IDiscordClient _client; private readonly IDiscordClient _client;
private readonly IGeekbotLogger _logger; private readonly IGeekbotLogger _logger;
private readonly IAlmostRedis _redis;
private readonly IServiceProvider _servicesProvider; private readonly IServiceProvider _servicesProvider;
private readonly CommandService _commands; private readonly CommandService _commands;
private readonly IUserRepository _userRepository; private readonly IUserRepository _userRepository;
private readonly IReactionListener _reactionListener; private readonly IReactionListener _reactionListener;
private readonly DatabaseContext _messageCounterDatabaseContext;
private readonly RestApplication _applicationInfo; private readonly RestApplication _applicationInfo;
private readonly List<ulong> _ignoredServers; private readonly List<ulong> _ignoredServers;
public Handlers(DatabaseContext database, IDiscordClient client, IGeekbotLogger logger, public Handlers(DatabaseInitializer databaseInitializer, IDiscordClient client, IGeekbotLogger logger, IAlmostRedis redis,
IServiceProvider servicesProvider, CommandService commands, IUserRepository userRepository, IServiceProvider servicesProvider, CommandService commands, IUserRepository userRepository,
IReactionListener reactionListener, RestApplication applicationInfo) IReactionListener reactionListener, RestApplication applicationInfo)
{ {
_database = database; _database = databaseInitializer.Initialize();
_messageCounterDatabaseContext = databaseInitializer.Initialize();
_client = client; _client = client;
_logger = logger; _logger = logger;
_redis = redis;
_servicesProvider = servicesProvider; _servicesProvider = servicesProvider;
_commands = commands; _commands = commands;
_userRepository = userRepository; _userRepository = userRepository;
@ -124,7 +129,7 @@ namespace Geekbot.net
var channel = (SocketGuildChannel) message.Channel; var channel = (SocketGuildChannel) message.Channel;
var rowId = await _database.Database.ExecuteSqlRawAsync( var rowId = await _messageCounterDatabaseContext.Database.ExecuteSqlRawAsync(
"UPDATE \"Messages\" SET \"MessageCount\" = \"MessageCount\" + 1 WHERE \"GuildId\" = {0} AND \"UserId\" = {1}", "UPDATE \"Messages\" SET \"MessageCount\" = \"MessageCount\" + 1 WHERE \"GuildId\" = {0} AND \"UserId\" = {1}",
channel.Guild.Id.AsLong(), channel.Guild.Id.AsLong(),
message.Author.Id.AsLong() message.Author.Id.AsLong()
@ -132,13 +137,13 @@ namespace Geekbot.net
if (rowId == 0) if (rowId == 0)
{ {
await _database.Messages.AddAsync(new MessagesModel _messageCounterDatabaseContext.Messages.Add(new MessagesModel
{ {
UserId = message.Author.Id.AsLong(), UserId = message.Author.Id.AsLong(),
GuildId = channel.Guild.Id.AsLong(), GuildId = channel.Guild.Id.AsLong(),
MessageCount = 1 MessageCount = 1
}); });
await _database.SaveChangesAsync(); _messageCounterDatabaseContext.SaveChanges();
} }
if (message.Author.IsBot) return; if (message.Author.IsBot) return;

23
Geekbot.net/Program.cs
View file

@ -41,7 +41,6 @@ namespace Geekbot.net
private IUserRepository _userRepository; private IUserRepository _userRepository;
private RunParameters _runParameters; private RunParameters _runParameters;
private IAlmostRedis _redis; private IAlmostRedis _redis;
private DatabaseContext _database;
private static void Main(string[] args) private static void Main(string[] args)
{ {
@ -88,11 +87,11 @@ namespace Geekbot.net
_commands = new CommandService(); _commands = new CommandService();
_databaseInitializer = new DatabaseInitializer(runParameters, logger); _databaseInitializer = new DatabaseInitializer(runParameters, logger);
_database = _databaseInitializer.Initialize(); var database = _databaseInitializer.Initialize();
_database.Database.EnsureCreated(); database.Database.EnsureCreated();
if(!_runParameters.InMemory) _database.Database.Migrate(); if(!_runParameters.InMemory) database.Database.Migrate();
_globalSettings = new GlobalSettings(_database); _globalSettings = new GlobalSettings(database);
try try
{ {
@ -117,7 +116,7 @@ namespace Geekbot.net
_services = new ServiceCollection(); _services = new ServiceCollection();
_userRepository = new UserRepository(_database, logger); _userRepository = new UserRepository(_databaseInitializer.Initialize(), logger);
var fortunes = new FortunesProvider(logger); var fortunes = new FortunesProvider(logger);
var mediaProvider = new MediaProvider(logger); var mediaProvider = new MediaProvider(logger);
var malClient = new MalClient(_globalSettings, logger); var malClient = new MalClient(_globalSettings, logger);
@ -138,9 +137,9 @@ namespace Geekbot.net
_services.AddSingleton<IMtgManaConverter>(mtgManaConverter); _services.AddSingleton<IMtgManaConverter>(mtgManaConverter);
_services.AddSingleton<IWikipediaClient>(wikipediaClient); _services.AddSingleton<IWikipediaClient>(wikipediaClient);
_services.AddSingleton<IRandomNumberGenerator>(randomNumberGenerator); _services.AddSingleton<IRandomNumberGenerator>(randomNumberGenerator);
_services.AddSingleton<DatabaseContext>(_database);
_services.AddSingleton(_globalSettings); _services.AddSingleton(_globalSettings);
_services.AddTransient<IHighscoreManager>(e => new HighscoreManager(_database, _userRepository)); _services.AddTransient<IHighscoreManager>(e => new HighscoreManager(_databaseInitializer.Initialize(), _userRepository));
_services.AddTransient(e => _databaseInitializer.Initialize());
logger.Information(LogSource.Geekbot, "Connecting to Discord"); logger.Information(LogSource.Geekbot, "Connecting to Discord");
@ -163,7 +162,7 @@ namespace Geekbot.net
_logger.Information(LogSource.Geekbot, $"Now Connected as {_client.CurrentUser.Username} to {_client.Guilds.Count} Servers"); _logger.Information(LogSource.Geekbot, $"Now Connected as {_client.CurrentUser.Username} to {_client.Guilds.Count} Servers");
_logger.Information(LogSource.Geekbot, "Registering Stuff"); _logger.Information(LogSource.Geekbot, "Registering Stuff");
var translationHandler = new TranslationHandler(_database, _logger); var translationHandler = new TranslationHandler(_databaseInitializer.Initialize(), _logger);
var errorHandler = new ErrorHandler(_logger, translationHandler, _runParameters.ExposeErrors); var errorHandler = new ErrorHandler(_logger, translationHandler, _runParameters.ExposeErrors);
var reactionListener = new ReactionListener(_redis.Db); var reactionListener = new ReactionListener(_redis.Db);
_services.AddSingleton<IErrorHandler>(errorHandler); _services.AddSingleton<IErrorHandler>(errorHandler);
@ -173,7 +172,7 @@ namespace Geekbot.net
_servicesProvider = _services.BuildServiceProvider(); _servicesProvider = _services.BuildServiceProvider();
await _commands.AddModulesAsync(Assembly.GetEntryAssembly(), _servicesProvider); await _commands.AddModulesAsync(Assembly.GetEntryAssembly(), _servicesProvider);
var handlers = new Handlers(_database, _client, _logger, _servicesProvider, _commands, _userRepository, reactionListener, applicationInfo); var handlers = new Handlers(_databaseInitializer, _client, _logger, _redis, _servicesProvider, _commands, _userRepository, reactionListener, applicationInfo);
_client.MessageReceived += handlers.RunCommand; _client.MessageReceived += handlers.RunCommand;
_client.MessageDeleted += handlers.MessageDeleted; _client.MessageDeleted += handlers.MessageDeleted;
@ -208,8 +207,8 @@ namespace Geekbot.net
private Task StartWebApi() private Task StartWebApi()
{ {
_logger.Information(LogSource.Api, "Starting Webserver"); _logger.Information(LogSource.Api, "Starting Webserver");
var highscoreManager = new HighscoreManager(_database, _userRepository); var highscoreManager = new HighscoreManager(_databaseInitializer.Initialize(), _userRepository);
WebApiStartup.StartWebApi(_logger, _runParameters, _commands, _database, _client, _globalSettings, highscoreManager); WebApiStartup.StartWebApi(_logger, _runParameters, _commands, _databaseInitializer.Initialize(), _client, _globalSettings, highscoreManager);
return Task.CompletedTask; return Task.CompletedTask;
} }
} }