Update dependency de.chojo:cjda-util to v2.13.1+jda-6.3.0 (#153)

* Update dependency de.chojo:cjda-util to v2.13.1+jda-6.3.0

* address compile issues

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Yannick Lamprecht <yannicklamprecht@live.de>

Author: renovate[bot]

bot/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation(project(":plugin-api"))
 
     // discord
-    implementation("de.chojo", "cjda-util", "2.10.3+jda-5.1.0") {
+    implementation("de.chojo", "cjda-util", "2.13.1+jda-6.3.0") {
         exclude(module = "opus-java")
     }
     implementation(libs.javalin.bundle)

bot/src/main/java/de/chojo/gamejam/Bot.java

@@ -45,7 +45,6 @@
 import org.slf4j.Logger;
 
 import javax.security.auth.login.LoginException;
-import javax.sql.DataSource;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

bot/src/main/java/de/chojo/gamejam/commands/server/configure/Message.java

@@ -7,14 +7,14 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.modals.handler.ModalHandler;
 import de.chojo.jdautil.modals.handler.TextInputHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
+import net.dv8tion.jda.api.components.textinput.TextInputStyle;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
+
 import org.slf4j.Logger;
 
 import java.net.http.HttpRequest;

bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/info/Detailed.java

@@ -11,13 +11,12 @@
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.pagination.bag.ListPageBag;
 import de.chojo.jdautil.wrapper.EventContext;
-import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
 
 import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 public class Detailed implements SlashHandler {
     private final ServerService serverService;
@@ -56,8 +55,14 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         context.registerPage(new ListPageBag<>(servers) {
             @Override
-            public CompletableFuture<MessageEditData> buildPage() {
-                return currentElement().detailStatus(context).thenApply(MessageEditData::fromEmbeds);
+            public MessageEditData buildPage() {
+                try {
+                    return currentElement().detailStatus(context).thenApply(MessageEditData::fromEmbeds).get();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                } catch (ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
             }
         });
     }

bot/src/main/java/de/chojo/gamejam/commands/team/handler/Edit.java

@@ -11,8 +11,8 @@
 import de.chojo.jdautil.modals.handler.ModalHandler;
 import de.chojo.jdautil.modals.handler.TextInputHandler;
 import de.chojo.jdautil.wrapper.EventContext;
+import net.dv8tion.jda.api.components.textinput.TextInputStyle;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
 
 public class Edit implements SlashHandler {
     private final Guilds guilds;

bot/src/main/java/de/chojo/gamejam/commands/team/handler/Invite.java

@@ -17,10 +17,10 @@
 import de.chojo.jdautil.menus.MenuAction;
 import de.chojo.jdautil.menus.entries.ButtonEntry;
 import de.chojo.jdautil.wrapper.EventContext;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 public final class Invite implements SlashHandler {
     private final Guilds guilds;

bot/src/main/java/de/chojo/gamejam/commands/team/handler/List.java

@@ -11,12 +11,9 @@
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.pagination.bag.PrivateListPageBag;
 import de.chojo.jdautil.wrapper.EventContext;
-import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
 
-import java.util.concurrent.CompletableFuture;
-
 public class List implements SlashHandler {
     private final Guilds guilds;
 
@@ -36,8 +33,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         context.registerPage(new PrivateListPageBag<>(jam.teams().teams(), event.getUser().getIdLong()) {
             @Override
-            public CompletableFuture<MessageEditData> buildPage() {
-                return CompletableFuture.supplyAsync(() -> MessageEditData.fromEmbeds(currentElement().profileEmbed(context.guildLocalizer())));
+            public MessageEditData buildPage() {
+                return MessageEditData.fromEmbeds(currentElement().profileEmbed(context.guildLocalizer()));
             }
         }, true);
     }

bot/src/main/java/de/chojo/gamejam/commands/vote/handler/Ranking.java

@@ -11,13 +11,9 @@
 import de.chojo.jdautil.localization.util.LocalizedEmbedBuilder;
 import de.chojo.jdautil.pagination.bag.ListPageBag;
 import de.chojo.jdautil.wrapper.EventContext;
-import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
 
-import java.util.concurrent.CompletableFuture;
-
 public class Ranking implements SlashHandler {
     private final Guilds guilds;
 
@@ -45,13 +41,13 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var pageBag = new ListPageBag<>(ranking) {
             @Override
-            public CompletableFuture<MessageEditData> buildPage() {
+            public MessageEditData buildPage() {
                 var teamVote = currentElement();
                 var embed = new LocalizedEmbedBuilder(context.guildLocalizer())
                         .setTitle(teamVote.rank() + " | " + teamVote.team().meta().name())
                         .addField("command.votes.ranking.embed.votes", String.valueOf(teamVote.votes()), true)
                         .build();
-                return CompletableFuture.completedFuture(MessageEditData.fromEmbeds(embed));
+                return MessageEditData.fromEmbeds(embed);
             }
         };
         context.registerPage(pageBag, true);