Bump net.dv8tion:JDA from 5.6.1 to 6.1.1

application/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation project(':utils')
     implementation project(':formatter')
 
-    implementation 'net.dv8tion:JDA:5.6.1'
+    implementation 'net.dv8tion:JDA:6.1.1'
 
     implementation 'org.apache.logging.log4j:log4j-core:2.25.0'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0'

application/src/main/java/org/togetherjava/tjbot/features/MessageContextCommand.java

@@ -1,12 +1,12 @@
 package org.togetherjava.tjbot.features;
 
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 
@@ -49,8 +49,8 @@ public interface MessageContextCommand extends BotCommand {
      * <p>
      * Buttons or menus have to be created with a component ID (see
      * {@link ComponentInteraction#getComponentId()},
-     * {@link net.dv8tion.jda.api.interactions.components.buttons.Button#of(ButtonStyle, String, String)})
-     * in a very specific format, otherwise the core system will fail to identify the command that
+     * {@link net.dv8tion.jda.api.components.buttons.Button#of(ButtonStyle, String, String)}) in a
+     * very specific format, otherwise the core system will fail to identify the command that
      * corresponded to the button or menu click event and is unable to route it back.
      * <p>
      * See {@link #acceptComponentIdGenerator(ComponentIdGenerator)} for more info.

application/src/main/java/org/togetherjava/tjbot/features/SlashCommand.java

@@ -1,5 +1,6 @@
 package org.togetherjava.tjbot.features;
 
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
@@ -10,7 +11,6 @@
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 
@@ -82,8 +82,8 @@ public interface SlashCommand extends BotCommand {
      * <p>
      * Buttons or menus have to be created with a component ID (see
      * {@link ComponentInteraction#getComponentId()},
-     * {@link net.dv8tion.jda.api.interactions.components.buttons.Button#of(ButtonStyle, String, String)})
-     * in a very specific format, otherwise the core system will fail to identify the command that
+     * {@link net.dv8tion.jda.api.components.buttons.Button#of(ButtonStyle, String, String)}) in a
+     * very specific format, otherwise the core system will fail to identify the command that
      * corresponded to the button or menu click event and is unable to route it back.
      * <p>
      * See {@link #acceptComponentIdGenerator(ComponentIdGenerator)} for more info on the ID's.

application/src/main/java/org/togetherjava/tjbot/features/UserContextCommand.java

@@ -1,12 +1,12 @@
 package org.togetherjava.tjbot.features;
 
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 
@@ -50,8 +50,8 @@ public interface UserContextCommand extends BotCommand {
      * <p>
      * Buttons or menus have to be created with a component ID (see
      * {@link ComponentInteraction#getComponentId()},
-     * {@link net.dv8tion.jda.api.interactions.components.buttons.Button#of(ButtonStyle, String, String)})
-     * in a very specific format, otherwise the core system will fail to identify the command that
+     * {@link net.dv8tion.jda.api.components.buttons.Button#of(ButtonStyle, String, String)}) in a
+     * very specific format, otherwise the core system will fail to identify the command that
      * corresponded to the button or menu click event and is unable to route it back.
      * <p>
      * See {@link #acceptComponentIdGenerator(ComponentIdGenerator)} for more info.

application/src/main/java/org/togetherjava/tjbot/features/basic/RoleSelectCommand.java

@@ -2,6 +2,10 @@
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.selections.SelectOption;
+import net.dv8tion.jda.api.components.selections.StringSelectMenu;
+import net.dv8tion.jda.api.components.selections.StringSelectMenu.Builder;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.IMentionable;
 import net.dv8tion.jda.api.entities.Member;
@@ -16,8 +20,6 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
-import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -183,7 +185,7 @@ private static boolean handleInteractableRolesSelected(IReplyCallback event,
 
     private void sendRoleSelectionMenu(final CommandInteraction event,
             final Collection<? extends Role> selectableRoles) {
-        StringSelectMenu.Builder menu = StringSelectMenu
+        Builder menu = StringSelectMenu
             .create(generateComponentId(Lifespan.PERMANENT, event.getUser().getId()))
             .setPlaceholder("Select your roles")
             .setMinValues(0)
@@ -197,7 +199,7 @@ private void sendRoleSelectionMenu(final CommandInteraction event,
                 event.getOption(TITLE_OPTION, "Select your roles:", OptionMapping::getAsString);
         MessageEmbed embed = createEmbed(title, event.getOption(DESCRIPTION_OPTION).getAsString());
 
-        event.replyEmbeds(embed).addActionRow(menu.build()).queue();
+        event.replyEmbeds(embed).addComponents(ActionRow.of(menu.build())).queue();
     }
 
     private static SelectOption mapToSelectOption(Role role) {

application/src/main/java/org/togetherjava/tjbot/features/bookmarks/BookmarksListRemoveHandler.java

@@ -2,19 +2,19 @@
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.selections.SelectMenu;
+import net.dv8tion.jda.api.components.selections.SelectOption;
+import net.dv8tion.jda.api.components.selections.StringSelectMenu;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
-import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 
 import org.togetherjava.tjbot.db.generated.tables.records.BookmarksRecord;
 import org.togetherjava.tjbot.features.utils.MessageUtils;
@@ -75,7 +75,7 @@ private void handlePaginatedRequest(GenericCommandInteractionEvent event,
 
         MessageEmbed pageEmbed = generatePageEmbed(bookmarks, requestType, 0);
 
-        Collection<LayoutComponent> components = new ArrayList<>();
+        Collection<MessageTopLevelComponent> components = new ArrayList<>();
         components.add(generateNavigationComponent(requestType, 0));
 
         if (requestType == RequestType.REMOVE) {
@@ -199,7 +199,7 @@ private void updatePagination(ComponentInteraction event, Request request,
         MessageEmbed pageEmbed =
                 generatePageEmbed(bookmarks, request.type, request.pageToDisplayIndex);
 
-        Collection<LayoutComponent> components = new ArrayList<>();
+        Collection<MessageTopLevelComponent> components = new ArrayList<>();
         components.add(generateNavigationComponent(request.type, request.pageToDisplayIndex));
         if (request.type == RequestType.REMOVE) {
             components.addAll(generateRemoveComponents(event.getJDA(), bookmarks, request.type,
@@ -209,7 +209,7 @@ private void updatePagination(ComponentInteraction event, Request request,
         event.editMessageEmbeds(pageEmbed).setComponents(components).queue();
     }
 
-    private LayoutComponent generateNavigationComponent(RequestType requestType,
+    private MessageTopLevelComponent generateNavigationComponent(RequestType requestType,
             int pageToDisplayIndex) {
         UnaryOperator<String> generateNavigationComponentId = name -> {
             Request request = new Request(requestType, name, pageToDisplayIndex, Set.of());
@@ -226,7 +226,7 @@ private LayoutComponent generateNavigationComponent(RequestType requestType,
         return ActionRow.of(buttonPrev, buttonNext);
     }
 
-    private List<LayoutComponent> generateRemoveComponents(JDA jda,
+    private List<MessageTopLevelComponent> generateRemoveComponents(JDA jda,
             List<? extends BookmarksRecord> bookmarks, RequestType requestType,
             int pageToDisplayIndex, Set<Long> bookmarksToRemoveChannelIDs) {
         List<PageEntry> pageEntries = getPageEntries(bookmarks, pageToDisplayIndex);

application/src/main/java/org/togetherjava/tjbot/features/chatgpt/ChatGptCommand.java

@@ -2,13 +2,14 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import net.dv8tion.jda.api.components.label.Label;
+import net.dv8tion.jda.api.components.textinput.TextInput;
+import net.dv8tion.jda.api.components.textinput.TextInputStyle;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.SelfUser;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.text.TextInput;
-import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
-import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.modals.Modal;
 
 import org.togetherjava.tjbot.features.CommandVisibility;
 import org.togetherjava.tjbot.features.SlashCommandAdapter;
@@ -65,14 +66,14 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
             return;
         }
 
-        TextInput body = TextInput
-            .create(QUESTION_INPUT, "Ask ChatGPT a question or get help with code",
-                    TextInputStyle.PARAGRAPH)
+        TextInput body = TextInput.create(QUESTION_INPUT, TextInputStyle.PARAGRAPH)
             .setPlaceholder("Put your question for ChatGPT here")
             .setRequiredRange(MIN_MESSAGE_INPUT_LENGTH, MAX_MESSAGE_INPUT_LENGTH)
             .build();
 
-        Modal modal = Modal.create(generateComponentId(), "ChatGPT").addActionRow(body).build();
+        Modal modal = Modal.create(generateComponentId(), "ChatGPT")
+            .addComponents(Label.of("Ask ChatGPT a question or get help with code", body))
+            .build();
         event.replyModal(modal).queue();
     }
 

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

@@ -2,11 +2,12 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
@@ -126,7 +127,7 @@ private MessageCreateData createCodeReplyMessage(long originalMessageId,
         }
 
         return new MessageCreateBuilder().setContent("Detected code, here are some useful tools:")
-            .setActionRow(codeActionButtons)
+            .setComponents(ActionRow.of(codeActionButtons))
             .build();
     }
 
@@ -185,7 +186,7 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
                 // Apply the selected action
                 return event.getHook()
                     .editOriginalEmbeds(codeAction.apply(code))
-                    .setActionRow(createButtons(originalMessageId, codeAction));
+                    .setComponents(ActionRow.of(createButtons(originalMessageId, codeAction)));
             })
             .queue();
     }
@@ -232,7 +233,8 @@ public void onMessageUpdated(MessageUpdateEvent event) {
 
     private Optional<CodeAction> getCurrentActionFromCodeReply(Message codeReplyMessage) {
         // The disabled action is the currently applied action
-        return codeReplyMessage.getButtons()
+        return codeReplyMessage.getComponentTree()
+            .findAll(Button.class)
             .stream()
             .filter(Button::isDisabled)
             .map(Button::getLabel)

application/src/main/java/org/togetherjava/tjbot/features/componentids/ComponentIdGenerator.java

@@ -1,9 +1,9 @@
 package org.togetherjava.tjbot.features.componentids;
 
+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.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 import org.togetherjava.tjbot.features.SlashCommand;
 

application/src/main/java/org/togetherjava/tjbot/features/componentids/ComponentIdParser.java

@@ -1,9 +1,9 @@
 package org.togetherjava.tjbot.features.componentids;
 
+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.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 import java.util.Optional;
 

application/src/main/java/org/togetherjava/tjbot/features/filesharing/FileSharingMessageListener.java

@@ -1,13 +1,14 @@
 package org.togetherjava.tjbot.features.filesharing;
 
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.kohsuke.github.GHGist;
 import org.kohsuke.github.GHGistBuilder;
 import org.kohsuke.github.GitHubBuilder;
@@ -190,7 +191,9 @@ private void sendResponse(MessageReceivedEvent event, String url, String gistId)
                 componentIdInteractor.generateComponentId(message.getAuthor().getId(), gistId),
                 "Delete");
 
-        message.reply(messageContent).setActionRow(gist, delete).queue();
+        message.reply(messageContent)
+            .setComponents(ActionRow.of(gist), ActionRow.of(delete))
+            .queue();
     }
 
     private boolean isHelpThread(MessageReceivedEvent event) {

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -1,6 +1,9 @@
 package org.togetherjava.tjbot.features.help;
 
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
@@ -13,7 +16,6 @@
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
 import net.dv8tion.jda.api.entities.channel.forums.ForumTagSnowflake;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
@@ -170,7 +172,7 @@ RestAction<Message> constructChatGptAttempt(ThreadChannel threadChannel,
 
         MessageEmbed responseEmbed = generateGptResponseEmbed(answer, selfUser, originalQuestion);
         return post.flatMap(_ -> threadChannel.sendMessageEmbeds(responseEmbed)
-            .addActionRow(generateDismissButton(componentIdInteractor, messageId.get())));
+            .addComponents(generateDismissButton(componentIdInteractor, messageId.get())));
     }
 
     /**
@@ -200,9 +202,10 @@ public MessageEmbed generateGptResponseEmbed(String answer, SelfUser selfUser, S
             .build();
     }
 
-    private Button generateDismissButton(ComponentIdInteractor componentIdInteractor, String id) {
+    private MessageTopLevelComponent generateDismissButton(
+            ComponentIdInteractor componentIdInteractor, String id) {
         String buttonId = componentIdInteractor.generateComponentId(id);
-        return Button.danger(buttonId, "Dismiss");
+        return ActionRow.of(Button.danger(buttonId, "Dismiss"));
     }
 
     private Optional<String> prepareChatGptQuestion(ThreadChannel threadChannel,