fix: space formatting all as same

MineInAbyss · Dec 11, 2023 · 0552951 · 0552951
1 parent c6bd2e4
commit 0552951
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt b/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt
@@ -120,6 +120,7 @@ private fun Component.transformEmoteIds(insert: Boolean = true): Component {
 
     spaceRegex.findAll(serialized).forEach { match ->
         val space = match.groupValues[1].toIntOrNull() ?: return@forEach
+        val spaceRegex = "(?<!\\\\):space_(-?$space+):".toRegex()
         msg = msg.replaceText(
             TextReplacementConfig.builder()
                 .match(spaceRegex.pattern)
@@ -131,7 +132,7 @@ private fun Component.transformEmoteIds(insert: Boolean = true): Component {
     escapedSpaceRegex.findAll(serialized).forEach { match ->
         msg = msg.replaceText(
             TextReplacementConfig.builder()
-                .match(escapedSpaceRegex.pattern)
+                .match(match.value)
                 .replacement(match.value.removePrefix("\\"))
                 .build()
         )

diff --git a/core/src/main/kotlin/com/mineinabyss/emojy/config/EmojyConfig.kt b/core/src/main/kotlin/com/mineinabyss/emojy/config/EmojyConfig.kt
@@ -46,11 +46,8 @@ data class EmojyConfig(
     val debug: Boolean = true,
     val emojyList: EmojyList = EmojyList(),
     val supportedLanguages: Set<String> = mutableSetOf("en_us"),
-
     ) {
 
-    enum class ListType { BOOK, BOOK2, CHAT }
-
     @Serializable
     data class EmojyList(
         val ignoredEmoteIds: Set<String> = mutableSetOf(),