From 369c770398fbc4f89c07ab35be4055c7db6019c3 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Wed, 10 May 2023 09:50:07 +0700
Subject: [PATCH] add support for & color codes in discord

---
 pom.xml                                          |  6 ++++++
 .../chomens_bot/plugins/DiscordPlugin.java       | 16 +++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c836d49f..d47702bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.12.4</version>
         </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>4.13.1</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java
index 11d5e654..ee1ca067 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java
@@ -18,6 +18,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
@@ -155,17 +156,18 @@ public class DiscordPlugin {
                                       )
                                       .clickEvent(ClickEvent.openUrl(discordUrl));
 
+                              final Component deserialized = LegacyComponentSerializer.legacyAmpersand().deserialize(message.replace("\uD83D\uDC80", "☠"));
+
+                              final Component messageComponent = Component
+                                      .text("")
+                                      .color(NamedTextColor.GRAY)
+                                      .append(deserialized.append(attachmentsComponent));
+
                               final Component component = Component.translatable(
                                       "[%s] %s › %s",
                                       discordComponent,
                                       nameComponent,
-                                      Component
-                                              .text(
-                                                      message
-                                                            .replace("\uD83D\uDC80", "☠")
-                                              )
-                                              .color(NamedTextColor.GRAY)
-                                              .append(attachmentsComponent)
+                                      messageComponent
                               ).color(NamedTextColor.DARK_GRAY);
                               bot.chat().tellraw(component);
                           }