From 7bdeeed8e37edb6191391392d90110bc5ad18a8f Mon Sep 17 00:00:00 2001
From: Boy <sivertpaulsen2@gmail.com>
Date: Mon, 26 Feb 2024 12:23:31 +0100
Subject: [PATCH] fix: use correct pluginMessage channel for discord -> mc

---
 .../kotlin/com/mineinabyss/chatty/helpers/ChatHelpers.kt   | 7 +++----
 .../com/mineinabyss/chatty/listeners/DiscordListener.kt    | 4 ++--
 2 files changed, 5 insertions(+), 6 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 1392b21..475764e 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
@@ -221,11 +221,10 @@ fun handleChatFilters(message: Component, player: Player, audience: Player?) : C
 fun handleUrlReplacements(message: Component, player: Player?): Component {
     var component = message
     component.clickEvent()?.takeIf { it.action() == ClickEvent.Action.OPEN_URL }?.let { clickEvent ->
-        val (regex, textReplacement) = chatty.config.chat.urlReplacements.firstOrNull { it.regex in clickEvent.value() }?.let { it.regex to it.replacement } ?: return@let
-        component = component.replaceText(TextReplacementConfig.builder().match(regex.pattern).replacement(textReplacement).build())
-
+        val (regex, replacement) = chatty.config.chat.urlReplacements.firstOrNull { it.regex in clickEvent.value() }?.let { it.regex to it.replacement } ?: return@let
         val hoverComponent = Component.text(clickEvent.value()).style(Style.style(TextDecoration.UNDERLINED))
-        component = component.hoverEvent(HoverEventSource.unbox(HoverEvent.showText(hoverComponent)))
+        component = component.replaceText(TextReplacementConfig.builder().match(regex.pattern).replacement(replacement.hoverEventShowText(hoverComponent)).build())
     }
+
     return component.children(component.children().map { handleUrlReplacements(it, player) })
 }
\ No newline at end of file
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 d2abf94..f481f60 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
@@ -1,8 +1,8 @@
 package com.mineinabyss.chatty.listeners
 
 import com.mineinabyss.chatty.chatty
-import com.mineinabyss.chatty.chattyProxyChannel
 import com.mineinabyss.chatty.components.ChannelData
+import com.mineinabyss.chatty.discordSrvChannel
 import com.mineinabyss.chatty.helpers.defaultChannel
 import com.mineinabyss.chatty.helpers.globalChannel
 import com.mineinabyss.chatty.helpers.handleChatFilters
@@ -37,7 +37,7 @@ class DiscordListener {
         val simpleMessage = mm.deserialize(message.author.name + ": " + message.contentRaw)
         val message = if (chatty.config.chat.formatURLs) handleUrlReplacements(minecraftMessage.toComponent(), null).toComponentDSV() else minecraftMessage
         val minecraftMessage = ComponentDSV.textOfChildren(senderName, channelId, message, simpleMessage)
-        chatty.plugin.server.sendPluginMessage(chatty.plugin, chattyProxyChannel, gson.serialize(minecraftMessage).toByteArray())
+        chatty.plugin.server.sendPluginMessage(chatty.plugin, discordSrvChannel, gson.serialize(minecraftMessage).toByteArray())
         setMinecraftMessage(message)
     }