Clean up a few database pool uses

This commit is contained in:
Ske
2021-09-03 22:20:07 +02:00
parent 13260a4b0e
commit 9bbe9df16d
5 changed files with 29 additions and 25 deletions

View File

@@ -31,7 +31,7 @@ namespace PluralKit.Bot
await _db.Execute(conn => _repo.SaveCommandMessage(conn, messageId, authorId));
}
public async Task<CommandMessage> GetCommandMessage(IPKConnection conn, ulong messageId)
public async Task<CommandMessage?> GetCommandMessage(IPKConnection conn, ulong messageId)
{
return await _repo.GetCommandMessage(conn, messageId);
}

View File

@@ -43,9 +43,13 @@ namespace PluralKit.Bot
var triggerChannel = _cache.GetChannel(proxiedMessage.Channel);
await using var conn = await _db.Obtain();
var system = await _repo.GetSystem(conn, ctx.SystemId.Value);
var member = await _repo.GetMember(conn, proxiedMessage.Member);
PKSystem system;
PKMember member;
await using (var conn = await _db.Obtain())
{
system = await _repo.GetSystem(conn, ctx.SystemId.Value);
member = await _repo.GetMember(conn, proxiedMessage.Member);
}
// Send embed!
var embed = _embed.CreateLoggedMessageEmbed(trigger, hookMessage, system.Hid, member, triggerChannel.Name, oldContent);