From 885f6196e88be813023666cd242a024e222ba7a1 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 20 May 2022 15:44:25 -0500 Subject: [PATCH] Reformat and reduce complexity --- .../dev/plex/listener/impl/ChatListener.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/dev/plex/listener/impl/ChatListener.java b/server/src/main/java/dev/plex/listener/impl/ChatListener.java index 543dfef..cb1b3aa 100644 --- a/server/src/main/java/dev/plex/listener/impl/ChatListener.java +++ b/server/src/main/java/dev/plex/listener/impl/ChatListener.java @@ -24,7 +24,14 @@ import org.jetbrains.annotations.NotNull; @Toggleable("chat.enabled") public class ChatListener extends PlexListener { - private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig.builder().match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]").replacement((matchResult, builder) -> Component.empty().content(matchResult.group()).clickEvent(ClickEvent.openUrl(matchResult.group()))).build(); + private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig + .builder() + .match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]") + .replacement((matchResult, builder) -> Component.empty() + .content(matchResult.group()) + .clickEvent(ClickEvent.openUrl( + matchResult.group() + ))).build(); @EventHandler public void onChat(AsyncChatEvent event) @@ -78,7 +85,14 @@ public class ChatListener extends PlexListener { component = component.append(prefix).append(Component.space()); } - return component.append(PlexUtils.mmDeserialize(plugin.config.getString("chat.name-color", "") + MiniMessage.builder().tags(TagResolver.resolver(StandardTags.color(), StandardTags.rainbow(), StandardTags.decorations(), StandardTags.gradient(), StandardTags.transition())).build().serialize(sourceDisplayName))).append(Component.space()).append(Component.text("»").color(NamedTextColor.GRAY)).append(Component.space()).append(SafeMiniMessage.mmDeserializeWithoutEvents(text)).replaceText(URL_REPLACEMENT_CONFIG); + return component + .append(Component.space()) + .append(PlexUtils.mmDeserialize(plugin.config.getString("chat.name-color", "") + SafeMiniMessage.MINI_MESSAGE.serialize(sourceDisplayName))) + .append(Component.space()) + .append(Component.text("»").color(NamedTextColor.GRAY)) + .append(Component.space()) + .append(SafeMiniMessage.mmDeserializeWithoutEvents(text)) + .replaceText(URL_REPLACEMENT_CONFIG); } } }