move to jdk 25

src/main/java/me/bobert/netneutrality/NetNeutrality.java

@@ -6,6 +6,7 @@ package me.bobert.netneutrality;
  * https://discord.gg/qUa6zNFZsd
  */
 
+import club.minnced.discord.jdave.interop.JDaveSessionFactory;
 import io.sentry.Sentry;
 import me.bobert.netneutrality.core.LogHandler;
 import me.bobert.netneutrality.core.command.CommandManager;
@@ -20,6 +21,7 @@ import me.bobert.netneutrality.music.MusicManager;
 import me.bobert.netneutrality.utils.Settings;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.audio.AudioModuleConfig;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.exceptions.InvalidTokenException;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -34,7 +36,7 @@ public class NetNeutrality {
     private static NetNeutrality instance;
     private static JDA jda;
 
-    public static void main(String[] args) {
+    static void main() {
         System.out.println("Starting NetNeutrality v" + VERSION);
 
         String env = Settings.getInstance().get("NETNEUTRALITY_BOT_ENV", "dev");
@@ -98,7 +100,13 @@ public class NetNeutrality {
         try {
             jda = JDABuilder
                 .createDefault(token)
-                .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.MESSAGE_CONTENT)
+                .enableIntents(
+                    GatewayIntent.GUILD_MEMBERS,
+                    GatewayIntent.GUILD_MESSAGE_REACTIONS,
+                    GatewayIntent.GUILD_VOICE_STATES,
+                    GatewayIntent.MESSAGE_CONTENT)
+                .setAudioModuleConfig(
+                    new AudioModuleConfig().withDaveSessionFactory(new JDaveSessionFactory()))
                 .setActivity(Activity.watching("me load..."))
                 .build();
             jda.awaitReady();

src/main/java/me/bobert/netneutrality/core/db/DatabaseMigration.java

@@ -19,7 +19,8 @@ public class DatabaseMigration {
         String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
         String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
         String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost");
-        String dbUrl = String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName);
+        String dbPort = Settings.getInstance().get("MYSQL_PORT", "3306");
+        String dbUrl = String.format("jdbc:mysql://%s:%s/%s", dbHost, dbPort, dbName);
 
         try {
             logger.info("Running database migrations..");

src/main/java/me/bobert/netneutrality/core/db/SessionManager.java

@@ -33,9 +33,10 @@ public class SessionManager {
                 String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
                 String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
                 String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost");
-                logger.info("Connecting to database '{}' at {}:3306 with user '{}'", dbName, dbHost, dbUser);
+                String dbPort = Settings.getInstance().get("MYSQL_PORT", "3306");
+                logger.info("Connecting to database '{}' at {}:{} with user '{}'", dbName, dbHost, dbPort, dbUser);
 
-                settings.put(Environment.JAKARTA_JDBC_URL, String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName));
+                settings.put(Environment.JAKARTA_JDBC_URL, String.format("jdbc:mysql://%s:%s/%s", dbHost, dbPort, dbName));
                 settings.put(Environment.JAKARTA_JDBC_USER, dbUser);
                 settings.put(Environment.JAKARTA_JDBC_PASSWORD, dbPass);
                 registryBuilder.applySettings(settings);

src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java

@@ -120,7 +120,7 @@ public class UdioAudioSourceManager implements AudioSourceManager {
     }
 
     protected JsonBrowser loadTrackInfoFromPageContent(String content) throws IOException {
-        String startTag = "self.__next_f.push([1,\"9:";
+        String startTag = "self.__next_f.push([1,\"2f:";
         String endTag = "\\n\"])";
 
         String json = DataFormatTools.extractBetween(content, startTag, endTag);