[AB-xxx] changing the method used to edit the giveaway message

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.8
+VERSION=1.6.11

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway-impl</artifactId>

abstracto-application/abstracto-modules/giveaway/giveaway-impl/src/main/java/dev/sheldan/abstracto/giveaway/service/GiveawayServiceBean.java

@@ -155,7 +155,7 @@ public class GiveawayServiceBean implements GiveawayService {
         Long giveawayId = giveaway.getGiveawayId().getId();
         log.info("Adding giveaway participating of user {} to giveaway {} in server {}.", member.getIdLong(), giveawayId, member.getGuild().getIdLong());
         MessageToSend messageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel, member.getGuild().getIdLong());
-        return channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), messageChannel, giveaway.getMessageId())
+        return channelService.editMessageInAChannelFuture(messageToSend, messageChannel, giveaway.getMessageId())
                 .thenAccept(message -> {
             self.persistAddedParticipant(member, giveawayId);
         });

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+            <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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()
+        List<Pair<ServerChannelMessage, ServerChannelMessage>> embeddingMessages = embeddedMessages.stream()
-                .filter(embeddedMessage -> embeddedMessage.getDeletionComponentId() == null)
+                .map(embeddedMessage -> Pair.of(ServerChannelMessage
-                .map(this::convertEmbedMessageToServerChannelMessage)
+                    .builder()
-        .collect(Collectors.toList());
+                    .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>> editList = embeddingMessages.stream().map(messagePair -> {
-        List<CompletableFuture<Message>> buttonMessageFutures = messageService.retrieveMessages(buttonChannelMessages);
+            ServerChannelMessage embeddingMessage = messagePair.getLeft();
-        CompletableFutureList<Message> reactionFutureList = new CompletableFutureList<>(reactionMessageFutures);
+            ServerChannelMessage embeddedMessage = messagePair.getRight();
-        CompletableFutureList<Message> buttonFutureList = new CompletableFutureList<>(buttonMessageFutures);
+            MessageEmbedCleanupReplacementModel model = MessageEmbedCleanupReplacementModel
-        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
                 .builder()
-                .serverId(embeddedMessage.getEmbeddingServer().getId())
+                .message(embeddedMessage)
-                .channelId(embeddedMessage.getEmbeddingChannel().getId())
-                .messageId(embeddedMessage.getEmbeddingMessageId())
                 .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) {

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java

@@ -23,7 +23,6 @@ import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -76,16 +75,15 @@ public class Ban extends AbstractConditionableCommand {
             duration = null;
         }
 
-        if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.USER)) {
+        Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
-            Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
+        if(member != null) {
             return event.deferReply().submit()
                 .thenCompose((hook) -> self.banMember(event, member, reason, duration, hook))
                 .thenApply(commandResult -> CommandResult.fromSuccess());
         } else {
-            String userIdStr = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, String.class);
+            User user = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, User.class);
-            Long userId = Long.parseLong(userIdStr);
             return event.deferReply().submit()
-                .thenCompose((hook) -> self.banViaUserId(event, userId, reason, duration, hook))
+                .thenCompose((hook) -> self.banViaUserId(event, user.getIdLong(), reason, duration, hook))
                 .thenApply(commandResult -> CommandResult.fromSuccess());
         }
     }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Infractions.java

