From 3b1bc8b34c7dde82ae76ff5c9514df3688ec3c98 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 2 Feb 2024 09:18:50 -0500 Subject: [PATCH] Fixed mention bug --- .../messaging/discord/DiscordMessageBuilder.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hypherionmc/sdlink/core/messaging/discord/DiscordMessageBuilder.java b/src/main/java/com/hypherionmc/sdlink/core/messaging/discord/DiscordMessageBuilder.java index 7f33e33..8e9a077 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/messaging/discord/DiscordMessageBuilder.java +++ b/src/main/java/com/hypherionmc/sdlink/core/messaging/discord/DiscordMessageBuilder.java @@ -11,6 +11,8 @@ import com.hypherionmc.sdlink.core.config.SDLinkConfig; import com.hypherionmc.sdlink.core.config.impl.MessageIgnoreConfig; import com.hypherionmc.sdlink.core.messaging.MessageType; +import java.util.regex.Pattern; + /** * @author HypherionSA * Used to construct a {@link DiscordMessage} to be sent back to discord @@ -58,11 +60,18 @@ public final class DiscordMessageBuilder { */ public DiscordMessageBuilder message(String message) { if (this.messageType == MessageType.CHAT) { - message = message.replace("@everyone", ""); - message = message.replace("@here", ""); + //using regex to replace @here and @everyone mentions + message = Pattern.compile("@+(here|everyone)").matcher(message).replaceAll(""); + +// message = message.replace("@everyone", ""); +// message = message.replace("@here", ""); if (!SDLinkConfig.INSTANCE.chatConfig.allowMentionsFromChat) { - message = message.replace("<@", ""); + + //using regex to replace any mention + message = Pattern.compile("<[^>]*\\d+>").matcher(message).replaceAll(""); + +// message = message.replace("<@", ""); } }