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

Hopefully fix error in LogClean module

Browse Source
This commit is contained in:
Ske 2020-05-01 19:41:15 +02:00
parent e7b28261b2
commit 91b60367f0
1 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using Dapper;
using DSharpPlus; using DSharpPlus;
using DSharpPlus.Entities; using DSharpPlus.Entities;
using DSharpPlus.Exceptions;
using PluralKit.Core; using PluralKit.Core;
@ -78,44 +79,55 @@ namespace PluralKit.Bot
// If we didn't find anything before, or what we found is an unsupported bot, bail // If we didn't find anything before, or what we found is an unsupported bot, bail
if (bot == null) return; if (bot == null) return;
// We try two ways of extracting the actual message, depending on the bots try
if (bot.FuzzyExtractFunc != null)
{ {
// Some bots (Carl, Circle, etc) only give us a user ID and a rough timestamp, so we try our best to // We try two ways of extracting the actual message, depending on the bots
// "cross-reference" those with the message DB. We know the deletion event happens *after* the message if (bot.FuzzyExtractFunc != null)
// was sent, so we're checking for any messages sent in the same guild within 3 seconds before the {
// delete event timestamp, which is... good enough, I think? Potential for false positives and negatives // Some bots (Carl, Circle, etc) only give us a user ID and a rough timestamp, so we try our best to
// either way but shouldn't be too much, given it's constrained by user ID and guild. // "cross-reference" those with the message DB. We know the deletion event happens *after* the message
var fuzzy = bot.FuzzyExtractFunc(msg); // was sent, so we're checking for any messages sent in the same guild within 3 seconds before the
if (fuzzy == null) return; // delete event timestamp, which is... good enough, I think? Potential for false positives and negatives
// either way but shouldn't be too much, given it's constrained by user ID and guild.
var fuzzy = bot.FuzzyExtractFunc(msg);
if (fuzzy == null) return;
using var conn = await _db.Obtain(); using var conn = await _db.Obtain();
var mid = await conn.QuerySingleOrDefaultAsync<ulong?>( var mid = await 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(fuzzy.Value.ApproxTimestamp - TimeSpan.FromSeconds(3)) ApproxId = DiscordUtils.InstantToSnowflake(
}); fuzzy.Value.ApproxTimestamp - TimeSpan.FromSeconds(3))
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. if (mid == null) return; // If we didn't find a corresponding message, bail
await msg.DeleteAsync(); // Otherwise, we can *reasonably assume* that this is a logged deletion, so delete the log message.
await msg.DeleteAsync();
}
else if (bot.ExtractFunc != null)
{
// Other bots give us the message ID itself, and we can just extract that from the database directly.
var extractedId = bot.ExtractFunc(msg);
if (extractedId == null) return; // If we didn't find anything, bail.
using var conn = await _db.Obtain();
// We do this through an inline query instead of through DataStore since we don't need all the joins it does
var mid = await conn.QuerySingleOrDefaultAsync<ulong?>(
"select mid from messages where original_mid = @Mid", new {Mid = extractedId.Value});
if (mid == null) return;
// If we've gotten this far, we found a logged deletion of a trigger message. Just yeet it!
await msg.DeleteAsync();
} // else should not happen, but idk, it might
} }
else if (bot.ExtractFunc != null) catch (NotFoundException)
{ {
// Other bots give us the message ID itself, and we can just extract that from the database directly. // Sort of a temporary measure: getting an error in Sentry about a NotFoundException from D#+ here
var extractedId = bot.ExtractFunc(msg); // The only thing I can think of that'd cause this are the DeleteAsync() calls which 404 when
if (extractedId == null) return; // If we didn't find anything, bail. // the message doesn't exist anyway - so should be safe to just ignore it, right?
}
using var conn = await _db.Obtain();
// We do this through an inline query instead of through DataStore since we don't need all the joins it does
var mid = await conn.QuerySingleOrDefaultAsync<ulong?>("select mid from messages where original_mid = @Mid", new {Mid = extractedId.Value});
if (mid == null) return;
// If we've gotten this far, we found a logged deletion of a trigger message. Just yeet it!
await msg.DeleteAsync();
} // else should not happen, but idk, it might
} }
private static ulong? ExtractAuttaja(DiscordMessage msg) private static ulong? ExtractAuttaja(DiscordMessage msg)