@@ -33,7 +33,6 @@ import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -86,16 +85,15 @@ public class Infractions extends AbstractConditionableCommand {
     public CompletableFuture<CommandResult> showInfractions(InteractionHook hook, SlashCommandInteractionEvent event) {
         List<Infraction> infractions;
         Guild guild = hook.getInteraction().getGuild();
-        if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.USER)) {
+        Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
-            Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
+        User user = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, User.class);
+        if(member != null) {
             if(!member.getGuild().equals(guild)) {
                 throw new EntityGuildMismatchException();
             }
             infractions = infractionManagementService.getInfractionsForUser(userInServerManagementService.loadOrCreateUser(member));
-        } else if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.STRING)){
+        } else if(user != null){
-            String userIdStr = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, String.class);
+            AUserInAServer userInServer = userInServerManagementService.loadOrCreateUser(guild.getIdLong(), user.getIdLong());
-            Long userId = Long.parseLong(userIdStr);
-            AUserInAServer userInServer = userInServerManagementService.loadOrCreateUser(guild.getIdLong(), userId);
             infractions = infractionManagementService.getInfractionsForUser(userInServer);
 
         } else {

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles-impl</artifactId>

abstracto-application/abstracto-modules/sticky-roles/sticky-roles-impl/src/main/java/dev/sheldan/abstracto/stickyroles/command/ToggleStickinessManagement.java

@@ -11,7 +11,6 @@ import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
-import dev.sheldan.abstracto.core.service.UserService;
 import dev.sheldan.abstracto.stickyroles.config.StickyRolesFeatureDefinition;
 import dev.sheldan.abstracto.stickyroles.config.StickyRolesSlashCommandNames;
 import dev.sheldan.abstracto.stickyroles.service.StickyRoleService;
@@ -19,10 +18,8 @@ import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
@@ -47,34 +44,18 @@ public class ToggleStickinessManagement extends AbstractConditionableCommand {
     @Autowired
     private StickyRoleService stickyRoleService;
 
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private ToggleStickinessManagement self;
-
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         Boolean newState = slashCommandParameterService.getCommandOption(STICKY_PARAMETER_NAME, event, Boolean.class);
-        if(slashCommandParameterService.hasCommandOptionWithFullType(MEMBER_PARAMETER_NAME, event, OptionType.USER)) {
+        Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, Member.class);
-            Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, Member.class);
+        User targetUser = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, User.class);
+        if(targetMember != null) {
             stickyRoleService.setStickiness(targetMember, newState);
-            return interactionService.replyEmbed(RESPONSE_TEMPLATE, event)
-                    .thenApply(interactionHook -> CommandResult.fromSuccess());
         } else {
-            String userIdStr = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, String.class);
+            stickyRoleService.setStickiness(targetUser, event.getGuild(), newState);
-            Long userId = Long.parseLong(userIdStr);
-            return userService.retrieveUserForId(userId).thenCompose(user -> {
-                self.callService(event, user, newState);
-                return interactionService.replyEmbed(RESPONSE_TEMPLATE, event);
-            }).thenApply(interactionHook -> CommandResult.fromSuccess());
         }
-    }
+        return interactionService.replyEmbed(RESPONSE_TEMPLATE, event)
-
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
-
-    @Transactional
-    public void callService(SlashCommandInteractionEvent event, User user, Boolean newState) {
-        stickyRoleService.setStickiness(user, event.getGuild(), newState);
     }
 
     @Override

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-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.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/DisableFeature.java

