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

Optimize DB access for LogClean

Browse Source
This commit is contained in:
Ske 2020-09-09 22:20:52 +02:00
parent a1da3e1386
commit 47bdc34142
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,16 +94,16 @@ namespace PluralKit.Bot
var fuzzy = bot.FuzzyExtractFunc(msg); var fuzzy = bot.FuzzyExtractFunc(msg);
if (fuzzy == null) return; if (fuzzy == null) return;
using var conn = await _db.Obtain(); var mid = await _db.Execute(conn =>
var mid = await conn.QuerySingleOrDefaultAsync<ulong?>( conn.QuerySingleOrDefaultAsync<ulong?>(
"select mid from messages where sender = @User and mid > @ApproxID and guild = @Guild limit 1", "select mid from messages where sender = @User and mid > @ApproxID and guild = @Guild limit 1",
new new
{ {
fuzzy.Value.User, fuzzy.Value.User,
Guild = msg.Channel.GuildId, Guild = msg.Channel.GuildId,
ApproxId = DiscordUtils.InstantToSnowflake( ApproxId = DiscordUtils.InstantToSnowflake(
fuzzy.Value.ApproxTimestamp - TimeSpan.FromSeconds(3)) fuzzy.Value.ApproxTimestamp - TimeSpan.FromSeconds(3))
}); }));
if (mid == null) return; // If we didn't find a corresponding message, bail if (mid == null) return; // If we didn't find a corresponding message, bail
// Otherwise, we can *reasonably assume* that this is a logged deletion, so delete the log message. // Otherwise, we can *reasonably assume* that this is a logged deletion, so delete the log message.
await msg.DeleteAsync(); await msg.DeleteAsync();
@ -114,10 +114,8 @@ namespace PluralKit.Bot
var extractedId = bot.ExtractFunc(msg); var extractedId = bot.ExtractFunc(msg);
if (extractedId == null) return; // If we didn't find anything, bail. if (extractedId == null) return; // If we didn't find anything, bail.
using var conn = await _db.Obtain(); var mid = await _db.Execute(conn => conn.QuerySingleOrDefaultAsync<ulong?>(
// We do this through an inline query instead of through DataStore since we don't need all the joins it does "select mid from messages where original_mid = @Mid", new {Mid = extractedId.Value}));
var mid = await conn.QuerySingleOrDefaultAsync<ulong?>(
"select mid from messages where original_mid = @Mid", new {Mid = extractedId.Value});
if (mid == null) return; if (mid == null) return;
// If we've gotten this far, we found a logged deletion of a trigger message. Just yeet it! // If we've gotten this far, we found a logged deletion of a trigger message. Just yeet it!