Merge branch 'Java-Discord:main' into forms-feature

Author: Defective4

.github/workflows/build.yml

@@ -8,12 +8,14 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -23,14 +25,16 @@ jobs:
         run: ./gradlew test
   publish:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     needs: build
     if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'workflow_dispatch' }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'graalvm-community'
       - name: Build native-image
         run: ./gradlew nativeCompile -Pprod

build.gradle.kts

@@ -4,15 +4,16 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.*
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("org.springframework.boot") version "3.5.0"
+    id("org.springframework.boot") version "4.0.1"
     id("io.spring.dependency-management") version "1.1.7"
-    id("org.graalvm.buildtools.native") version "0.10.6"
+    id("org.graalvm.buildtools.native") version "0.11.3"
     checkstyle
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(25)
+  }
 }
 
 group = "net.discordjug"
@@ -27,22 +28,24 @@ repositories {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
     compileOnly("org.jetbrains:annotations:26.0.2")
 
     // DIH4JDA (Command Framework) & JDA
-    implementation("com.github.DynxstyGIT:DIH4JDA:a64b5a9dc5")
-    implementation("net.dv8tion:JDA:5.5.1") {
+    implementation("com.github.jasonlessenich:DIH4JDA:1.7.0")
+    //implementation("xyz.dynxsty:dih4jda:1.7.0")
+    implementation("net.dv8tion:JDA:6.2.0") {
         exclude(module = "opus-java")
     }
 
     // Caffeine (Caching Library)
-    implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
+    implementation("com.github.ben-manes.caffeine:caffeine:3.2.2")
 
     implementation("com.google.code.gson:gson:2.13.1")
     implementation("org.yaml:snakeyaml:2.4")
     implementation("com.google.re2j:re2j:1.8")
-    implementation("commons-validator:commons-validator:1.9.0")
+    implementation("commons-validator:commons-validator:1.10.0")
 
     implementation("com.mashape.unirest:unirest-java:1.4.9")
 
@@ -60,20 +63,16 @@ dependencies {
     testAnnotationProcessor("org.projectlombok:lombok:1.18.38")
 
     // Sentry
-    implementation("io.sentry:sentry:8.13.2")
+    implementation("io.sentry:sentry:8.20.0")
 
     // Spring
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
 
     //required for registering native hints
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-}
-
-configurations {
-    all {
-        exclude(group = "commons-logging", module = "commons-logging")
-    }
+    
+    implementation("org.slf4j:jcl-over-slf4j")
 }
 
 tasks.withType<Jar> {
@@ -121,6 +120,7 @@ tasks.processTestAot {
 graalvmNative {
 	binaries {
 		named("main") {
+			buildArgs.add("-H:+ForeignAPISupport")//needed for AWT/plotting, see https://bugs.openjdk.org/browse/JDK-8337237
 			if (hasProperty("prod")) {
 				buildArgs.add("-O3")
 			} else {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/discordjug/javabot/Bot.java

@@ -101,7 +101,7 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
 	 */
 	public static void main(String[] args) throws Exception {
 		TimeZone.setDefault(TimeZone.getTimeZone(ZoneOffset.UTC));
-		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
+		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
 		SpringApplication.run(Bot.class, args);
 	}
 

src/main/java/net/discordjug/javabot/RuntimeHintsConfiguration.java

@@ -1,7 +1,5 @@
 package net.discordjug.javabot;
 
-import java.nio.channels.Channel;
-
 import club.minnced.discord.webhook.send.WebhookEmbed;
 import com.zaxxer.hikari.HikariConfig;
 import net.discordjug.javabot.data.config.BotConfig;
@@ -11,24 +9,14 @@
 import net.discordjug.javabot.data.config.SystemsConfig.ApiConfig;
 import net.discordjug.javabot.data.config.guild.HelpConfig;
 import net.discordjug.javabot.data.config.guild.MessageCacheConfig;
+import net.discordjug.javabot.data.config.guild.MessageRule;
 import net.discordjug.javabot.data.config.guild.MetricsConfig;
 import net.discordjug.javabot.data.config.guild.ModerationConfig;
 import net.discordjug.javabot.data.config.guild.QOTWConfig;
 import net.discordjug.javabot.data.config.guild.ServerLockConfig;
 import net.discordjug.javabot.data.config.guild.StarboardConfig;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.ScheduledEvent;
-import net.dv8tion.jda.api.entities.ThreadMember;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
-import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
-import net.dv8tion.jda.api.entities.sticker.GuildSticker;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.managers.AudioManager;
 import net.dv8tion.jda.internal.entities.GuildVoiceStateImpl;
-import net.dv8tion.jda.internal.entities.MemberPresenceImpl;
 import net.dv8tion.jda.internal.requests.restaction.PermOverrideData;
 import org.h2.server.TcpServer;
 import org.springframework.aot.hint.MemberCategory;
@@ -47,10 +35,8 @@
 @RegisterReflectionForBinding({
 		//register config classes for reflection
 		BotConfig.class, GuildConfig.class, GuildConfigItem.class, SystemsConfig.class, ApiConfig.class,
-		HelpConfig.class, MessageCacheConfig.class, MetricsConfig.class, ModerationConfig.class, QOTWConfig.class, ServerLockConfig.class, StarboardConfig.class,
+		HelpConfig.class, MessageCacheConfig.class, MetricsConfig.class, ModerationConfig.class, QOTWConfig.class, ServerLockConfig.class, StarboardConfig.class,MessageRule.class, MessageRule.MessageAction.class,
 
-		//ensure JDA can create necessary caches
-		User[].class, Guild[].class, Member[].class, Role[].class, Channel[].class, AudioManager[].class, ScheduledEvent[].class, ThreadMember[].class, ForumTag[].class, RichCustomEmoji[].class, GuildSticker[].class, MemberPresenceImpl[].class,
 		//needs to be serialized for channel managers etc
 		PermOverrideData.class,
 
@@ -77,8 +63,17 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		// caffeine
 		hints.reflection().registerTypeIfPresent(getClass().getClassLoader(), "com.github.benmanes.caffeine.cache.SSW", MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 
+		try {
+			// These classes are necessary on X11 but may not be loaded on Wayland when generating native hints
+			for(Class<?> cl : getClass().getClassLoader().loadClass("sun.font.FontConfigManager").getDeclaredClasses()) {
+				hints.jni().registerType(cl, MemberCategory.ACCESS_DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+			}
+		} catch (ClassNotFoundException _) {
+            // FontConfigManager is only supported on Linux
+		}
+		
 		for (Class<?> cl : WebhookEmbed.class.getClasses()) {
-			hints.reflection().registerType(cl,  MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_METHODS);
+			hints.reflection().registerType(cl,  MemberCategory.ACCESS_DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_METHODS);
 		}
 
 		hints.reflection().registerType(GuildVoiceStateImpl[].class, MemberCategory.UNSAFE_ALLOCATED);

src/main/java/net/discordjug/javabot/api/TomcatConfig.java

@@ -1,10 +1,9 @@
 package net.discordjug.javabot.data.config;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.dv8tion.jda.api.entities.Guild;
 
 import org.jetbrains.annotations.NotNull;
@@ -64,11 +63,10 @@ public BotConfig(Path dir) {
 			}
 		}
 		this.guilds = new ConcurrentHashMap<>();
-		Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
 		Path systemsFile = dir.resolve(SYSTEMS_FILE);
 		if (Files.exists(systemsFile)) {
 			try (BufferedReader reader = Files.newBufferedReader(systemsFile)) {
-				this.systemsConfig = gson.fromJson(reader, SystemsConfig.class);
+				this.systemsConfig = GsonUtils.fromJson(reader, SystemsConfig.class);
 				log.info("Loaded systems config from {}", systemsFile);
 			} catch (JsonSyntaxException e) {
 				ExceptionLogger.capture(e, getClass().getSimpleName());
@@ -133,10 +131,9 @@ public SystemsConfig getSystems() {
 	 * Flushes all configuration to the disk.
 	 */
 	public void flush() {
-		Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
 		Path systemsFile = this.dir.resolve(SYSTEMS_FILE);
 		try (BufferedWriter writer = Files.newBufferedWriter(systemsFile)) {
-			gson.toJson(this.systemsConfig, writer);
+			GsonUtils.toJson(this.systemsConfig, writer);
 			writer.flush();
 		} catch (IOException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());

src/main/java/net/discordjug/javabot/data/config/BotConfig.java

@@ -1,12 +1,11 @@
 package net.discordjug.javabot.data.config;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.data.config.guild.*;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.discordjug.javabot.util.Pair;
 import net.dv8tion.jda.api.entities.Guild;
 
@@ -70,11 +69,10 @@ public GuildConfig(Guild guild, Path file) {
 	 * @throws UncheckedIOException if an IO error occurs.
 	 */
 	public static GuildConfig loadOrCreate(Guild guild, Path file) {
-		Gson gson = new GsonBuilder().create();
 		GuildConfig config;
 		if (Files.exists(file)) {
 			try (BufferedReader reader = Files.newBufferedReader(file)) {
-				config = gson.fromJson(reader, GuildConfig.class);
+				config = GsonUtils.fromJson(reader, GuildConfig.class);
 				config.setFile(file);
 				config.setGuild(guild);
 				log.info("Loaded config from {}", file);
@@ -115,9 +113,8 @@ private void setGuild(Guild guild) {
 	 * Saves this config to its file path.
 	 */
 	public synchronized void flush() {
-		Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
 		try (BufferedWriter writer = Files.newBufferedWriter(this.file)) {
-			gson.toJson(this, writer);
+			GsonUtils.toJson(this, writer);
 			writer.flush();
 		} catch (IOException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());
@@ -160,7 +157,10 @@ public void set(String propertyName, String value) throws UnknownPropertyExcepti
 		Optional<Pair<Field, Object>> result = ReflectionUtils.resolveField(propertyName, this);
 		result.ifPresent(pair -> {
 			try {
-				ReflectionUtils.set(pair.first(), pair.second(), value);
+				Object updatedField = ReflectionUtils.set(pair.first(), pair.second(), value);
+				if (updatedField instanceof GuildConfigItem item) {
+					item.setGuildConfig(this);
+				}
 				this.flush();
 			} catch (IllegalAccessException e) {
 				ExceptionLogger.capture(e, getClass().getSimpleName());

src/main/java/net/discordjug/javabot/data/config/GuildConfig.java

@@ -0,0 +1,35 @@
+package net.discordjug.javabot.data.config;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+/**
+ * A gson {@link TypeAdapter} that allows serializing and deserializing regex {@link Pattern}s.
+ */
+public class PatternTypeAdapter extends TypeAdapter<Pattern> {
+
+	@Override
+	public void write(JsonWriter writer, Pattern value) throws IOException {
+		if (value == null) {
+			writer.nullValue();
+			return;
+		}
+		writer.value(value.toString());
+	}
+
+	@Override
+	public Pattern read(JsonReader reader) throws IOException {
+		if (reader.peek() == JsonToken.NULL) {
+			reader.nextNull();
+			return null;
+		}
+		String value = reader.nextString();
+		return Pattern.compile(value);
+	}
+
+}