@@ -14,14 +14,18 @@ import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
+import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.template.commands.FeatureSwitchModel;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,6 +58,12 @@ public class DisableFeature extends AbstractConditionableCommand {
     @Autowired
     private InteractionService interactionService;
 
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
+    @Autowired
+    private FeatureFlagManagementService featureFlagManagementService;
+
     private static final String DISABLE_FEATURE_DEPENDENCIES_RESPONSE_TEMPLATE_KEY = "disableFeature_feature_dependencies_response";
     private static final String DISABLE_FEATURE_RESPONSE_TEMPLATE_KEY = "disableFeature_response";
     private static final String FEATURE_NAME_PARAMETER = "featureName";
@@ -99,6 +109,21 @@ public class DisableFeature extends AbstractConditionableCommand {
         return featureDependencies;
     }
 
+    @Override
+    public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), FEATURE_NAME_PARAMETER)) {
+            String input = event.getFocusedOption().getValue().toLowerCase();
+            AServer server = serverManagementService.loadServer(event.getGuild());
+            return featureFlagManagementService.getFeatureFlagsOfServer(server)
+                .stream()
+                .filter(AFeatureFlag::isEnabled)
+                .map(aFeatureFlag -> aFeatureFlag.getFeature().getKey().toLowerCase())
+                .filter(featureName ->  featureName.toLowerCase().startsWith(input))
+                .toList();
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
         Parameter featureName = Parameter
@@ -106,6 +131,7 @@ public class DisableFeature extends AbstractConditionableCommand {
                 .name(FEATURE_NAME_PARAMETER)
                 .templated(true)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .build();
         List<Parameter> parameters = Arrays.asList(featureName);
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/DisableMode.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.core.commands.config.features;
 
+import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
 import dev.sheldan.abstracto.core.interaction.slash.CoreSlashCommandNames;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -13,11 +14,19 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
+import dev.sheldan.abstracto.core.models.database.AFeature;
+import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
+import dev.sheldan.abstracto.core.models.database.AFeatureMode;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;
+import dev.sheldan.abstracto.core.service.management.FeatureModeManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import java.util.ArrayList;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,6 +53,18 @@ public class DisableMode extends AbstractConditionableCommand {
     @Autowired
     private InteractionService interactionService;
 
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
+    @Autowired
+    private FeatureFlagManagementService featureFlagManagementService;
+
+    @Autowired
+    private FeatureModeManagementService featureModeManagementService;
+
+    @Autowired
+    private FeatureManagementService featureManagementService;
+
     private static final String DISABLE_MODE_RESPONSE_KEY = "disableMode_response";
     private static final String FEATURE_PARAMETER = "feature";
     private static final String MODE_PARAMETER = "mode";
@@ -61,12 +82,41 @@ public class DisableMode extends AbstractConditionableCommand {
                 .thenApply(interactionHook -> CommandResult.fromSuccess());
     }
 
+    @Override
+    public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        String input = event.getFocusedOption().getValue().toLowerCase();
+        AServer server = serverManagementService.loadServer(event.getGuild());
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), FEATURE_PARAMETER)) {
+            return featureFlagManagementService.getFeatureFlagsOfServer(server)
+                .stream()
+                .filter(AFeatureFlag::isEnabled)
+                .map(aFeatureFlag -> aFeatureFlag.getFeature().getKey().toLowerCase())
+                .filter(featureName ->  featureName.toLowerCase().startsWith(input))
+                .toList();
+        } else if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), MODE_PARAMETER)) {
+            String featureName = slashCommandParameterService.getCommandOption(FEATURE_PARAMETER, event, String.class);
+            if(featureName.isBlank()) {
+                return new ArrayList<>();
+            }
+            FeatureDefinition featureDefinition = featureConfigService.getFeatureEnum(featureName);
+            AFeature feature = featureManagementService.getFeature(featureDefinition.getKey());
+            List<AFeatureMode> modes = featureModeManagementService.getFeatureModesOfFeatureInServer(server, feature);
+            return modes
+                .stream()
+                .map(mode -> mode.getFeatureMode().toLowerCase())
+                .filter(string -> string.startsWith(input))
+                .toList();
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
         Parameter featureName = Parameter
                 .builder()
                 .name(FEATURE_PARAMETER)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .templated(true)
                 .build();
 
@@ -74,6 +124,7 @@ public class DisableMode extends AbstractConditionableCommand {
                 .builder()
                 .name(MODE_PARAMETER)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .templated(true)
                 .build();
         List<Parameter> parameters = Arrays.asList(featureName, mode);

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/EnableFeature.java

@@ -14,6 +14,7 @@ import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.models.FeatureValidationResult;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.template.commands.FeatureSwitchModel;
@@ -24,6 +25,7 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -56,6 +58,9 @@ public class EnableFeature extends AbstractConditionableCommand {
     @Autowired
     private InteractionService interactionService;
 
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
     private static final String ENABLE_FEATURE_DEPENDENCIES_RESPONSE_TEMPLATE_KEY = "enableFeature_feature_dependencies_response";
     private static final String ENABLE_FEATURE_RESPONSE_TEMPLATE_KEY = "enableFeature_response";
     private static final String FEATURE_NAME_PARAMETER = "featureName";
@@ -114,12 +119,26 @@ public class EnableFeature extends AbstractConditionableCommand {
         return result;
     }
 
+    @Override
+    public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), FEATURE_NAME_PARAMETER)) {
+            String input = event.getFocusedOption().getValue().toLowerCase();
+            return featureConfigService.getAllFeatures()
+                .stream()
+                .map(String::toLowerCase)
+                .filter(lowerCase -> lowerCase.startsWith(input))
+                .toList();
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
         Parameter featureName = Parameter
                 .builder()
                 .name(FEATURE_NAME_PARAMETER)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .templated(true)
                 .build();
         List<Parameter> parameters = Arrays.asList(featureName);

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/EnableMode.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.core.commands.config.features;
 
+import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
 import dev.sheldan.abstracto.core.interaction.slash.CoreSlashCommandNames;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -13,11 +14,19 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
+import dev.sheldan.abstracto.core.models.database.AFeature;
+import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
+import dev.sheldan.abstracto.core.models.database.AFeatureMode;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;
+import dev.sheldan.abstracto.core.service.management.FeatureModeManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import java.util.ArrayList;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,6 +53,18 @@ public class EnableMode extends AbstractConditionableCommand {
     @Autowired
     private ServerManagementService serverManagementService;
 
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
+    @Autowired
+    private FeatureFlagManagementService featureFlagManagementService;
+
+    @Autowired
+    private FeatureModeManagementService featureModeManagementService;
+
+    @Autowired
+    private FeatureManagementService featureManagementService;
+
     private static final String ENABLE_MODE_RESPONSE_KEY = "enableMode_response";
     private static final String FEATURE_PARAMETER = "feature";
     private static final String MODE_PARAMETER = "mode";
@@ -61,16 +82,49 @@ public class EnableMode extends AbstractConditionableCommand {
                 .thenApply(interactionHook -> CommandResult.fromSuccess());
     }
 
+    @Override
+    public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        AServer server = serverManagementService.loadServer(event.getGuild());
+        String input = event.getFocusedOption().getValue().toLowerCase();
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), FEATURE_PARAMETER)) {
+            return featureFlagManagementService.getFeatureFlagsOfServer(server)
+                .stream()
+                .filter(AFeatureFlag::isEnabled)
+                .map(aFeatureFlag -> aFeatureFlag.getFeature().getKey().toLowerCase())
+                .filter(featureName ->  featureName.toLowerCase().startsWith(input))
+                .toList();
+        } else if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), MODE_PARAMETER)) {
+            String featureName = slashCommandParameterService.getCommandOption(FEATURE_PARAMETER, event, String.class);
+            if(featureName.isBlank()) {
+                return new ArrayList<>();
+            }
+            FeatureDefinition featureDefinition = featureConfigService.getFeatureEnum(featureName);
+            AFeature feature = featureManagementService.getFeature(featureDefinition.getKey());
+            List<AFeatureMode> modes = featureModeManagementService.getFeatureModesOfFeatureInServer(server, feature);
+            return modes
+                .stream()
+                .map(mode -> mode.getFeatureMode().toLowerCase())
+                .filter(string -> string.startsWith(input))
+                .toList();
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
         Parameter featureName = Parameter
                 .builder()
                 .name(FEATURE_PARAMETER)
                 .type(String.class)
-                .templated(true).build();
+                .supportsAutoComplete(true)
+                .templated(true)
+                .build();
+
         Parameter mode = Parameter
-                .builder().name(MODE_PARAMETER)
+                .builder()
+                .name(MODE_PARAMETER)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .templated(true)
                 .build();
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/FeatureModes.java

@@ -13,14 +13,19 @@ import dev.sheldan.abstracto.core.commands.config.ConfigModuleDefinition;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
 import dev.sheldan.abstracto.core.models.database.AFeature;
+import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.template.commands.FeatureModeDisplay;
 import dev.sheldan.abstracto.core.models.template.commands.FeatureModesModel;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import java.util.ArrayList;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -53,6 +58,12 @@ public class FeatureModes extends AbstractConditionableCommand {
     @Autowired
     private SlashCommandParameterService slashCommandParameterService;
 
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
+    @Autowired
+    private FeatureFlagManagementService featureFlagManagementService;
+
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         List<FeatureModeDisplay> featureModes;
@@ -73,12 +84,28 @@ public class FeatureModes extends AbstractConditionableCommand {
                 .thenApply(interactionHook -> CommandResult.fromSuccess());
     }
 
+    @Override
+    public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), FEATURE_PARAMETER)) {
+            String input = event.getFocusedOption().getValue().toLowerCase();
+            AServer server = serverManagementService.loadServer(event.getGuild());
+            return featureFlagManagementService.getFeatureFlagsOfServer(server)
+                .stream()
+                .filter(AFeatureFlag::isEnabled)
+                .map(aFeatureFlag -> aFeatureFlag.getFeature().getKey().toLowerCase())
+                .filter(featureName ->  featureName.toLowerCase().startsWith(input))
+                .toList();
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
         Parameter featureName = Parameter
                 .builder()
                 .name(FEATURE_PARAMETER)
                 .type(String.class)
+                .supportsAutoComplete(true)
                 .optional(true)
                 .templated(true)
                 .build();

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/slash/parameter/provider/provided/UserSlashCommandParameterProvider.java

@@ -16,7 +16,7 @@ public class UserSlashCommandParameterProvider implements SlashCommandParameterP
         return SlashCommandOptionTypeMapping
                 .builder()
                 .type(User.class)
-                .optionTypes(Arrays.asList(OptionType.USER, OptionType.STRING))
+                .optionTypes(Arrays.asList(OptionType.USER))
                 .strictTypes(List.of(OptionType.USER))
                 .build();
     }

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

