From 7b7fdf781af268c80ca3693fc87f136bdcd28eec Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Thu, 29 May 2025 21:35:08 +0200 Subject: [PATCH] [AB-xxx] start of embeds v2 --- .../service/AssignableRolePlaceServiceBean.java | 2 +- abstracto-application/core/core-impl/pom.xml | 2 +- .../core/interaction/ComponentServiceBean.java | 16 ++++++++-------- .../core/interaction/InteractionServiceBean.java | 4 ++-- .../core/interaction/modal/ModalServiceBean.java | 4 ++-- .../modal/config/TextInputComponentStyle.java | 2 +- .../core/service/ChannelServiceBean.java | 9 +++++---- .../core/service/MessageServiceBean.java | 2 +- .../core/templating/model/ButtonStyleConfig.java | 2 +- .../templating/service/TemplateServiceBean.java | 13 +++++++------ abstracto-application/core/core-int/pom.xml | 2 +- .../core/interaction/ComponentService.java | 8 ++++---- .../abstracto/core/service/MessageService.java | 2 +- .../core/templating/model/MessageToSend.java | 2 +- abstracto-application/pom.xml | 4 ++-- 15 files changed, 38 insertions(+), 36 deletions(-) diff --git a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java index 789d8e59c..bd053558f 100644 --- a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java +++ b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java @@ -31,7 +31,7 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.emoji.CustomEmoji; import net.dv8tion.jda.api.entities.emoji.Emoji; -import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; +import net.dv8tion.jda.api.components.buttons.ButtonStyle; import org.apache.commons.lang3.BooleanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/core/core-impl/pom.xml b/abstracto-application/core/core-impl/pom.xml index bb0893a34..7c21722eb 100644 --- a/abstracto-application/core/core-impl/pom.xml +++ b/abstracto-application/core/core-impl/pom.xml @@ -84,7 +84,7 @@ - net.dv8tion + io.github.freya022 JDA diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentServiceBean.java index 2b0857766..214f72b5e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentServiceBean.java @@ -6,10 +6,10 @@ import dev.sheldan.abstracto.core.service.MessageService; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.emoji.Emoji; -import net.dv8tion.jda.api.interactions.components.ActionComponent; -import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.buttons.Button; -import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; +import net.dv8tion.jda.api.components.ActionComponent; +import net.dv8tion.jda.api.components.actionrow.ActionRow; +import net.dv8tion.jda.api.components.buttons.Button; +import net.dv8tion.jda.api.components.buttons.ButtonStyle; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -50,7 +50,7 @@ public class ComponentServiceBean implements ComponentService { } else { ActionRow lastRow = message.getActionRows().get(message.getActionRows().size() - 1); if(lastRow.getComponents().size() < MAX_BUTTONS_PER_ROW) { - lastRow.getComponents().add(button); + lastRow.getButtons().add(button); actionRows = message.getActionRows(); } else { List currentActionRows = new ArrayList<>(message.getActionRows()); @@ -86,7 +86,7 @@ public class ComponentServiceBean implements ComponentService { public CompletableFuture removeComponentWithId(Message message, String componentId, Boolean rearrange) { List actionRows = new ArrayList<>(); if(Boolean.TRUE.equals(rearrange)) { - List components = new ArrayList<>(); + List components = new ArrayList<>(); message.getActionRows().forEach(row -> row .getComponents() @@ -112,8 +112,8 @@ public class ComponentServiceBean implements ComponentService { } @Override - public List splitIntoActionRowsMax(List allComponents) { - List> actionRows = ListUtils.partition(allComponents, MAX_BUTTONS_PER_ROW); + public List splitIntoActionRowsMax(List allComponents) { + List> actionRows = ListUtils.partition(allComponents, MAX_BUTTONS_PER_ROW); return actionRows.stream().map(ActionRow::of).collect(Collectors.toList()); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java index f829be291..ab63f9152 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java @@ -17,8 +17,8 @@ import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.interactions.Interaction; import net.dv8tion.jda.api.interactions.InteractionHook; import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback; -import net.dv8tion.jda.api.interactions.components.ActionComponent; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.ActionComponent; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.requests.restaction.WebhookMessageCreateAction; import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction; import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/ModalServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/ModalServiceBean.java index addaaf42d..0c6a47838 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/ModalServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/ModalServiceBean.java @@ -8,9 +8,9 @@ import dev.sheldan.abstracto.core.interaction.modal.config.TextInputComponentSty import dev.sheldan.abstracto.core.templating.service.TemplateService; import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.interactions.components.ItemComponent; -import net.dv8tion.jda.api.interactions.components.text.TextInput; +import net.dv8tion.jda.api.components.textinput.TextInput; import net.dv8tion.jda.api.interactions.modals.Modal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/config/TextInputComponentStyle.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/config/TextInputComponentStyle.java index 4af7eb43a..fc087b543 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/config/TextInputComponentStyle.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/config/TextInputComponentStyle.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.interaction.modal.config; import com.google.gson.annotations.SerializedName; -import net.dv8tion.jda.api.interactions.components.text.TextInputStyle; +import net.dv8tion.jda.api.components.textinput.TextInputStyle; public enum TextInputComponentStyle { @SerializedName("short") diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java index a21d099bd..79cd030c4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java @@ -17,6 +17,7 @@ import dev.sheldan.abstracto.core.utils.FileService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.components.actionrow.ActionRowChildComponent; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.channel.attribute.IThreadContainer; import net.dv8tion.jda.api.entities.channel.concrete.Category; @@ -25,8 +26,8 @@ import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import net.dv8tion.jda.api.interactions.components.ActionComponent; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.ActionComponent; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.interactions.components.ItemComponent; import net.dv8tion.jda.api.requests.restaction.MessageCreateAction; import net.dv8tion.jda.api.requests.restaction.MessageEditAction; @@ -274,8 +275,8 @@ public class ChannelServiceBean implements ChannelService { GuildChannel channel = (GuildChannel) textChannel; server = serverManagementService.loadServer(channel.getGuild()); } - for (ActionRow components : actionRows) { - for (ItemComponent component : components) { + for (ActionRow row : actionRows) { + for (ActionRowChildComponent component : row) { if (component instanceof ActionComponent) { String id = ((ActionComponent) component).getId(); MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java index 2547f4223..ad26789e6 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java @@ -16,7 +16,7 @@ import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; import net.dv8tion.jda.api.requests.restaction.MessageEditAction; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/ButtonStyleConfig.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/ButtonStyleConfig.java index 8df1ce060..78ce5e6a1 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/ButtonStyleConfig.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/ButtonStyleConfig.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.templating.model; import com.google.gson.annotations.SerializedName; -import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; +import net.dv8tion.jda.api.components.buttons.ButtonStyle; public enum ButtonStyleConfig { @SerializedName("primary") diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/service/TemplateServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/service/TemplateServiceBean.java index c8d0c9228..12e418000 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/service/TemplateServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/service/TemplateServiceBean.java @@ -19,16 +19,17 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.components.actionrow.ActionRowChildComponent; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.channel.ChannelType; import net.dv8tion.jda.api.entities.emoji.Emoji; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.interactions.components.ItemComponent; -import net.dv8tion.jda.api.interactions.components.buttons.Button; -import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu; -import net.dv8tion.jda.api.interactions.components.selections.SelectOption; -import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu; +import net.dv8tion.jda.api.components.buttons.Button; +import net.dv8tion.jda.api.components.selections.EntitySelectMenu; +import net.dv8tion.jda.api.components.selections.SelectOption; +import net.dv8tion.jda.api.components.selections.StringSelectMenu; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -385,7 +386,7 @@ public class TemplateServiceBean implements TemplateService { actionRows.add(currentRow); currentRow = ActionRow.of(createdButton); } else { - currentRow.getComponents().add(createdButton); + currentRow.getButtons().add(createdButton); } } if(currentRow != null) { diff --git a/abstracto-application/core/core-int/pom.xml b/abstracto-application/core/core-int/pom.xml index 2f9c9c83b..e42010003 100644 --- a/abstracto-application/core/core-int/pom.xml +++ b/abstracto-application/core/core-int/pom.xml @@ -33,7 +33,7 @@ spring-boot-starter - net.dv8tion + io.github.freya022 JDA diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentService.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentService.java index 57762b84e..31ebda49e 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentService.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentService.java @@ -3,10 +3,10 @@ package dev.sheldan.abstracto.core.interaction; import dev.sheldan.abstracto.core.interaction.button.ButtonConfigModel; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; -import net.dv8tion.jda.api.interactions.components.ActionComponent; -import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.Component; -import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; +import net.dv8tion.jda.api.components.ActionComponent; +import net.dv8tion.jda.api.components.actionrow.ActionRow; +import net.dv8tion.jda.api.components.Component; +import net.dv8tion.jda.api.components.buttons.ButtonStyle; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java index fc5dab31b..ca9a3fd43 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java @@ -10,7 +10,7 @@ import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; import net.dv8tion.jda.api.requests.restaction.MessageEditAction; diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/templating/model/MessageToSend.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/templating/model/MessageToSend.java index 92b0121df..7d95bd641 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/templating/model/MessageToSend.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/templating/model/MessageToSend.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Getter; import lombok.Setter; import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.interactions.components.ActionRow; +import net.dv8tion.jda.api.components.actionrow.ActionRow; import java.util.ArrayList; import java.util.HashMap; diff --git a/abstracto-application/pom.xml b/abstracto-application/pom.xml index ea66bd300..e75efd497 100644 --- a/abstracto-application/pom.xml +++ b/abstracto-application/pom.xml @@ -153,9 +153,9 @@ - net.dv8tion + io.github.freya022 JDA - ${jda.version} + 4a9d724a21 club.minnced