From 776b562ce701badf6f7a88edb0d9bd2b2b1a7570 Mon Sep 17 00:00:00 2001
From: Una Kearney <me@unascribed.com>
Date: Fri, 5 Dec 2025 19:35:33 -0500
Subject: [PATCH] Move time placeholder impl to TryGetCleanCdnUrl, drop divmod
 in favor of fixed options

---
 PluralKit.Bot/Utils/AvatarUtils.cs | 20 --------------------
 PluralKit.Core/Utils/MiscUtils.cs  | 26 +++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/PluralKit.Bot/Utils/AvatarUtils.cs b/PluralKit.Bot/Utils/AvatarUtils.cs
index c56f22f0..65a208ed 100644
--- a/PluralKit.Bot/Utils/AvatarUtils.cs
+++ b/PluralKit.Bot/Utils/AvatarUtils.cs
@@ -14,10 +14,6 @@ public static class AvatarUtils
 
     private static readonly string DiscordMediaUrlReplacement =
         "https://media.discordapp.net/attachments/$1/$2/$3.$4?width=256&height=256";
-        
-    // Rewrite time "cachebuster" parameters for randomly generated/chosen avatars with custom URLs.
-    // Number match uses `[1-9][0-9]{0,6}` rather than `[0-9]+` to avoid needing to deal with special cases for zero and limit to reasonable numbers.
-    private static readonly Regex TimePlaceholder = new(@"\{time(?:/(?<divisor>[1-9][0-9]{0,6}))?(?:%(?<modulus>[1-9][0-9]{0,6}))?\}", RegexOptions.IgnoreCase);
 
     public static string? TryRewriteCdnUrl(string? url)
     {
@@ -29,24 +25,8 @@ public static class AvatarUtils
         if (match.Groups["query"].Success)
             newUrl += "&" + match.Groups["query"].Value;
 
-        newUrl = TimePlaceholder.Replace(newUrl, ProcessTimePlaceholder);
-
         return newUrl;
     }
-    
-    private static string? ProcessTimePlaceholder(Match m) {
-        // Minutes are the maximum accuracy to avoid too much cache thrashing
-        // AND with the maximum positive value so it's always positive (as if this code will exist long enough for the 64-bit signed unix time to go negative...)
-        var time = (DateTimeOffset.UtcNow.ToUnixTimeSeconds()/60)&Int64.MaxValue;
-
-        if (m.Groups["divisor"].Success)
-            time /= Int32.Parse(m.Groups["divisor"].Value); // as above - guaranteed to not throw and be > 0
-
-        if (m.Groups["modulus"].Success)
-            time %= Int32.Parse(m.Groups["modulus"].Value);
-
-        return time.ToString();
-    }
 
     public static bool IsDiscordCdnUrl(string? url) => url != null && DiscordCdnUrl.Match(url).Success;
 }
\ No newline at end of file
diff --git a/PluralKit.Core/Utils/MiscUtils.cs b/PluralKit.Core/Utils/MiscUtils.cs
index 366deb6b..bb995809 100644
--- a/PluralKit.Core/Utils/MiscUtils.cs
+++ b/PluralKit.Core/Utils/MiscUtils.cs
@@ -4,6 +4,7 @@ namespace PluralKit.Core;
 
 public static class MiscUtils
 {
+	
     // discord mediaproxy URLs used to be stored directly in the database, so now we cleanup image urls before using them outside of proxying
     private static readonly Regex MediaProxyUrl =
         new(
@@ -11,6 +12,10 @@ public static class MiscUtils
 
     private static readonly string DiscordCdnReplacement = "https://cdn.discordapp.com/attachments/$1/$2/$3.$4";
 
+    // Rewrite time "cachebuster" parameters for randomly generated/chosen avatars with custom URLs.
+    private static readonly Regex TimePlaceholder = new(@"\{(time(?:stamp|_(?:1m|5m|30m|1h|6h|1d)))\}");
+    private const Int64 TimeAccuracy = 60;
+
     public static bool TryMatchUri(string input, out Uri uri)
     {
         if (input.StartsWith('<') && input.EndsWith('>'))
@@ -32,5 +37,24 @@ public static class MiscUtils
     }
 
     public static string? TryGetCleanCdnUrl(this string? url) =>
-        url == null ? null : MediaProxyUrl.Replace(url, DiscordCdnReplacement);
+        url == null ? null : TimePlaceholder.Replace(MediaProxyUrl.Replace(url, DiscordCdnReplacement), ProcessTimePlaceholder);
+
+    private static string? ProcessTimePlaceholder(Match m) {
+        // Limit maximum accuracy to avoid too much cache thrashing, multiply for standard-ish Unix time
+        // AND with the maximum positive value so it's always positive (as if this code will exist long enough for the 64-bit signed unix time to go negative...)
+        var time = ((DateTimeOffset.UtcNow.ToUnixTimeSeconds()/TimeAccuracy)*TimeAccuracy)&Int64.MaxValue;
+        
+        switch (m.Groups[1].Value) {
+            case "timestamp": break;
+            case "time_1m": time /= 60; break;
+            case "time_5m": time /= 60*5; break;
+            case "time_30m": time /= 60*30; break;
+            case "time_1h": time /= 60*60; break;
+            case "time_6h": time /= 6*60*60; break;
+            case "time_1d": time /= 24*60*60; break;
+		}
+
+        return time.ToString();
+    }
+
 }
\ No newline at end of file