From a06e5d37aaf3ba5f1e11fbd2f3620883f60be75e Mon Sep 17 00:00:00 2001
From: rladenson <habonimkef@gmail.com>
Date: Tue, 19 Nov 2024 01:51:43 -0700
Subject: [PATCH] feat: change annabelle logclean to use the timestamp in the
 message

---
 PluralKit.Bot/Services/LoggerCleanService.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PluralKit.Bot/Services/LoggerCleanService.cs b/PluralKit.Bot/Services/LoggerCleanService.cs
index 6810ee24..a08382c3 100644
--- a/PluralKit.Bot/Services/LoggerCleanService.cs
+++ b/PluralKit.Bot/Services/LoggerCleanService.cs
@@ -43,7 +43,7 @@ public class LoggerCleanService
     private static readonly Regex _DozerRegex = new("Message ID: (\\d{17,19}) - (\\d{17,19})\nUserID: (\\d{17,19})");
     private static readonly Regex _SkyraRegex = new("https://discord.com/channels/(\\d{17,19})/(\\d{17,19})/(\\d{17,19})");
     private static readonly Regex _AnnabelleRegex = new("```\n(\\d{17,19})\n```");
-    private static readonly Regex _AnnabelleRegexFuzzy = new("A message from \\*\\*[\\w.]{2,32}\\*\\* \\(`(\\d{17,19})`\\) was deleted in <#\\d{17,19}>");
+    private static readonly Regex _AnnabelleRegexFuzzy = new("\\<t:(\\d+)\\> A message from \\*\\*[\\w.]{2,32}\\*\\* \\(`(\\d{17,19})`\\) was deleted in <#\\d{17,19}>");
 
     private static readonly Regex _VortexRegex =
         new("`\\[(\\d\\d:\\d\\d:\\d\\d)\\]` .* \\(ID:(\\d{17,19})\\).* <#\\d{17,19}>:");
@@ -81,7 +81,7 @@ public class LoggerCleanService
         new LoggerBot("ProBot Prime", 567703512763334685, fuzzyExtractFunc: ExtractProBot), // webhook (?)
         new LoggerBot("Dozer", 356535250932858885, ExtractDozer),
         new LoggerBot("Skyra", 266624760782258186, ExtractSkyra),
-        new LoggerBot("Annabelle", 231241068383961088, ExtractAnnabelle, fuzzyExtractFunc: ExtractAnnabelleFuzzy),
+        new LoggerBot("Annabelle", 231241068383961088, fuzzyExtractFunc: ExtractAnnabelleFuzzy),
     }.ToDictionary(b => b.Id);
 
     private static Dictionary<ulong, LoggerBot> _botsByApplicationId
@@ -138,6 +138,7 @@ public class LoggerCleanService
                         bot.Name, msg.Id, fuzzy);
 
                     var exists = await _redis.HasLogCleanup(fuzzy.Value.User, msg.GuildId.Value);
+                    _logger.Debug(exists.ToString());
 
                     // If we didn't find a corresponding message, bail
                     if (!exists) return;
@@ -428,15 +429,14 @@ public class LoggerCleanService
     private static FuzzyExtractResult? ExtractAnnabelleFuzzy(Message msg)
     {
         // matching for annabelle's non-precise non-embed format
-        // it has a discord (unix) timestamp but I (Petalss) can't get that to convert to rfc3339 so
-        // we use the message timestamp
+        // it has a discord (unix) timestamp for the message so we use that
         if (msg.Embeds.Length != 0) return null;
         var match = _AnnabelleRegexFuzzy.Match(msg.Content);
         return match.Success
             ? new FuzzyExtractResult
             {
-                User = ulong.Parse(match.Groups[1].Value),
-                ApproxTimestamp = msg.Timestamp().ToInstant()
+                User = ulong.Parse(match.Groups[2].Value),
+                ApproxTimestamp = DateTimeOffset.FromUnixTimeSeconds(long.Parse(match.Groups[1].Value)).ToInstant()
             }
             : null;
     }