[AB-xxx] adding ability to define unique ids for components, a color of the container, disabled state for multiple components and spoiler for container

fixing reminder message not containing a link to the message anymore

.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.6.4
+VERSION=1.6.10

README.md

@@ -11,7 +11,7 @@ This repository does not provide the full functionality in order to start a disc
 
 
 ## Technologies
-* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 5.3.1
+* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 5.4.0
 * [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including dependency injection and more)
 * [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA.
 * [Freemarker](https://github.com/apache/freemarker) is used as a templating engine. This is used to provide internationalization for user facing text and enable dynamic embed configuration.

abstracto-application/abstracto-modules/anti-raid/anti-raid-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>anti-raid</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/anti-raid/anti-raid-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>anti-raid</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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;

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>assignable-roles-int</artifactId>

abstracto-application/abstracto-modules/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>custom-command</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>custom-command</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/dynamic-activity-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>dynamic-activity</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/dynamic-activity-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dynamic-activity</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/command/Choose.java

@@ -52,6 +52,7 @@ public class Choose extends AbstractConditionableCommand {
         String choice = entertainmentService.takeChoice(choices, commandContext.getAuthor());
         ChooseResponseModel responseModel = ChooseResponseModel
                 .builder()
+                .choices(choices)
                 .chosenValue(choice)
                 .build();
         return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(CHOOSE_RESPONSE_TEMPLATE_KEY, responseModel, commandContext.getChannel()))
@@ -70,6 +71,7 @@ public class Choose extends AbstractConditionableCommand {
         String choice = entertainmentService.takeChoice(choices, event.getMember());
         ChooseResponseModel responseModel = ChooseResponseModel
                 .builder()
+                .choices(choices)
                 .chosenValue(choice)
                 .build();
         return interactionService.replyEmbed(CHOOSE_RESPONSE_TEMPLATE_KEY, responseModel, event)

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/command/EightBall.java

@@ -56,6 +56,7 @@ public class EightBall extends AbstractConditionableCommand {
         String chosenKey = entertainmentService.getEightBallValue(text);
         EightBallResponseModel responseModel = EightBallResponseModel
                 .builder()
+                .input(text)
                 .chosenKey(chosenKey)
                 .build();
         return templateService.renderEmbedTemplate(EIGHT_BALL_RESPONSE_TEMPLATE_KEY, responseModel, serverId);

abstracto-application/abstracto-modules/entertainment/entertainment-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/command/ChooseResponseModel.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.entertainment.model.command;
 
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,4 +10,5 @@ import lombok.Setter;
 @Builder
 public class ChooseResponseModel {
     private String chosenValue;
+    private List<String> choices;
 }

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/command/EightBallResponseModel.java

@@ -9,4 +9,5 @@ import lombok.Setter;
 @Builder
 public class EightBallResponseModel {
     private String chosenKey;
+    private String input;
 }

abstracto-application/abstracto-modules/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/giveaway/giveaway-impl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>giveaway</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway-impl</artifactId>

abstracto-application/abstracto-modules/giveaway/giveaway-int/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>giveaway</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway-int</artifactId>

abstracto-application/abstracto-modules/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

abstracto-application/abstracto-modules/image-generation/image-generation-impl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>image-generation</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-impl</artifactId>

abstracto-application/abstracto-modules/image-generation/image-generation-int/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>image-generation</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation-int</artifactId>

abstracto-application/abstracto-modules/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>invite-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/invite-filter/invite-filter-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>invite-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>moderation-int</artifactId>
-            <version>1.6.6</version>
+            <version>1.6.11-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

abstracto-application/abstracto-modules/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java

@@ -11,6 +11,7 @@ import dev.sheldan.abstracto.core.interaction.button.ButtonConfigModel;
 import dev.sheldan.abstracto.core.interaction.ComponentPayloadManagementService;
 import dev.sheldan.abstracto.linkembed.config.LinkEmbedFeatureDefinition;
 import dev.sheldan.abstracto.linkembed.config.LinkEmbedFeatureMode;
+import dev.sheldan.abstracto.linkembed.model.template.MessageEmbedCleanupReplacementModel;
 import dev.sheldan.abstracto.linkembed.model.template.MessageEmbedDeleteButtonPayload;
 import dev.sheldan.abstracto.linkembed.model.template.MessageEmbeddedModel;
 import dev.sheldan.abstracto.core.service.*;
@@ -18,7 +19,6 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
-import dev.sheldan.abstracto.core.utils.CompletableFutureList;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.linkembed.model.MessageEmbedLink;
 import dev.sheldan.abstracto.linkembed.model.database.EmbeddedMessage;
@@ -28,6 +28,7 @@ import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -49,6 +50,7 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
     private final Pattern messageRegex = Pattern.compile("(?<whole>(?:https?://)?(?:\\w+\\.)?discord(?:app)?\\.com/channels/(?<server>\\d+)/(?<channel>\\d+)/(?<message>\\d+)(?:.*?))+", Pattern.CASE_INSENSITIVE);
 
     public static final String MESSAGE_EMBED_TEMPLATE = "message_embed";
+    private static final String MESSAGE_EMBED_CLEANUP_REPLACEMENT_TEMPLATE = "message_embed_cleanup_replacement";
     public static final String REMOVAL_EMOTE = "removeEmbed";
 
     @Autowired
@@ -78,9 +80,6 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
     @Autowired
     private ReactionService reactionService;
 
-    @Autowired
-    private MessageService messageService;
-
     @Autowired
     private ComponentService componentServiceBean;
 
@@ -160,15 +159,21 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
             return CompletableFuture.completedFuture(null);
         }
         log.info("Cleaning up {} embedded embeddedMessages", embeddedMessages.size());
-        List<ServerChannelMessage> reactionChannelMessages = embeddedMessages.stream()
-                .filter(embeddedMessage -> embeddedMessage.getDeletionComponentId() == null)
-                .map(this::convertEmbedMessageToServerChannelMessage)
-        .collect(Collectors.toList());
+        List<Pair<ServerChannelMessage, ServerChannelMessage>> embeddingMessages = embeddedMessages.stream()
+                .map(embeddedMessage -> Pair.of(ServerChannelMessage
+                    .builder()
+                    .serverId(embeddedMessage.getEmbeddingServer().getId())
+                    .channelId(embeddedMessage.getEmbeddingChannel().getId())
+                    .messageId(embeddedMessage.getEmbeddingMessageId())
+                    .build(),
+                    ServerChannelMessage
+                        .builder().
+                        serverId(embeddedMessage.getEmbeddedServer().getId())
+                        .channelId(embeddedMessage.getEmbeddedChannel().getId())
+                        .messageId(embeddedMessage.getEmbeddedMessageId())
+                        .build()))
+        .toList();
 
-        List<ServerChannelMessage> buttonChannelMessages = embeddedMessages.stream()
-                .filter(embeddedMessage -> embeddedMessage.getDeletionComponentId() != null)
-                .map(this::convertEmbedMessageToServerChannelMessage)
-                .collect(Collectors.toList());
         List<Long> embeddedMessagesHandled = embeddedMessages
                 .stream()
                 .map(EmbeddedMessage::getEmbeddingMessageId)
@@ -179,67 +184,26 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());
-        List<CompletableFuture<Message>> reactionMessageFutures = messageService.retrieveMessages(reactionChannelMessages);
-        List<CompletableFuture<Message>> buttonMessageFutures = messageService.retrieveMessages(buttonChannelMessages);
-        CompletableFutureList<Message> reactionFutureList = new CompletableFutureList<>(reactionMessageFutures);
-        CompletableFutureList<Message> buttonFutureList = new CompletableFutureList<>(buttonMessageFutures);
-        return reactionFutureList.getMainFuture()
-                .handle((unused, throwable) -> {
-                    if(throwable != null) {
-                        log.warn("Embedded messages reaction message loading failed.", throwable);
-                    }
-                    return self.removeReactions(reactionFutureList.getObjects());
-                })
-                .thenCompose(Function.identity())
-                .thenCompose(unused -> buttonFutureList.getMainFuture())
-                .handle((unused, throwable) -> {
-                    if(throwable != null) {
-                        log.warn("Embedded messages button message loading failed.", throwable);
-                    }
-                    return self.removeButtons(buttonFutureList.getObjects());
-                })
-                // deleting the messages from db regardless of exceptions, at most the reaction remains
-                .thenCompose(Function.identity())
-                .whenComplete((unused, throwable) -> {
-                    if(throwable != null) {
-                        log.warn("Embedded message button clearing failed.", throwable);
-                    }
-                    self.deleteEmbeddedMessages(embeddedMessagesHandled, componentPayloadsToDelete);
-                })
-                .exceptionally(throwable -> {
-                    log.error("Failed to clean up embedded messages.", throwable);
-                    return null;
-                });
-    }
-
-    public CompletableFuture<Void> removeButtons(List<Message> messages) {
-        List<CompletableFuture<Void>> removalFutures = new ArrayList<>();
-        messages.forEach(message -> removalFutures.add(componentServiceBean.clearButtons(message)));
-        return FutureUtils.toSingleFutureGeneric(removalFutures);
-    }
-
-    private ServerChannelMessage convertEmbedMessageToServerChannelMessage(EmbeddedMessage embeddedMessage) {
-        return ServerChannelMessage
+        List<CompletableFuture<Message>> editList = embeddingMessages.stream().map(messagePair -> {
+            ServerChannelMessage embeddingMessage = messagePair.getLeft();
+            ServerChannelMessage embeddedMessage = messagePair.getRight();
+            MessageEmbedCleanupReplacementModel model = MessageEmbedCleanupReplacementModel
                 .builder()
-                .serverId(embeddedMessage.getEmbeddingServer().getId())
-                .channelId(embeddedMessage.getEmbeddingChannel().getId())
-                .messageId(embeddedMessage.getEmbeddingMessageId())
+                .message(embeddedMessage)
                 .build();
+            MessageToSend messageToSend =
+                templateService.renderEmbedTemplate(MESSAGE_EMBED_CLEANUP_REPLACEMENT_TEMPLATE, model, embeddingMessage.getServerId());
+            return channelService.editMessageInAChannelFuture(messageToSend, embeddingMessage.getServerId(), embeddingMessage.getChannelId(),
+                embeddingMessage.getMessageId());
+        }).toList();
+        return FutureUtils.toSingleFutureGeneric(editList).whenComplete((unused, throwable) -> {
+            if(throwable != null) {
+                log.warn("Failed to cleanup embedded messages..", throwable);
+            }
+            self.deleteEmbeddedMessages(embeddedMessagesHandled, componentPayloadsToDelete);
+        });
     }
 
-    @Transactional
-    public CompletableFuture<Void> removeReactions(List<Message> allMessages) {
-        List<CompletableFuture<Void>> removalFutures = new ArrayList<>();
-        Map<Long, List<Message>> groupedPerServer = allMessages
-                .stream()
-                .collect(Collectors.groupingBy(message -> message.getGuild().getIdLong()));
-        groupedPerServer.forEach((serverId, serverMessages) -> {
-            // we assume the emote remained the same
-            CompletableFutureList<Void> removalFuture = reactionService.removeReactionFromMessagesWithFutureWithFutureList(serverMessages, REMOVAL_EMOTE);
-            removalFutures.add(removalFuture.getMainFuture());
-        });
-        return FutureUtils.toSingleFutureGeneric(removalFutures);
-    }
 
     @Transactional
     public void deleteEmbeddedMessages(List<Long> embeddedMessagesToDelete, List<String> componentPayloadsToDelete) {
@@ -357,7 +321,9 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
 
     private Boolean shouldMentionReferencedAuthor(Message message) {
         if(message.getReferencedMessage() != null) {
-            return message.getMentions().getMentions(Message.MentionType.USER).contains(message.getReferencedMessage().getAuthor());
+            return message.getMentions().getMentions(Message.MentionType.USER)
+                .stream()
+                .anyMatch(user -> message.getReferencedMessage().getAuthor().getIdLong() == user.getIdLong());
         }
         return false;
     }

abstracto-application/abstracto-modules/link-embed/link-embed-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-int/src/main/java/dev/sheldan/abstracto/linkembed/model/template/MessageEmbedCleanupReplacementModel.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.linkembed.model.template;
+
+import dev.sheldan.abstracto.core.models.ServerChannelMessage;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class MessageEmbedCleanupReplacementModel {
+    private ServerChannelMessage message;
+}

abstracto-application/abstracto-modules/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/logging-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>logging</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/logging-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>logging</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/profanity-filter-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>profanity-filter</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/profanity-filter/profanity-filter-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>profanity-filter</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java

@@ -223,6 +223,9 @@ public class RemindServiceBean implements ReminderService {
                 .builder()
                 .reminderParticipants(participantsDisplays)
                 .reminderDisplay(reminderDisplay)
+                .serverId(reminder.getServer().getId())
+                .channelId(reminder.getChannel().getId())
+                .messageId(reminder.getMessageId())
                 .userDisplay(UserDisplay.fromUser(member.getUser()))
                 .duration(Duration.between(reminder.getReminderDate(), reminder.getTargetDate()))
                 .build();

abstracto-application/abstracto-modules/remind/remind-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/listener/StarboardListener.java

@@ -138,8 +138,12 @@ public abstract class StarboardListener {
 
     protected void updateStarboardPost(CachedMessage message, AUserInAServer userReacting, boolean adding, StarboardPost starboardPost, List<AUserInAServer> userExceptAuthor) {
         starboardPost.setIgnored(false);
-        // TODO handle futures correctly
-        starboardService.updateStarboardPost(starboardPost, message, userExceptAuthor);
+        starboardService.updateStarboardPost(starboardPost, message, userExceptAuthor)
+            .thenAccept(unused -> log.info("Updated starboard post."))
+            .exceptionally(throwable -> {
+            log.error("Failed to update starboard post.", throwable);
+            return null;
+        });
         if(adding) {
             log.debug("Adding reactor {} from message {}", userReacting.getUserReference().getId(), message.getMessageId());
             starboardPostReactorManagementService.addReactor(starboardPost, userReacting);

abstracto-application/abstracto-modules/starboard/starboard-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/sticky-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/sticky-roles/sticky-roles-impl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>sticky-roles</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles-impl</artifactId>

abstracto-application/abstracto-modules/sticky-roles/sticky-roles-int/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>sticky-roles</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles-int</artifactId>

abstracto-application/abstracto-modules/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/twitch-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>twitch</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/twitch/twitch-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>twitch</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/voice-channel-context-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>voice-channel-context</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/voice-channel-context/voice-channel-context-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>voice-channel-context</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/webservices-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>webservices</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/youtube/service/YoutubeSearchServiceBean.java

@@ -26,7 +26,7 @@ public class YoutubeSearchServiceBean implements YoutubeSearchService {
     @Override
     public YoutubeVideo searchOneVideoForQuery(String query) {
         try {
-            YouTube.Search.List search = youTube.search().list("id,snippet");
+            YouTube.Search.List search = youTube.search().list("id");
             search.setQ(query);
             search.setType("video");
             search.setMaxResults(1L);
@@ -35,6 +35,9 @@ public class YoutubeSearchServiceBean implements YoutubeSearchService {
             if(items.isEmpty()) {
                 throw new YoutubeVideoNotFoundException();
             }
+            if(items.stream().noneMatch(searchResult -> searchResult.getId().get("kind").equals("youtube#video"))) {
+                throw new YoutubeVideoNotFoundException();
+            }
             return youtubeVideoService.getVideoInfo(items.get(0).getId().getVideoId());
         } catch (IOException e) {
             throw new YoutubeAPIException(e);

abstracto-application/abstracto-modules/webservices/webservices-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>webservices</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/bundle/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/core-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.core</groupId>
         <artifactId>core</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -84,7 +84,7 @@
         </dependency>
 
         <dependency>
-            <groupId>net.dv8tion</groupId>
+            <groupId>io.github.freya022</groupId>
             <artifactId>JDA</artifactId>
             <exclusions>
                 <exclusion>
@@ -131,6 +131,11 @@
             <artifactId>gson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.danilopianini</groupId>
+            <artifactId>gson-extras</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/CoreConfig.java

@@ -3,9 +3,25 @@ package dev.sheldan.abstracto.core.config;
 import ch.qos.logback.core.net.ssl.SecureRandomFactoryBean;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.typeadapters.RuntimeTypeAdapterFactory;
 import dev.sheldan.abstracto.core.logging.OkHttpLogger;
 import dev.sheldan.abstracto.core.metric.OkHttpMetrics;
 import dev.sheldan.abstracto.core.service.BotService;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.ActionRowButtonConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.ActionRowItemConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.ComponentConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.SectionAccessoryConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.SectionButton;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.SectionComponentConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.SectionTextDisplay;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.SectionThumbnail;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelActionRowConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelContainerConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelFileConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelMediaGalleryConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelSectionConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelSeperatorConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.TopLevelTextDisplay;
 import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -41,6 +57,27 @@ public class CoreConfig {
         GsonBuilder builder = new GsonBuilder()
                 .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeAdapter())
                 .registerTypeAdapter(Instant.class, new InstantAdapter())
+                .registerTypeAdapterFactory(RuntimeTypeAdapterFactory
+                    .of(ComponentConfig.class, "type")
+                    .registerSubtype(TopLevelActionRowConfig.class, "actionRow")
+                    .registerSubtype(TopLevelSectionConfig.class, "section")
+                    .registerSubtype(TopLevelFileConfig.class, "fileDisplay")
+                    .registerSubtype(TopLevelMediaGalleryConfig.class, "mediaGallery")
+                    .registerSubtype(TopLevelSeperatorConfig.class, "separator")
+                    .registerSubtype(TopLevelContainerConfig.class, "container")
+                    .registerSubtype(TopLevelTextDisplay.class, "textDisplay"))
+                .registerTypeAdapterFactory(RuntimeTypeAdapterFactory
+                    .of(ActionRowItemConfig.class, "type")
+                    .registerSubtype(ActionRowButtonConfig.class, "button"))
+                .registerTypeAdapterFactory(RuntimeTypeAdapterFactory
+                    .of(SectionAccessoryConfig.class, "type")
+                    .registerSubtype(SectionButton.class, "button")
+                    .registerSubtype(SectionThumbnail.class, "thumbnail")
+                )
+                .registerTypeAdapterFactory(RuntimeTypeAdapterFactory
+                    .of(SectionComponentConfig.class, "type")
+                    .registerSubtype(SectionTextDisplay.class, "textDisplay")
+                )
                 .setPrettyPrinting();
         if(customJsonDeSerializers != null) {
             customJsonDeSerializers.forEach(customJsonSerializer ->

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<ActionRow> currentActionRows = new ArrayList<>(message.getActionRows());
@@ -86,7 +86,7 @@ public class ComponentServiceBean implements ComponentService {
     public CompletableFuture<Void> removeComponentWithId(Message message, String componentId, Boolean rearrange) {
         List<ActionRow> actionRows = new ArrayList<>();
         if(Boolean.TRUE.equals(rearrange)) {
-            List<net.dv8tion.jda.api.interactions.components.ActionComponent> components = new ArrayList<>();
+            List<net.dv8tion.jda.api.components.ActionComponent> components = new ArrayList<>();
             message.getActionRows().forEach(row ->
                             row
                                 .getComponents()
@@ -112,8 +112,8 @@ public class ComponentServiceBean implements ComponentService {
     }
 
     @Override
-    public List<ActionRow> splitIntoActionRowsMax(List<net.dv8tion.jda.api.interactions.components.ActionComponent> allComponents) {
-        List<List<net.dv8tion.jda.api.interactions.components.ActionComponent>> actionRows = ListUtils.partition(allComponents, MAX_BUTTONS_PER_ROW);
+    public List<ActionRow> splitIntoActionRowsMax(List<net.dv8tion.jda.api.components.ActionComponent> allComponents) {
+        List<List<net.dv8tion.jda.api.components.ActionComponent>> actionRows = ListUtils.partition(allComponents, MAX_BUTTONS_PER_ROW);
         return actionRows.stream().map(ActionRow::of).collect(Collectors.toList());
     }
 

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;
@@ -260,56 +260,57 @@ public class InteractionServiceBean implements InteractionService {
 
     public CompletableFuture<InteractionHook> replyMessageToSend(MessageToSend messageToSend, IReplyCallback callback) {
         ReplyCallbackAction action = null;
-        if(messageToSend.getMessages() != null && !messageToSend.getMessages().isEmpty()) {
-            metricService.incrementCounter(MESSAGE_SEND_METRIC);
-            action = callback.reply(messageToSend.getMessages().get(0));
-        }
-
-        if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) {
-            if(action != null) {
-                action = action.addEmbeds(messageToSend.getEmbeds().subList(0, Math.min(10, messageToSend.getEmbeds().size())));
-            } else {
-                action = callback.replyEmbeds(messageToSend.getEmbeds());
+        if(messageToSend.getUseComponentsV2()) {
+            action = callback.replyComponents(messageToSend.getComponents()).useComponentsV2();
+        } else {
+            if(messageToSend.getMessages() != null && !messageToSend.getMessages().isEmpty()) {
+                metricService.incrementCounter(MESSAGE_SEND_METRIC);
+                action = callback.reply(messageToSend.getMessages().get(0));
             }
-        }
-
-        if(messageToSend.hasFilesToSend()) {
-            List<FileUpload> attachedFiles = messageToSend
+            if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) {
+                if(action != null) {
+                    action = action.addEmbeds(messageToSend.getEmbeds().subList(0, Math.min(10, messageToSend.getEmbeds().size())));
+                } else {
+                    action = callback.replyEmbeds(messageToSend.getEmbeds());
+                }
+            }
+            if(messageToSend.hasFilesToSend()) {
+                List<FileUpload> attachedFiles = messageToSend
                     .getAttachedFiles()
                     .stream()
                     .map(AttachedFile::convertToFileUpload)
                     .collect(Collectors.toList());
-            if(action != null) {
-                action.setFiles(attachedFiles);
-            } else {
-                metricService.incrementCounter(MESSAGE_SEND_METRIC);
-                action = callback.replyFiles(attachedFiles);
-            }
-        }
-
-        // this should be last, because we are "faking" a message, by inserting a ., in case there has not been a reply yet
-        // we could also throw an exception, but we are allowing this to go through
-        List<ActionRow> actionRows = messageToSend.getActionRows();
-        if(actionRows != null && !actionRows.isEmpty()) {
-            if(action == null) {
-                action = callback.reply(".");
-            }
-            action = action.setComponents(actionRows);
-            AServer server;
-            if(ContextUtils.isGuildKnown(callback)) {
-                server = serverManagementService.loadServer(callback.getGuild().getIdLong());
-            } else {
-               server = null;
-            }
-            actionRows.forEach(components -> components.forEach(component -> {
-                if(component instanceof ActionComponent) {
-                    String id = ((ActionComponent)component).getId();
-                    MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
-                    if(payload != null && payload.getPersistCallback()) {
-                        componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType());
-                    }
+                if(action != null) {
+                    action.setFiles(attachedFiles);
+                } else {
+                    metricService.incrementCounter(MESSAGE_SEND_METRIC);
+                    action = callback.replyFiles(attachedFiles);
                 }
-            }));
+            }
+            // this should be last, because we are "faking" a message, by inserting a ., in case there has not been a reply yet
+            // we could also throw an exception, but we are allowing this to go through
+            List<ActionRow> actionRows = messageToSend.getActionRows();
+            if(actionRows != null && !actionRows.isEmpty()) {
+                if(action == null) {
+                    action = callback.reply(".");
+                }
+                action = action.setComponents(actionRows);
+                AServer server;
+                if(ContextUtils.isGuildKnown(callback)) {
+                    server = serverManagementService.loadServer(callback.getGuild().getIdLong());
+                } else {
+                    server = null;
+                }
+                actionRows.forEach(components -> components.forEach(component -> {
+                    if(component instanceof ActionComponent) {
+                        String id = ((ActionComponent)component).getId();
+                        MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
+                        if(payload != null && payload.getPersistCallback()) {
+                            componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType());
+                        }
+                    }
+                }));
+            }
         }
 
         if(messageToSend.getEphemeral()) {
@@ -328,7 +329,7 @@ public class InteractionServiceBean implements InteractionService {
         if(ContextUtils.isGuildKnown(callback)) {
             Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(callback.getMessageChannel(), messageToSend);
             if (action != null) {
-                action.setAllowedMentions(allowedMentions);
+                action = action.setAllowedMentions(allowedMentions);
             }
         }
 

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;

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")

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/AllowedMentionServiceBean.java

@@ -125,14 +125,26 @@ public class AllowedMentionServiceBean implements AllowedMentionService {
         }
         if(messageToSend != null && messageToSend.getMessageConfig() != null) {
             MessageConfig messageConfig = messageToSend.getMessageConfig();
-            if(messageConfig.isAllowsEveryoneMention()) {
-                allowedMentions.add(Message.MentionType.EVERYONE);
+            if(messageConfig.getAllowsEveryoneMention() != null) {
+                if(messageConfig.getAllowsEveryoneMention()) {
+                    allowedMentions.add(Message.MentionType.EVERYONE);
+                } else {
+                    allowedMentions.remove(Message.MentionType.EVERYONE);
+                }
             }
-            if(messageConfig.isAllowsUserMention()) {
-                allowedMentions.add(Message.MentionType.USER);
+            if(messageConfig.getAllowsUserMention() != null) {
+                if(messageConfig.getAllowsUserMention()) {
+                    allowedMentions.add(Message.MentionType.USER);
+                } else {
+                    allowedMentions.remove(Message.MentionType.USER);
+                }
             }
-            if(messageConfig.isAllowsRoleMention()) {
-                allowedMentions.add(Message.MentionType.ROLE);
+            if(messageConfig.getAllowsRoleMention() != null) {
+                if(messageConfig.getAllowsRoleMention()) {
+                    allowedMentions.add(Message.MentionType.ROLE);
+                } else {
+                    allowedMentions.remove(Message.MentionType.ROLE);
+                }
             }
         }
         return allowedMentions;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java

@@ -74,6 +74,7 @@ public class CacheEntityServiceBean implements CacheEntityService {
                 .fileName(attachment.getFileName())
                 .height(attachment.getHeight())
                 .spoiler(attachment.isSpoiler())
+                .contentType(attachment.getContentType())
                 .proxyUrl(attachment.getProxyUrl())
                 .size(attachment.getSize())
                 .url(attachment.getUrl())

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,9 +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.interactions.components.ItemComponent;
+import net.dv8tion.jda.api.components.ActionComponent;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.api.requests.restaction.MessageEditAction;
 import net.dv8tion.jda.api.utils.FileUpload;
@@ -221,91 +221,96 @@ public class ChannelServiceBean implements ChannelService {
         }
         List<CompletableFuture<Message>> futures = new ArrayList<>();
         List<MessageCreateAction> allMessageActions = new ArrayList<>();
-        Iterator<MessageEmbed> embedIterator = messageToSend.getEmbeds().iterator();
-        for (int i = 0; i < messageToSend.getMessages().size(); i++) {
+        if(messageToSend.getUseComponentsV2() && messageToSend.getComponents() != null && !messageToSend.getComponents().isEmpty()) {
             metricService.incrementCounter(MESSAGE_SEND_METRIC);
-            String text = messageToSend.getMessages().get(i);
+            allMessageActions.add(textChannel.sendMessageComponents(messageToSend.getComponents()).useComponentsV2());
+        } else {
+            Iterator<MessageEmbed> embedIterator = messageToSend.getEmbeds().iterator();
+            for (int i = 0; i < messageToSend.getMessages().size(); i++) {
+                metricService.incrementCounter(MESSAGE_SEND_METRIC);
+                String text = messageToSend.getMessages().get(i);
+                List<MessageEmbed> messageEmbeds = new ArrayList<>();
+                while(embedIterator.hasNext()) {
+                    MessageEmbed embedToAdd = embedIterator.next();
+                    if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT) {
+                        break;
+                    }
+                    messageEmbeds.add(embedToAdd);
+                    embedIterator.remove();
+                }
+                MessageCreateAction messageAction = textChannel.sendMessage(text);
+                if(!messageEmbeds.isEmpty()) {
+                    messageAction.setEmbeds(messageEmbeds);
+                }
+                allMessageActions.add(messageAction);
+            }
             List<MessageEmbed> messageEmbeds = new ArrayList<>();
+            // reset the iterator, because if the if in the above while iterator loop applied, we already took it out from the iterator
+            // but we didnt add it yet, so it would be lost
+            embedIterator = messageToSend.getEmbeds().iterator();
             while(embedIterator.hasNext()) {
                 MessageEmbed embedToAdd = embedIterator.next();
-                if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT) {
-                    break;
+                if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT && !messageEmbeds.isEmpty()) {
+                    allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds));
+                    metricService.incrementCounter(MESSAGE_SEND_METRIC);
+                    messageEmbeds = new ArrayList<>();
                 }
                 messageEmbeds.add(embedToAdd);
-                embedIterator.remove();
             }
-            MessageCreateAction messageAction = textChannel.sendMessage(text);
+
             if(!messageEmbeds.isEmpty()) {
-                messageAction.setEmbeds(messageEmbeds);
-            }
-            allMessageActions.add(messageAction);
-        }
-        List<MessageEmbed> messageEmbeds = new ArrayList<>();
-        // reset the iterator, because if the if in the above while iterator loop applied, we already took it out from the iterator
-        // but we didnt add it yet, so it would be lost
-        embedIterator = messageToSend.getEmbeds().iterator();
-        while(embedIterator.hasNext()) {
-            MessageEmbed embedToAdd = embedIterator.next();
-            if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT && !messageEmbeds.isEmpty()) {
                 allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds));
                 metricService.incrementCounter(MESSAGE_SEND_METRIC);
-                messageEmbeds = new ArrayList<>();
             }
-            messageEmbeds.add(embedToAdd);
-        }
 
-        if(!messageEmbeds.isEmpty()) {
-            allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds));
-            metricService.incrementCounter(MESSAGE_SEND_METRIC);
-        }
-
-        List<ActionRow> actionRows = messageToSend.getActionRows();
-        if(!actionRows.isEmpty()) {
-            List<List<ActionRow>> groupedActionRows = ListUtils.partition(actionRows, ComponentService.MAX_BUTTONS_PER_ROW);
-            for (int i = 0; i < allMessageActions.size(); i++) {
-                allMessageActions.set(i, allMessageActions.get(i).setComponents(groupedActionRows.get(i)));
-            }
-            for (int i = allMessageActions.size(); i < groupedActionRows.size(); i++) {
-                // TODO maybe possible nicer
-                allMessageActions.add(textChannel.sendMessage(".").setComponents(groupedActionRows.get(i)));
-            }
-            AServer server = null;
-            if(textChannel instanceof GuildChannel) {
-                GuildChannel channel = (GuildChannel) textChannel;
-                server = serverManagementService.loadServer(channel.getGuild());
-            }
-            for (ActionRow components : actionRows) {
-                for (ItemComponent component : components) {
-                    if (component instanceof ActionComponent) {
-                        String id = ((ActionComponent) component).getId();
-                        MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
-                        if (payload != null && payload.getPersistCallback()) {
-                            componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType());
+            List<ActionRow> actionRows = messageToSend.getActionRows();
+            if(!actionRows.isEmpty()) {
+                List<List<ActionRow>> groupedActionRows = ListUtils.partition(actionRows, ComponentService.MAX_BUTTONS_PER_ROW);
+                for (int i = 0; i < allMessageActions.size(); i++) {
+                    allMessageActions.set(i, allMessageActions.get(i).setComponents(groupedActionRows.get(i)));
+                }
+                for (int i = allMessageActions.size(); i < groupedActionRows.size(); i++) {
+                    // TODO maybe possible nicer
+                    allMessageActions.add(textChannel.sendMessage(".").setComponents(groupedActionRows.get(i)));
+                }
+                AServer server = null;
+                if(textChannel instanceof GuildChannel) {
+                    GuildChannel channel = (GuildChannel) textChannel;
+                    server = serverManagementService.loadServer(channel.getGuild());
+                }
+                for (ActionRow row : actionRows) {
+                    for (ActionRowChildComponent component : row) {
+                        if (component instanceof ActionComponent) {
+                            String id = ((ActionComponent) component).getId();
+                            MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
+                            if (payload != null && payload.getPersistCallback()) {
+                                componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType());
+                            }
                         }
                     }
                 }
             }
-        }
 
-        if(messageToSend.hasFilesToSend()) {
-            List<FileUpload> attachedFiles = messageToSend
+            if(messageToSend.hasFilesToSend()) {
+                List<FileUpload> attachedFiles = messageToSend
                     .getAttachedFiles()
                     .stream()
                     .map(AttachedFile::convertToFileUpload)
                     .collect(Collectors.toList());
-            if(!allMessageActions.isEmpty()) {
-                // in case there has not been a message, we need to increment it
-                allMessageActions.set(0, allMessageActions.get(0).addFiles(attachedFiles));
-            } else {
-                metricService.incrementCounter(MESSAGE_SEND_METRIC);
-                allMessageActions.add(textChannel.sendFiles(attachedFiles));
+                if(!allMessageActions.isEmpty()) {
+                    // in case there has not been a message, we need to increment it
+                    allMessageActions.set(0, allMessageActions.get(0).addFiles(attachedFiles));
+                } else {
+                    metricService.incrementCounter(MESSAGE_SEND_METRIC);
+                    allMessageActions.add(textChannel.sendFiles(attachedFiles));
+                }
             }
         }
         Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(textChannel, messageToSend);
         allMessageActions.forEach(messageAction -> {
             if(messageToSend.getReferencedMessageId() != null) {
                 messageAction = messageAction.setMessageReference(messageToSend.getReferencedMessageId());
-                if(messageToSend.getMessageConfig() != null && !messageToSend.getMessageConfig().isMentionsReferencedMessage()) {
+                if(messageToSend.getMessageConfig() != null && !messageToSend.getMessageConfig().getMentionsReferencedMessage()) {
                     messageAction = messageAction.mentionRepliedUser(false);
                 }
             }
@@ -337,6 +342,15 @@ public class ChannelServiceBean implements ChannelService {
     @Override
     public CompletableFuture<Message> editMessageInAChannelFuture(MessageToSend messageToSend, MessageChannel channel, Long messageId) {
         MessageEditAction messageAction;
+        if(messageToSend.getUseComponentsV2()) {
+            Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(channel, messageToSend);
+            return channel
+                .editMessageComponentsById(messageId, messageToSend.getComponents())
+                .useComponentsV2()
+                .setReplace(true)
+                .setAllowedMentions(allowedMentions)
+                .submit();
+        }
         if(!messageToSend.getMessages().isEmpty() && !StringUtils.isBlank(messageToSend.getMessages().get(0))) {
             log.debug("Editing message {} with new text content.", messageId);
             messageAction = channel.editMessageById(messageId, messageToSend.getMessages().get(0));

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;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java

@@ -2,8 +2,6 @@ package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.core.exception.ChannelNotInGuildException;
-import dev.sheldan.abstracto.core.exception.GuildNotFoundException;
 import dev.sheldan.abstracto.core.exception.PostTargetNotUsableException;
 import dev.sheldan.abstracto.core.exception.PostTargetNotValidException;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -11,6 +9,7 @@ import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.service.management.DefaultPostTargetManagementService;
 import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@@ -181,40 +180,65 @@ public class PostTargetServiceBean implements PostTargetService {
             return getMessageChannelForPostTarget(target).map(messageChannel -> {
                 CompletableFuture<Message> messageEditFuture = new CompletableFuture<>();
                 futures.add(messageEditFuture);
-                if (StringUtils.isBlank(messageToSend.getMessages().get(0).trim())) {
+                if(messageToSend.getUseComponentsV2()) {
                     channelService.retrieveMessageInChannel(messageChannel, messageId).thenAccept(message -> {
                         log.debug("Editing existing message {} when upserting message embeds in channel {} in server {}.",
-                                messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
-                        messageService.editMessage(message, messageToSend.getEmbeds().get(0))
-                                .queue(messageEditFuture::complete, messageEditFuture::completeExceptionally);
+                            messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
+                        channelService.editMessageInAChannelFuture(messageToSend, messageChannel, messageId)
+                            .thenAccept(messageEditFuture::complete)
+                            .exceptionally(throwable -> {
+                                messageEditFuture.completeExceptionally(throwable);
+                                return null;
+                            });
                     }).exceptionally(throwable -> {
                         log.debug("Creating new message when upserting message embeds for message {} in channel {} in server {}.",
-                                messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
-                        sendEmbedInPostTarget(messageToSend, target).get(0)
-                                .thenAccept(messageEditFuture::complete).exceptionally(innerThrowable -> {
-                                    log.error("Failed to send message to create a message.", innerThrowable);
-                                    messageEditFuture.completeExceptionally(innerThrowable);
-                                    return null;
-                                });
+                            messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
+                        List<CompletableFuture<Message>> messageFutures = channelService.sendMessageToSendToChannel(messageToSend, messageChannel);
+                        FutureUtils.toSingleFutureGeneric(messageFutures)
+                                .thenAccept(unused -> messageEditFuture.complete(futures.get(0).join()))
+                                    .exceptionally(innerThrowable -> {
+                                        log.error("Failed to send message to create a message.", innerThrowable);
+                                        messageEditFuture.completeExceptionally(innerThrowable);
+                                        return null;
+                                    });
                         return null;
                     });
                 } else {
-                    channelService.retrieveMessageInChannel(messageChannel, messageId).thenAccept(message -> {
-                        log.debug("Editing existing message {} when upserting message in channel {} in server {}.",
+                    if (StringUtils.isBlank(messageToSend.getMessages().get(0).trim())) {
+                        channelService.retrieveMessageInChannel(messageChannel, messageId).thenAccept(message -> {
+                            log.debug("Editing existing message {} when upserting message embeds in channel {} in server {}.",
                                 messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
-                        messageService.editMessage(message, messageToSend.getMessages().get(0), messageToSend.getEmbeds().get(0))
+                            messageService.editMessage(message, messageToSend.getEmbeds().get(0))
                                 .queue(messageEditFuture::complete, messageEditFuture::completeExceptionally);
-                    }).exceptionally(throwable -> {
-                        log.debug("Creating new message when trying to upsert a message {} in channel {} in server {}.",
+                        }).exceptionally(throwable -> {
+                            log.debug("Creating new message when upserting message embeds for message {} in channel {} in server {}.",
                                 messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
-                        sendEmbedInPostTarget(messageToSend, target).get(0)
+                            sendEmbedInPostTarget(messageToSend, target).get(0)
                                 .thenAccept(messageEditFuture::complete).exceptionally(innerThrowable -> {
                                     log.error("Failed to send message to create a message.", innerThrowable);
                                     messageEditFuture.completeExceptionally(innerThrowable);
                                     return null;
                                 });
-                        return null;
-                    });
+                            return null;
+                        });
+                    } else {
+                        channelService.retrieveMessageInChannel(messageChannel, messageId).thenAccept(message -> {
+                            log.debug("Editing existing message {} when upserting message in channel {} in server {}.",
+                                messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
+                            messageService.editMessage(message, messageToSend.getMessages().get(0), messageToSend.getEmbeds().get(0))
+                                .queue(messageEditFuture::complete, messageEditFuture::completeExceptionally);
+                        }).exceptionally(throwable -> {
+                            log.debug("Creating new message when trying to upsert a message {} in channel {} in server {}.",
+                                messageId, messageChannel.getIdLong(), messageChannel.getGuild().getId());
+                            sendEmbedInPostTarget(messageToSend, target).get(0)
+                                .thenAccept(messageEditFuture::complete).exceptionally(innerThrowable -> {
+                                    log.error("Failed to send message to create a message.", innerThrowable);
+                                    messageEditFuture.completeExceptionally(innerThrowable);
+                                    return null;
+                                });
+                            return null;
+                        });
+                    }
                 }
                 return futures;
             }).orElse(Arrays.asList(CompletableFuture.completedFuture(null)));

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/MessageConfiguration.java

@@ -1,5 +1,7 @@
 package dev.sheldan.abstracto.core.templating.model;
 
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.ButtonConfig;
+import dev.sheldan.abstracto.core.templating.model.messagecomponents.ComponentConfig;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,6 +17,7 @@ import java.util.List;
 @Builder
 public class MessageConfiguration {
     private List<EmbedConfiguration> embeds;
+    private List<ComponentConfig> components;
     private Long referencedMessageId;
     /**
      * The message which is posted along the {@link net.dv8tion.jda.api.entities.MessageEmbed} as a normal message.

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/MetaMessageConfiguration.java

@@ -17,6 +17,8 @@ public class MetaMessageConfiguration {
     @Builder.Default
     private boolean allowsUserMention = true;
     @Builder.Default
+    private boolean useComponentsV2 = false;
+    @Builder.Default
     private boolean mentionsReferencedMessage = true;
 
     private Integer messageLimit;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/model/messagecomponents/ActionRowButtonConfig.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.core.templating.model.messagecomponents;
+
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+@Getter
+@SuperBuilder
+public class ActionRowButtonConfig extends ButtonConfig implements ActionRowItemConfig{
+
+    @Override
+    public ActionRowItemType getType() {
+        return ActionRowItemType.BUTTON;
+    }
+}