@@ -13,6 +13,7 @@ public class ButtonConfig {
     private String id;
     private String url;
     private Boolean disabled;
+    private Integer uniqueId;
     private String emoteMarkdown;
     private ButtonStyleConfig buttonStyle;
     private String buttonPayload;

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

@@ -0,0 +1,20 @@
+package dev.sheldan.abstracto.core.templating.model.messagecomponents;
+
+
+import java.awt.Color;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Builder
+@Getter
+@Setter
+public class ContainerColor {
+    private Integer r;
+    private Integer g;
+    private Integer b;
+
+    public Color toColor() {
+        return new Color(r, g, b);
+    }
+}

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

@@ -8,6 +8,10 @@ import lombok.experimental.SuperBuilder;
 @Getter
 public class ContainerConfig implements ComponentConfig {
     private List<ComponentConfig> components;
+    private ContainerColor color;
+    private Integer uniqueId;
+    private Boolean spoiler;
+    private Boolean disabled;
     @Override
     public ComponentTypeConfig getType() {
         return ComponentTypeConfig.CONTAINER;

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

@@ -8,6 +8,7 @@ import lombok.experimental.SuperBuilder;
 @Getter
 public class MediaGalleryConfig implements ComponentConfig {
     private List<ImageConfig> images;
+    private Integer uniqueId;
     @Override
     public ComponentTypeConfig getType() {
         return ComponentTypeConfig.MEDIA_GALLERY;

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

@@ -9,5 +9,7 @@ import lombok.experimental.SuperBuilder;
 public class SectionConfig {
     protected SectionAccessoryConfig accessory;
     protected List<SectionComponentConfig> components;
+    private Boolean disabled;
+    private Integer uniqueId;
 
 }

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

@@ -8,6 +8,7 @@ import lombok.experimental.SuperBuilder;
 public class SeparatorConfig implements ComponentConfig {
     private Boolean divider;
     private Spacing spacing;
+    private Integer uniqueId;
     @Override
     public ComponentTypeConfig getType() {
         return ComponentTypeConfig.SEPARATOR;

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

@@ -351,7 +351,14 @@ public class TemplateServiceBean implements TemplateService {
                     }
                 }
                 if(accessory != null) {
-                    return Section.of(accessory, sectionComponents);
+                    Section section = Section.of(accessory, sectionComponents);
+                    if(sectionConfig.getDisabled() != null) {
+                        section = section.withDisabled(sectionConfig.getDisabled());
+                    }
+                    if(sectionConfig.getUniqueId() != null) {
+                        section = section.withUniqueId(sectionConfig.getUniqueId());
+                    }
+                    return section;
                 }
             }
         } else if(componentConfig instanceof TopLevelFileConfig fileConfig) {
@@ -380,11 +387,19 @@ public class TemplateServiceBean implements TemplateService {
                     }
                     galleryItems.add(item);
                 });
-                return MediaGallery.of(galleryItems);
+                MediaGallery gallery = MediaGallery.of(galleryItems);
+                if(mediaGalleryConfig.getUniqueId() != null) {
+                    gallery = gallery.withUniqueId(mediaGalleryConfig.getUniqueId());
+                }
+                return gallery;
             }
         } else if(componentConfig instanceof TopLevelSeperatorConfig seperatorConfig) {
-            return Separator.create(seperatorConfig.getDivider(),
+            Separator separator = Separator.create(seperatorConfig.getDivider(),
                 Spacing.toSpacing(seperatorConfig.getSpacing()));
+            if(seperatorConfig.getUniqueId() != null) {
+                separator = separator.withUniqueId(seperatorConfig.getUniqueId());
+            }
+            return separator;
         } else if(componentConfig instanceof TopLevelContainerConfig topLevelContainerConfig) {
             List<ContainerChildComponent> childComponents = new ArrayList<>();
             for (ComponentConfig containerComponent : topLevelContainerConfig.getComponents()) {
@@ -393,7 +408,20 @@ public class TemplateServiceBean implements TemplateService {
                     childComponents.add((ContainerChildComponent) createdComponent);
                 }
             }
-            return Container.of(childComponents);
+            Container container = Container.of(childComponents);
+            if(topLevelContainerConfig.getColor() != null) {
+                container = container.withAccentColor(topLevelContainerConfig.getColor().toColor());
+            }
+            if(topLevelContainerConfig.getUniqueId() != null) {
+                container = container.withUniqueId(topLevelContainerConfig.getUniqueId());
+            }
+            if(topLevelContainerConfig.getDisabled() != null) {
+                container = container.withDisabled(topLevelContainerConfig.getDisabled());
+            }
+            if(topLevelContainerConfig.getSpoiler() != null) {
+                container = container.withSpoiler(topLevelContainerConfig.getSpoiler());
+            }
+            return container;
         }
         return null;
     }
@@ -545,6 +573,9 @@ public class TemplateServiceBean implements TemplateService {
         if (buttonConfig.getDisabled() != null) {
             createdButton = createdButton.withDisabled(buttonConfig.getDisabled());
         }
+        if(buttonConfig.getUniqueId() != null) {
+            createdButton = createdButton.withUniqueId(buttonConfig.getUniqueId());
+        }
         return createdButton;
     }
 

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

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.core</groupId>
         <artifactId>core</artifactId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>dev.sheldan.abstracto.core</groupId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/metrics-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>dev.sheldan.abstracto.core</groupId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>1.6.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/core/pom.xml

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