fix: argument parsing

MineInAbyss · Nov 27, 2023 · 7d86f5d · 7d86f5d
1 parent 0977091
commit 7d86f5d
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt b/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt
@@ -17,16 +17,20 @@ fun Component.replaceEmoteIds(player: Player? = null, insert: Boolean = true): C
     var msg = GlobalTranslator.render(this, player?.locale() ?: Locale.US)
     val serialized = msg.serialize()
 
-    emojy.emotes.filter { ":${it.id}.*:".toRegex() in serialized && it.checkPermission(player) }.forEach { emote ->
-        val colorable = ":${emote.id}\\|(c|colorable):".toRegex() in serialized
-        val bitmapIndex = ":${emote.id}\\|([0-9]+):".toRegex().find(serialized)?.groupValues?.get(1)?.toIntOrNull() ?: -1
+    emojy.emotes.filter { ":${it.id}(\\|.*?)?:".toRegex() in serialized && it.checkPermission(player) }.forEach { emote ->
+        val matches = ":${emote.id}(\\|(c|colorable|\\d+))*:".toRegex().findAll(serialized)
+        matches.forEach { match ->
+            val colorable = "\\|(c|colorable)".toRegex() in match.value
+            val bitmapIndex = "\\|([0-9]+)".toRegex().find(match.value)?.groupValues?.get(1)?.toIntOrNull() ?: -1
 
-        msg = msg.replaceText(
-            TextReplacementConfig.builder()
-                .match(":${emote.id}.*:")
-                .replacement(emote.formattedUnicode(insert = insert, colorable = colorable, bitmapIndex = bitmapIndex))
-                .build()
-        )
+            val replacement = emote.formattedUnicode(insert = insert, colorable = colorable, bitmapIndex = bitmapIndex)
+            msg = msg.replaceText(
+                TextReplacementConfig.builder()
+                    .matchLiteral(match.value)
+                    .replacement(replacement)
+                    .build()
+            )
+        }
     }
 
     emojy.gifs.filter { ":${it.id}:" in serialized && it.checkPermission(player) }.forEach { gif ->