From c8c79d3eaed79afa85cb3e42815ec1553f83b1d8 Mon Sep 17 00:00:00 2001
From: Nuno Duque Nunes <nunoduquenunes@gmail.com>
Date: Fri, 12 Jun 2026 16:49:24 +0100
Subject: [PATCH] refactor Emoji.resolveTokens() to include :key: emoji format

---
 src/systems/emojis.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/systems/emojis.ts b/src/systems/emojis.ts
index 2addf2a..7092497 100644
--- a/src/systems/emojis.ts
+++ b/src/systems/emojis.ts
@@ -88,6 +88,17 @@
   },
 
   resolveTokens(text: string): string {
-    return text.replace(/\{emoji:([^}]+)\}/g, (_, key: string) => Emoji.get(key) || `{emoji:${key}}`)
+    return text
+      // Handle <:key:> or <:key:123456> format
+      .replace(/<:([^:]+):(?:\d*)?>/g, (_, key) => Emoji.get(key) || `<:${key}:>`)
+      // Handle :key: format (simpler notation in update JSONs)
+      .replace(/:([a-z0-9_]+):/g, (match, key) => {
+        const emoji = Emoji.get(key);
+        return emoji || match; // leave as-is if not found
+      });
   },
+
+  // resolveTokens(text: string): string {
+  //   return text.replace(/\{emoji:([^}]+)\}/g, (_, key: string) => Emoji.get(key) || `{emoji:${key}}`)
+  // },
  }