From f4f6c17d2a6de308a0365b676e33ba605efe6e76 Mon Sep 17 00:00:00 2001 From: Boy <sivertpaulsen2@gmail.com> Date: Sat, 20 Jan 2024 14:13:44 +0100 Subject: [PATCH] fix: messageDeletion component not closing clickable to format --- .../kotlin/com/mineinabyss/chatty/helpers/ChatHelpers.kt | 4 ++-- .../com/mineinabyss/chatty/listeners/DiscordListener.kt | 8 +++----- 2 files changed, 5 insertions(+), 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 index 0f64f7b..9ec9c3b 100644 --- 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 index c4e0093..fc99cde 100644 --- 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() } }