Shortened Timespans (in commands)

src/main/java/ch/njol/skript/classes/data/SkriptClasses.java

@@ -298,7 +298,7 @@ public String toVariableNameString(final Time o) {
 					@Nullable
 					public Timespan parse(final String s, final ParseContext context) {
 						try {
-							return Timespan.parse(s);
+							return Timespan.parse(s, context);
 						} catch (IllegalArgumentException e) {
 							Skript.error("'" + s + "' is not a valid timespan");
 							return null;

src/main/java/ch/njol/skript/util/Timespan.java

@@ -26,6 +26,8 @@
 import java.util.regex.Pattern;
 import java.util.Locale;
 
+import ch.njol.skript.aliases.AliasesMap;
+import ch.njol.skript.lang.ParseContext;
 import org.eclipse.jdt.annotation.Nullable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
@@ -94,18 +96,33 @@ public void onLanguageChange() {
 	private static final Pattern TIMESPAN_PATTERN = Pattern.compile("^(\\d+):(\\d\\d)(:\\d\\d){0,2}(?<ms>\\.\\d{1,4})?$");
 	private static final Pattern TIMESPAN_NUMBER_PATTERN = Pattern.compile("^\\d+(\\.\\d+)?$");
 	private static final Pattern TIMESPAN_SPLIT_PATTERN = Pattern.compile("[:.]");
+	private static final Pattern TIMESPAN_SHORTENED_PATTERN = Pattern.compile("(\\d+)([smhd])");
 
 	private final long millis;
-	
+
 	@Nullable
 	public static Timespan parse(String value) {
-		if (value.isEmpty())
+		return parse(value, ParseContext.DEFAULT);
+	}
+
+	@Nullable
+	public static Timespan parse(String value, ParseContext context) {
+		if (value.isEmpty()) {
 			return null;
+		}
 
 		long t = 0;
 		boolean minecraftTime = false;
 		boolean isMinecraftTimeSet = false;
 
+		// Check if the context allows for shortened timespan parsing
+		if (context == ParseContext.COMMAND) {
+			Timespan shortenedTimespan = parseShortenedTimespan(value, context);
+			if (shortenedTimespan != null) {
+				return shortenedTimespan;
+			}
+		}
+
 		Matcher matcher = TIMESPAN_PATTERN.matcher(value);
 		if (matcher.matches()) { // MM:SS[.ms] or HH:MM:SS[.ms] or DD:HH:MM:SS[.ms]
 			String[] substring = TIMESPAN_SPLIT_PATTERN.split(value);
@@ -179,7 +196,50 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms]
 
 		return new Timespan(t);
 	}
-
+
+
+	/**
+	 * Parses a shortened timespan (e.g., "5m", "3d", "1h") based on the provided input string and parse context.
+	 * Returns null if the input does not represent a valid shortened timespan in the context of a command argument.
+	 *
+	 * @param input   The input string representing the shortened timespan.
+	 * @param context The parse context to determine if parsing is allowed.
+	 * @return A Timespan object representing the parsed timespan, or null if parsing fails or not allowed in context.
+	 */
+	@Nullable
+	public static Timespan parseShortenedTimespan(String input, ParseContext context) {
+		if (context != ParseContext.COMMAND) {
+			return null;
+		}
+
+		long totalMillis = 0;
+		Matcher matcher = TIMESPAN_SHORTENED_PATTERN.matcher(input);
+
+		while (matcher.find()) {
+			int value = Integer.parseInt(matcher.group(1));
+			char unit = matcher.group(2).charAt(0);
+
+			switch (unit) {
+				case 'd':
+					totalMillis += value * 86400000L; // 1 day in milliseconds
+					break;
+				case 'h':
+					totalMillis += value * 3600000L; // 1 hour in milliseconds
+					break;
+				case 'm':
+					totalMillis += value * 60000L; // 1 minute in milliseconds
+					break;
+				case 's':
+					totalMillis += value * 1000L; // 1 second in milliseconds
+					break;
+				default:
+					throw new IllegalArgumentException("Unknown time unit: " + unit);
+			}
+		}
+		return totalMillis > 0 ? new Timespan(totalMillis) : null;
+	}
+
+
 	public Timespan() {
 		millis = 0;
 	}