From 3040b1472c8f6901126fb98b5ba73a9f7e882dcf Mon Sep 17 00:00:00 2001
From: Vankka <vankka.main@gmail.com>
Date: Fri, 21 Jul 2023 17:07:16 +0300
Subject: [PATCH] Don't force discord serialization for join, leave, death and
 server switch messages

---
 .../game/AbstractGameMessageModule.java       |  5 -----
 .../game/DeathMessageModule.java              |  7 ++-----
 .../game/JoinMessageModule.java               |  8 ++++----
 .../game/LeaveMessageModule.java              |  6 +++---
 .../game/ServerSwitchMessageModule.java       |  8 ++++----
 .../MinecraftToDiscordChatModule.java         | 19 +++++++++----------
 6 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java
index a8522e2a..bef11c19 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java
@@ -35,7 +35,6 @@ import com.discordsrv.common.future.util.CompletableFutureUtil;
 import com.discordsrv.common.logging.NamedLogger;
 import com.discordsrv.common.module.type.AbstractModule;
 import com.discordsrv.common.player.IPlayer;
-import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -159,10 +158,6 @@ public abstract class AbstractGameMessageModule<T extends IMessageConfig, E exte
         });
     }
 
-    public String convertComponent(T config, Component component) {
-        return discordSRV.componentFactory().discordSerializer().serialize(component);
-    }
-
     public Map<CompletableFuture<ReceivedDiscordMessage>, DiscordGuildMessageChannel> sendMessageToChannels(
             T config,
             IPlayer player,
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
index 9d80d42a..d947e588 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
@@ -25,12 +25,11 @@ import com.discordsrv.api.event.bus.EventPriority;
 import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.DeathMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent;
-import com.discordsrv.api.placeholder.FormattedText;
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.component.util.ComponentUtil;
-import com.discordsrv.common.config.main.channels.server.DeathMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
 import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
+import com.discordsrv.common.config.main.channels.server.DeathMessageConfig;
 
 public class DeathMessageModule extends AbstractGameMessageModule<DeathMessageConfig, DeathMessageReceiveEvent> {
 
@@ -65,9 +64,7 @@ public class DeathMessageModule extends AbstractGameMessageModule<DeathMessageCo
             SendableDiscordMessage.Formatter formatter
     ) {
         MinecraftComponent messageComponent = event.getMessage();
-        String message = messageComponent != null ? convertComponent(config, ComponentUtil.fromAPI(messageComponent)) : null;
-
-        formatter.addPlaceholder("message", new FormattedText(message));
+        formatter.addPlaceholder("message", ComponentUtil.fromAPI(messageComponent));
     }
 
 }
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java
index 887e9647..e7d4c3b5 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java
@@ -25,11 +25,11 @@ import com.discordsrv.api.event.bus.EventPriority;
 import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.JoinMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.JoinMessageReceiveEvent;
-import com.discordsrv.api.placeholder.FormattedText;
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.component.util.ComponentUtil;
-import com.discordsrv.common.config.main.generic.IMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
+import com.discordsrv.common.config.main.generic.IMessageConfig;
+import net.kyori.adventure.text.Component;
 
 public class JoinMessageModule extends AbstractGameMessageModule<IMessageConfig, JoinMessageReceiveEvent> {
 
@@ -69,8 +69,8 @@ public class JoinMessageModule extends AbstractGameMessageModule<IMessageConfig,
             SendableDiscordMessage.Formatter formatter
     ) {
         MinecraftComponent messageComponent = event.getMessage();
-        String message = messageComponent != null ? convertComponent(config, ComponentUtil.fromAPI(messageComponent)) : null;
+        Component message = messageComponent != null ? ComponentUtil.fromAPI(messageComponent) : null;
 
-        formatter.addPlaceholder("message", new FormattedText(message));
+        formatter.addPlaceholder("message", message);
     }
 }
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
index 5afd7ca0..8df1a3c3 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
@@ -25,11 +25,11 @@ import com.discordsrv.api.event.bus.EventPriority;
 import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.LeaveMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.LeaveMessageReceiveEvent;
