eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-11 16:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: remove unused logclean paramter ApproxTimestamp

Browse source
This commit is contained in:
Petal Ladenson 2024-12-05 17:12:33 -07:00 • committed by GitHub
parent 31934b3b7a
commit 3f6d9e5a10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

43
PluralKit.Bot/Services/LoggerCleanService.cs
View file

@ -125,10 +125,10 @@ public class LoggerCleanService
// Some bots have different log formats so we check for both types of extract function // Some bots have different log formats so we check for both types of extract function
if (bot.FuzzyExtractFunc != null) 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 // Some bots (Carl, Circle, etc) only give us a user ID, so we try our best to
// "cross-reference" those with the message DB. We know the deletion event happens *after* the message // "cross-reference" those with the message DB. We know the deletion event happens *after* the message
// was sent, so we're checking for any messages sent in the same guild within 3 seconds before the // 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 // delete event log, 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. // either way but shouldn't be too much, given it's constrained by user ID and guild.
var fuzzy = bot.FuzzyExtractFunc(msg); var fuzzy = bot.FuzzyExtractFunc(msg);
if (fuzzy != null) if (fuzzy != null)
@ -267,8 +267,8 @@ public class LoggerCleanService
private static FuzzyExtractResult? ExtractCircle(Message msg) private static FuzzyExtractResult? ExtractCircle(Message msg)
{ {
// Like Auttaja, Circle has both embed and compact modes, but the regex works for both. // Like Auttaja, Circle has both embed and compact modes, but the regex works for both.
// Compact: "Message from [user] ([id]) deleted in [channel]", no timestamp (use message time) // Compact: "Message from [user] ([id]) deleted in [channel]"
// Embed: Message Author field: "[user] ([id])", then an embed timestamp // Embed: Message Author field: "[user] ([id])"
var stringWithId = msg.Content; var stringWithId = msg.Content;
if (msg.Embeds?.Length > 0) if (msg.Embeds?.Length > 0)
{ {
@ -285,24 +285,21 @@ public class LoggerCleanService
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
private static FuzzyExtractResult? ExtractPancake(Message msg) private static FuzzyExtractResult? ExtractPancake(Message msg)
{ {
// Embed, author is "Message Deleted", description includes a mention, timestamp is *message send time* (but no ID) // Embed, author is "Message Deleted", description includes a mention
// so we use the message timestamp to get somewhere *after* the message was proxied
var embed = msg.Embeds?.FirstOrDefault(); var embed = msg.Embeds?.FirstOrDefault();
if (embed?.Description == null || embed.Author?.Name != "Message Deleted") return null; if (embed?.Description == null || embed.Author?.Name != "Message Deleted") return null;
var match = _pancakeRegex.Match(embed.Description); var match = _pancakeRegex.Match(embed.Description);
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
@ -325,8 +322,7 @@ public class LoggerCleanService
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
@ -342,8 +338,7 @@ public class LoggerCleanService
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
@ -351,14 +346,12 @@ public class LoggerCleanService
private static FuzzyExtractResult? ExtractGearBot(Message msg) private static FuzzyExtractResult? ExtractGearBot(Message msg)
{ {
// Simple text based message log. // Simple text based message log.
// No message ID, but we have timestamp and author ID. // No message ID, but we have author ID.
// Not using timestamp here though (seems to be same as message timestamp), might be worth implementing in the future.
var match = _GearBotRegex.Match(msg.Content); var match = _GearBotRegex.Match(msg.Content);
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
@ -373,14 +366,11 @@ public class LoggerCleanService
private static FuzzyExtractResult? ExtractVortex(Message msg) private static FuzzyExtractResult? ExtractVortex(Message msg)
{ {
// timestamp is HH:MM:SS
// however, that can be set to the user's timezone, so we just use the message timestamp
var match = _VortexRegex.Match(msg.Content); var match = _VortexRegex.Match(msg.Content);
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[2].Value), User = ulong.Parse(match.Groups[2].Value)
ApproxTimestamp = msg.Timestamp().ToInstant()
} }
: null; : null;
} }
@ -388,15 +378,12 @@ public class LoggerCleanService
private static FuzzyExtractResult? ExtractProBot(Message msg) private static FuzzyExtractResult? ExtractProBot(Message msg)
{ {
// user ID and channel ID are in the embed description (we don't use channel ID) // user ID and channel ID are in the embed description (we don't use channel ID)
// timestamp is in the embed footer
if (msg.Embeds.Length == 0 || msg.Embeds[0].Description == null) return null; if (msg.Embeds.Length == 0 || msg.Embeds[0].Description == null) return null;
var match = _ProBotRegex.Match(msg.Embeds[0].Description); var match = _ProBotRegex.Match(msg.Embeds[0].Description);
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[1].Value), User = ulong.Parse(match.Groups[1].Value)
ApproxTimestamp = OffsetDateTimePattern.Rfc3339
.Parse(msg.Embeds[0].Timestamp).GetValueOrThrow().ToInstant()
} }
: null; : null;
} }
@ -435,8 +422,7 @@ public class LoggerCleanService
return match.Success return match.Success
? new FuzzyExtractResult ? new FuzzyExtractResult
{ {
User = ulong.Parse(match.Groups[2].Value), User = ulong.Parse(match.Groups[2].Value)
ApproxTimestamp = DateTimeOffset.FromUnixTimeSeconds(long.Parse(match.Groups[1].Value)).ToInstant()
} }
: null; : null;
} }
@ -465,6 +451,5 @@ public class LoggerCleanService
public struct FuzzyExtractResult public struct FuzzyExtractResult
{ {
public ulong User { get; set; } public ulong User { get; set; }
public Instant ApproxTimestamp { get; set; }
} }
} }