Validate automatic URLs

src/main/java/org/skriptlang/skript/bukkit/text/TextComponentParser.java

@@ -4,6 +4,7 @@
 import ch.njol.skript.registrations.Classes;
 import ch.njol.util.coll.CollectionUtils;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TextReplacementConfig;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
@@ -27,6 +28,8 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -82,17 +85,35 @@ public enum LinkParseMode {
 		 */
 		STRICT(TextReplacementConfig.builder()
 			.match(Pattern.compile("https?://[-\\w.]+\\.\\w{2,}(?:/\\S*)?"))
-			.replacement(url -> url.clickEvent(ClickEvent.openUrl(url.content())))
+			.replacement(LinkParseMode::parseUrl)
 			.build()),
 
 		/**
 		 * Parses everything with {@code .} as a link.
 		 */
 		LENIENT(TextReplacementConfig.builder()
 			.match(Pattern.compile("(?:https?://)?[-\\w.]+\\.\\w{2,}(?:/\\S*)?"))
-			.replacement(url -> url.clickEvent(ClickEvent.openUrl(url.content())))
+			.replacement(LinkParseMode::parseUrl)
 			.build());
 
+		private static TextComponent.Builder parseUrl(TextComponent.Builder builder) {
+			String url = builder.content();
+			URI uri;
+			try {
+				uri = new URI(url);
+			} catch (URISyntaxException e) {
+				if (e.getIndex() == -1) { // no recovery possible
+					return builder;
+				}
+				try {
+					uri = new URI(url.substring(0, e.getIndex()));
+				} catch (URISyntaxException ignored) {
+					return builder;
+				}
+			}
+			return builder.clickEvent(ClickEvent.openUrl(uri.toString()));
+		}
+
 		private final TextReplacementConfig textReplacementConfig;
 
 		LinkParseMode(TextReplacementConfig textReplacementConfig) {

src/test/java/org/skriptlang/skript/bukkit/text/TextComponentParserTest.java

@@ -1,12 +1,16 @@
 package org.skriptlang.skript.bukkit.text;
 
+import ch.njol.skript.Skript;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.event.ClickEvent.Payload;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.ChatColor;
 import org.junit.Test;
+import org.skriptlang.skript.bukkit.text.TextComponentParser.LinkParseMode;
 
 import java.util.Set;
 
@@ -88,4 +92,16 @@ public void testLegacyDoubleHashtag() {
 		assertEquals(parser.parse("<#ffff11>hello"), parser.parse("<##FFFF11>hello"));
 	}
 
+	@Test
+	public void testURLValidation() {
+		TextComponentParser parser = new TextComponentParser();
+		parser.linkParseMode(LinkParseMode.STRICT);
+		// Example: forgot to allow all formatting, so tag is not parsed, but URL is attempted to be automatically formatted
+		ClickEvent<?> result = parser.parseSafe("<url:'https://skriptlang.org/'>My Website").children().getFirst().clickEvent();
+		assertNotNull(result);
+		if (Skript.methodExists(ClickEvent.class, "payload")) { // TODO remove when supporting 1.21.6+
+			assertEquals("https://skriptlang.org/'", ((Payload.Text) result.payload()).value());
+		}
+	}
+
 }