-import com.discordsrv.api.placeholder.FormattedText;
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.component.util.ComponentUtil;
 import com.discordsrv.common.config.main.channels.LeaveMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
+import net.kyori.adventure.text.Component;
 
 public class LeaveMessageModule extends AbstractGameMessageModule<LeaveMessageConfig, LeaveMessageReceiveEvent> {
 
@@ -64,8 +64,8 @@ public class LeaveMessageModule extends AbstractGameMessageModule<LeaveMessageCo
             SendableDiscordMessage.Formatter formatter
     ) {
         MinecraftComponent messageComponent = event.getMessage();
-        String message = messageComponent != null ? convertComponent(config, ComponentUtil.fromAPI(messageComponent)) : null;
+        Component message = messageComponent != null ? ComponentUtil.fromAPI(messageComponent) : null;
 
-        formatter.addPlaceholder("message", new FormattedText(message));
+        formatter.addPlaceholder("message", message);
     }
 }
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
index e5c598df..7c275c48 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
@@ -25,12 +25,12 @@ import com.discordsrv.api.event.bus.EventPriority;
 import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.ServerSwitchMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.ServerSwitchMessageReceiveEvent;
-import com.discordsrv.api.placeholder.FormattedText;
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.component.util.ComponentUtil;
-import com.discordsrv.common.config.main.channels.proxy.ServerSwitchMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
 import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig;
+import com.discordsrv.common.config.main.channels.proxy.ServerSwitchMessageConfig;
+import net.kyori.adventure.text.Component;
 
 public class ServerSwitchMessageModule extends AbstractGameMessageModule<ServerSwitchMessageConfig, ServerSwitchMessageReceiveEvent> {
 
@@ -65,8 +65,8 @@ public class ServerSwitchMessageModule extends AbstractGameMessageModule<ServerS
             SendableDiscordMessage.Formatter formatter
     ) {
         MinecraftComponent messageComponent = event.getMessage();
-        String message = messageComponent != null ? convertComponent(config, ComponentUtil.fromAPI(messageComponent)) : null;
+        Component message = messageComponent != null ? ComponentUtil.fromAPI(messageComponent) : null;
 
-        formatter.addPlaceholder("message", new FormattedText(message));
+        formatter.addPlaceholder("message", message);
     }
 }
diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java
index db8058b4..584079de 100644
--- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java
@@ -76,16 +76,6 @@ public class MinecraftToDiscordChatModule extends AbstractGameMessageModule<Mine
         discordSRV.eventBus().publish(new GameChatMessageForwardedEvent(cluster));
     }
 
-    @Override
-    public String convertComponent(MinecraftToDiscordChatConfig config, Component component) {
-        String content = discordSRV.placeholderService().getResultAsPlain(component).toString();
-
-        Placeholders messagePlaceholders = new Placeholders(content);
-        config.contentRegexFilters.forEach(messagePlaceholders::replaceAll);
-
-        return messagePlaceholders.toString();
-    }
-
     @Override
     public Map<CompletableFuture<ReceivedDiscordMessage>, DiscordGuildMessageChannel> sendMessageToChannels(
             MinecraftToDiscordChatConfig config,
@@ -233,6 +223,15 @@ public class MinecraftToDiscordChatModule extends AbstractGameMessageModule<Mine
                 .build();
     }
 
+    public String convertComponent(MinecraftToDiscordChatConfig config, Component component) {
+        String content = discordSRV.placeholderService().getResultAsPlain(component).toString();
+
+        Placeholders messagePlaceholders = new Placeholders(content);
+        config.contentRegexFilters.forEach(messagePlaceholders::replaceAll);
+
+        return messagePlaceholders.toString();
+    }
+
     private String preventEveryoneMentions(boolean everyoneAllowed, String message) {
         if (everyoneAllowed) {
             // Nothing to do