From 0a6dfe799e43433c1d83fd6e98223585007d4cf5 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Tue, 15 Mar 2022 00:20:07 +0100
Subject: [PATCH] Properly handle filtered messages in party chat

---
 .../com/alttd/velocitychat/handlers/ChatHandler.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
index 667279d..b2cde6f 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
@@ -7,12 +7,14 @@ import com.alttd.chat.managers.PartyManager;
 import com.alttd.chat.managers.RegexManager;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.Mail;
+import com.alttd.chat.objects.ModifiableString;
 import com.alttd.chat.objects.Party;
 import com.alttd.chat.util.ALogger;
 import com.alttd.chat.util.Utility;
 import com.alttd.velocitychat.VelocityChat;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
+import com.mysql.cj.MessageBuilder;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
@@ -115,14 +117,13 @@ public class ChatHandler {
             return;
         }
         Component senderName = user.getDisplayName();
-
-//        String updatedMessage = RegexManager.replaceText(player.getUsername(), uuid, message);
-        String updatedMessage = message; // NEEDS FIXING
-        if(updatedMessage == null) {
+        ModifiableString modifiableString = new ModifiableString(message);
+        if (!RegexManager.filterText(player.getUsername(), uuid, modifiableString, "party")) {
             sendBlockedNotification("Party Language", player, message, "", serverConnection);
             return; // the message was blocked
         }
 
+        String updatedMessage = modifiableString.string();
         if(!player.hasPermission("chat.format")) {
             updatedMessage = Utility.stripTokens(updatedMessage);
         }