fix: messageDeletion component not closing clickable to format

MineInAbyss · Jan 20, 2024 · f4f6c17 · f4f6c17
1 parent c10f862
commit f4f6c17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/helpers/ChatHelpers.kt b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/helpers/ChatHelpers.kt
@@ -156,8 +156,8 @@ fun formatModerationMessage(messageDeletion: ChattyChannel.MessageDeletion, mess
 
     return when {
         !messageDeletion.enabled || audience !is Player || audience == source || !audience.hasPermission(ChattyPermissions.MODERATION_PERM) -> message
-        messageDeletion.position == ChattyChannel.MessageDeletion.MessageDeletionPosition.PREFIX -> messageDeletion.format.miniMsg().appendDeletionHover(audience).append(message)
-        messageDeletion.position == ChattyChannel.MessageDeletion.MessageDeletionPosition.SUFFIX -> message.append(messageDeletion.format.miniMsg().appendDeletionHover(audience))
+        messageDeletion.position == ChattyChannel.MessageDeletion.MessageDeletionPosition.PREFIX -> Component.textOfChildren(messageDeletion.format.miniMsg().appendDeletionHover(audience), message)
+        messageDeletion.position == ChattyChannel.MessageDeletion.MessageDeletionPosition.SUFFIX -> Component.textOfChildren(message, messageDeletion.format.miniMsg().appendDeletionHover(audience))
         else -> message
     }
 }

diff --git a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/DiscordListener.kt b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/DiscordListener.kt
@@ -117,12 +117,10 @@ class DiscordListener {
 
     private fun String.translateEmoteIDs(): String {
         var translated = this
-        chatty.emotefixer.emotes.entries.forEach { (emoteId, replacement) ->
-            val id = ":$emoteId:"
-            if (id in this) {
-                translated = translated.replace(id, replacement)
-            }
+        chatty.emotefixer.emotes.entries.map { ":${it.key}:" to it.value }.forEach { (emoteId, replacement) ->
+            translated = translated.replace(emoteId, replacement)
         }
+
         return translated.cleanUpHackyFix()
     }
 }