[AB-xxx] adding initial support for components v2

fixing issue with buttons which only provide an emoji
adding logging in case updating a starboard post goes wrong

.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.6.16
+VERSION=1.6.8

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

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/command/CreateAssignableRolePlace.java

@@ -74,7 +74,7 @@ public class CreateAssignableRolePlace extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        List<ParameterValidator> rolePlaceNameValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT.intValue()));
+        List<ParameterValidator> rolePlaceNameValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT));
         Parameter rolePostName = Parameter
                 .builder()
                 .name(ASSIGNABLE_ROLE_PLACE_NAME_PARAMETER)
@@ -95,7 +95,7 @@ public class CreateAssignableRolePlace extends AbstractConditionableCommand {
                 .templated(true)
                 .optional(true)
                 .build();
-        List<ParameterValidator> rolePlaceDescriptionValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT.intValue()));
+        List<ParameterValidator> rolePlaceDescriptionValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT));
         Parameter text = Parameter
                 .builder()
                 .name(ASSIGNABLE_ROLE_PLACE_TEXT_PARAMETER)

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

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/command/LeaderBoardCommand.java

@@ -97,7 +97,7 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
         } else {
             leaderBoard = userExperienceService.findLeaderBoardData(server, page);
         }
-        List<CompletableFuture<?>> futures = new ArrayList<>();
+        List<CompletableFuture> futures = new ArrayList<>();
         CompletableFuture<List<LeaderBoardEntryModel>> completableFutures = converter.fromLeaderBoard(leaderBoard, actorUser.getGuild().getIdLong());
         futures.add(completableFutures);
         log.info("Rendering leaderboard for page {} in server {} for user {}.", page, actorUser.getId(), actorUser.getGuild().getId());
@@ -158,6 +158,7 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
         Parameter focusMe = Parameter
             .builder()
             .name(FOCUS_PARAMETER)
+            .validators(leaderBoardPageValidators)
             .optional(true)
             .slashCommandOnly(true)
             .templated(true)

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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.editMessageInAChannelFuture(messageToSend, messageChannel, giveaway.getMessageId())
+        return channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), 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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+            <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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,7 +11,6 @@ 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.*;
@@ -19,6 +18,7 @@ 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,7 +28,6 @@ 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;
@@ -50,7 +49,6 @@ 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
@@ -80,6 +78,9 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
     @Autowired
     private ReactionService reactionService;
 
+    @Autowired
+    private MessageService messageService;
+
     @Autowired
     private ComponentService componentServiceBean;
 
@@ -159,21 +160,15 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
             return CompletableFuture.completedFuture(null);
         }
         log.info("Cleaning up {} embedded embeddedMessages", embeddedMessages.size());
-        List<Pair<ServerChannelMessage, ServerChannelMessage>> embeddingMessages = embeddedMessages.stream()
+        List<ServerChannelMessage> reactionChannelMessages = embeddedMessages.stream()
-                .map(embeddedMessage -> Pair.of(ServerChannelMessage
+                .filter(embeddedMessage -> embeddedMessage.getDeletionComponentId() == null)
-                    .builder()
+                .map(this::convertEmbedMessageToServerChannelMessage)
-                    .serverId(embeddedMessage.getEmbeddingServer().getId())
+        .collect(Collectors.toList());
-                    .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)
@@ -184,26 +179,67 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());
-        List<CompletableFuture<Message>> editList = embeddingMessages.stream().map(messagePair -> {
+        List<CompletableFuture<Message>> reactionMessageFutures = messageService.retrieveMessages(reactionChannelMessages);
-            ServerChannelMessage embeddingMessage = messagePair.getLeft();
+        List<CompletableFuture<Message>> buttonMessageFutures = messageService.retrieveMessages(buttonChannelMessages);
-            ServerChannelMessage embeddedMessage = messagePair.getRight();
+        CompletableFutureList<Message> reactionFutureList = new CompletableFutureList<>(reactionMessageFutures);
-            MessageEmbedCleanupReplacementModel model = MessageEmbedCleanupReplacementModel
+        CompletableFutureList<Message> buttonFutureList = new CompletableFutureList<>(buttonMessageFutures);
-                .builder()
+        return reactionFutureList.getMainFuture()
-                .message(embeddedMessage)
+                .handle((unused, throwable) -> {
-                .build();
+                    if(throwable != null) {
-            MessageToSend messageToSend =
+                        log.warn("Embedded messages reaction message loading failed.", throwable);
-                templateService.renderEmbedTemplate(MESSAGE_EMBED_CLEANUP_REPLACEMENT_TEMPLATE, model, embeddingMessage.getServerId());
+                    }
-            return channelService.editMessageInAChannelFuture(messageToSend, embeddingMessage.getServerId(), embeddingMessage.getChannelId(),
+                    return self.removeReactions(reactionFutureList.getObjects());
-                embeddingMessage.getMessageId());
+                })
-        }).toList();
+                .thenCompose(Function.identity())
-        return FutureUtils.toSingleFutureGeneric(editList).whenComplete((unused, throwable) -> {
+                .thenCompose(unused -> buttonFutureList.getMainFuture())
-            if(throwable != null) {
+                .handle((unused, throwable) -> {
-                log.warn("Failed to cleanup embedded messages..", throwable);
+                    if(throwable != null) {
-            }
+                        log.warn("Embedded messages button message loading failed.", throwable);
-            self.deleteEmbeddedMessages(embeddedMessagesHandled, componentPayloadsToDelete);
+                    }
-        });
+                    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())
+                .channelId(embeddedMessage.getEmbeddingChannel().getId())
+                .messageId(embeddedMessage.getEmbeddingMessageId())
+                .build();
+    }
+
+    @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.17</version>
+        <version>1.6.9-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

@@ -1,11 +0,0 @@
-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/logging/logging-impl/src/main/java/dev/sheldan/abstracto/logging/listener/LeaveLogger.java

@@ -5,7 +5,6 @@ import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncLeaveListener;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.listener.MemberLeaveModel;
-import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
 import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
@@ -14,7 +13,6 @@ import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.logging.config.LoggingFeatureDefinition;
 import dev.sheldan.abstracto.logging.config.LoggingPostTarget;
 import dev.sheldan.abstracto.logging.model.template.MemberLeaveLogModel;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,17 +41,10 @@ public class LeaveLogger implements AsyncLeaveListener {
                 .userId(listenerModel.getUser().getIdLong())
                 .serverId(listenerModel.getServerId())
                 .build();
-        List<RoleDisplay> roles = listenerModel
-            .getMember()
-            .getRoles()
-            .stream()
-            .map(RoleDisplay::fromRole)
-            .toList();
         MemberLeaveLogModel model = MemberLeaveLogModel
                 .builder()
                 .leavingUser(leavingUser)
                 .user(UserDisplay.fromUser(listenerModel.getUser()))
-                .roles(roles)
                 .build();
         log.debug("Logging leave event for user {} in server {}.", listenerModel.getUser().getIdLong(), listenerModel.getServerId());
         MessageToSend messageToSend = templateService.renderEmbedTemplate(USER_LEAVE_TEMPLATE, model, listenerModel.getServerId());

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

abstracto-application/abstracto-modules/logging/logging-int/src/main/java/dev/sheldan/abstracto/logging/model/template/MemberLeaveLogModel.java

@@ -1,9 +1,7 @@
 package dev.sheldan.abstracto.logging.model.template;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
-import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
 import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
-import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,5 +12,4 @@ import lombok.Setter;
 public class MemberLeaveLogModel {
     private ServerUser leavingUser;
     private UserDisplay user;
-    private List<RoleDisplay> roles;
 }

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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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,6 +23,7 @@ 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;
 
@@ -75,15 +76,16 @@ public class Ban extends AbstractConditionableCommand {
             duration = null;
         }
 
-        Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
+        if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.USER)) {
-        if(member != null) {
+            Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
             return event.deferReply().submit()
                 .thenCompose((hook) -> self.banMember(event, member, reason, duration, hook))
                 .thenApply(commandResult -> CommandResult.fromSuccess());
         } else {
-            User user = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, User.class);
+            String userIdStr = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, String.class);
+            Long userId = Long.parseLong(userIdStr);
             return event.deferReply().submit()
-                .thenCompose((hook) -> self.banViaUserId(event, user.getIdLong(), reason, duration, hook))
+                .thenCompose((hook) -> self.banViaUserId(event, userId, 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,6 +33,7 @@ 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;
 
@@ -85,15 +86,16 @@ public class Infractions extends AbstractConditionableCommand {
     public CompletableFuture<CommandResult> showInfractions(InteractionHook hook, SlashCommandInteractionEvent event) {
         List<Infraction> infractions;
         Guild guild = hook.getInteraction().getGuild();
-        Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
+        if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.USER)) {
-        User user = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, User.class);
+            Member member = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, Member.class);
-        if(member != null) {
             if(!member.getGuild().equals(guild)) {
                 throw new EntityGuildMismatchException();
             }
             infractions = infractionManagementService.getInfractionsForUser(userInServerManagementService.loadOrCreateUser(member));
-        } else if(user != null){
+        } else if(slashCommandParameterService.hasCommandOptionWithFullType(USER_PARAMETER, event, OptionType.STRING)){
-            AUserInAServer userInServer = userInServerManagementService.loadOrCreateUser(guild.getIdLong(), user.getIdLong());
+            String userIdStr = slashCommandParameterService.getCommandOption(USER_PARAMETER, event, User.class, String.class);
+            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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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,9 +223,6 @@ 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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java

@@ -8,8 +8,6 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.models.property.SystemConfigProperty;
-import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
-import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import dev.sheldan.abstracto.core.service.*;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.DefaultConfigManagementService;
@@ -150,43 +148,22 @@ public class StarboardServiceBean implements StarboardService {
 
 
     private CompletableFuture<StarboardPostModel> buildStarboardPostModel(CachedMessage message, Integer starCount)  {
-        CompletableFuture<User> userFuture = userService.retrieveUserForId(message.getAuthor().getAuthorId());
+        return userService.retrieveUserForId(message.getAuthor().getAuthorId())
-        CompletableFuture<Member> memberFuture = memberService.retrieveMemberInServer(message.getAuthorAsServerUser());
+        .thenApply(user -> createStarboardModel(message, starCount, user))
-        CompletableFuture<StarboardPostModel> returnedFuture = new CompletableFuture<>();
-        FutureUtils.toSingleFuture(List.of(userFuture, memberFuture))
-        .whenComplete((any, error) -> {
-            User user = null;
-            if(!userFuture.isCompletedExceptionally()) {
-                user = userFuture.join();
-            } else {
-                log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId());
-            }
-            Member member = null;
-            if(!memberFuture.isCompletedExceptionally()) {
-                member = memberFuture.join();
-            } else {
-                log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId());
-            }
-            StarboardPostModel starboardModel = createStarboardModel(message, starCount, user, member);
-            returnedFuture.complete(starboardModel);
-        })
         .exceptionally(throwable -> {
-            log.warn("Complete failure when handling creation starboard post of message {}.", message.getMessageId(), throwable);
+            log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId(), throwable);
-            returnedFuture.completeExceptionally(throwable);
+            return createStarboardModel(message, starCount, null);
-            return null;
         });
-        return returnedFuture;
     }
 
-    private StarboardPostModel createStarboardModel(CachedMessage message, Integer starCount, net.dv8tion.jda.api.entities.User user, Member member) {
+    private StarboardPostModel createStarboardModel(CachedMessage message, Integer starCount, net.dv8tion.jda.api.entities.User user) {
         Optional<GuildMessageChannel> channel = channelService.getMessageChannelFromServerOptional(message.getServerId(), message.getChannelId());
         Optional<Guild> guild = guildService.getGuildByIdOptional(message.getServerId());
         String starLevelEmote = getAppropriateEmote(message.getServerId(), starCount);
         return StarboardPostModel
                 .builder()
                 .message(message)
-                .authorUser(user != null ? UserDisplay.fromUser(user) : null)
+                .author(user)
-                .authorMember(member != null ? MemberDisplay.fromMember(member) : null)
                 .sourceChannelId(message.getChannelId())
                 .channel(channel.orElse(null))
                 .starCount(starCount)
@@ -237,7 +214,7 @@ public class StarboardServiceBean implements StarboardService {
         int count = 3;
         List<CompletableFuture<StarStatsUser>> topStarGiverFutures = starboardPostReactorManagementService.retrieveTopStarGiver(serverId, count);
         List<CompletableFuture<StarStatsUser>> topStarReceiverFutures = starboardPostReactorManagementService.retrieveTopStarReceiver(serverId, count);
-        List<CompletableFuture<?>> allFutures = new ArrayList<>();
+        List<CompletableFuture> allFutures = new ArrayList<>();
         allFutures.addAll(topStarGiverFutures);
         allFutures.addAll(topStarReceiverFutures);
         return FutureUtils.toSingleFuture(allFutures).thenApply(aVoid -> {

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

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/model/template/StarboardPostModel.java

@@ -2,19 +2,17 @@ package dev.sheldan.abstracto.starboard.model.template;
 
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.context.ServerContext;
-import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
-import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 
 @Getter
 @Setter
 @SuperBuilder
 public class StarboardPostModel extends ServerContext {
-    private UserDisplay authorUser;
+    private User author;
-    private MemberDisplay authorMember;
     private GuildMessageChannel channel;
     private Long sourceChannelId;
     private CachedMessage message;

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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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,6 +11,7 @@ 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;
@@ -18,8 +19,10 @@ 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;
@@ -44,18 +47,34 @@ 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);
-        Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, Member.class);
+        if(slashCommandParameterService.hasCommandOptionWithFullType(MEMBER_PARAMETER_NAME, event, OptionType.USER)) {
-        User targetUser = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, User.class);
+            Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, Member.class);
-        if(targetMember != null) {
             stickyRoleService.setStickiness(targetMember, newState);
+            return interactionService.replyEmbed(RESPONSE_TEMPLATE, event)
+                    .thenApply(interactionHook -> CommandResult.fromSuccess());
         } else {
-            stickyRoleService.setStickiness(targetUser, event.getGuild(), newState);
+            String userIdStr = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER_NAME, event, User.class, String.class);
+            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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-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.17</version>
+        <version>1.6.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/wikipedia/service/WikipediaServiceBean.java

@@ -39,7 +39,7 @@ public class WikipediaServiceBean implements WikipediaService {
         Response response = okHttpClient.newCall(request).execute();
         if(!response.isSuccessful()) {
             if(log.isDebugEnabled()) {
-                log.debug("Failed to retrieve wikipedia summary. Response had code {} with body {}.",
+                log.error("Failed to retrieve wikipedia summary. Response had code {} with body {}.",
                         response.code(), response.body());
             }
             throw new WikipediaRequestException(response.code());

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

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java

@@ -182,8 +182,10 @@ public class CommandReceivedHandler extends ListenerAdapter {
     }
 
     public UnParsedCommandResult getUnparsedCommandResult(Message message) {
-        String commandName = getCommandName(message);
+        String contentStripped = message.getContentRaw();
-        UnParsedCommandParameter unParsedParameter = new UnParsedCommandParameter(message.getContentRaw(), message);
+        List<String> parameters = Arrays.asList(contentStripped.split(" "));
+        UnParsedCommandParameter unParsedParameter = new UnParsedCommandParameter(contentStripped, message);
+        String commandName = commandManager.getCommandName(parameters.get(0), message.getGuild().getIdLong());
         Command foundCommand = commandManager.findCommandByParameters(commandName, unParsedParameter, message.getGuild().getIdLong()).orElse(null);
         return UnParsedCommandResult
                 .builder()
@@ -192,9 +194,13 @@ public class CommandReceivedHandler extends ListenerAdapter {
                 .build();
     }
 
-    public String getCommandName(Message message) {
+    public CompletableFuture<CommandParseResult> getParametersFromMessage(Message message) {
-        List<String> parameters = Arrays.asList( message.getContentRaw().split(" "));
+        UnParsedCommandResult result = getUnparsedCommandResult(message);
-        return commandManager.getCommandName(parameters.get(0), message.getGuild().getIdLong());
+        return getParsedParameters(result.getParameter(), result.getCommand(), message).thenApply(foundParameters -> CommandParseResult
+                .builder()
+                .command(result.getCommand())
+                .parameters(foundParameters)
+                .build());
     }
 
     public CompletableFuture<CommandParseResult> getParametersFromMessage(Message message, UnParsedCommandResult result) {
@@ -426,7 +432,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
         Parameter param = parameters.get(0);
         CommandParameterIterators iterators = new CommandParameterIterators(channelIterator, emoteIterator, memberIterator, roleIterator);
         Set<CommandParameterHandler> usedParameterHandler = findNecessaryCommandParameterHandlers(parameters, unParsedCommandParameter);
-        List<CompletableFuture<?>> futures = new ArrayList<>();
+        List<CompletableFuture> futures = new ArrayList<>();
         // the actual parameters which were handled, might not coincide with the unparsed parameters
         // because we might ignore some parameters (for example referenced messages) in case the command does not use this as a parameter
         int parsedParameter = 0;
@@ -443,7 +449,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
                         .getDependentFeatures()
                         .stream()
                         .map(s -> featureConfigService.getFeatureEnum(s))
-                        .toList();
+                        .collect(Collectors.toList());
                 boolean parameterActiveForFeatures = false;
                 for (FeatureDefinition featureDefinition : featureDefinitions) {
                     if(featureFlagService.getFeatureFlagValue(featureDefinition, message.getGuild().getIdLong())) {
@@ -460,7 +466,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
                 try {
                     if (handler.handles(param.getType(), value)) {
                         if (handler.async()) {
-                            CompletableFuture<?> future = handler.handleAsync(value, iterators, param, message, command);
+                            CompletableFuture future = handler.handleAsync(value, iterators, param, message, command);
                             futures.add(future);
                             parsedParameters.add(ParseResult.builder().parameter(param).result(future).build());
                         } else {
@@ -488,11 +494,11 @@ public class CommandReceivedHandler extends ListenerAdapter {
             combinedFuture.thenAccept(aVoid -> {
                 List<Object> allParamResults = parsedParameters.stream().map(o -> {
                     if (o.getResult() instanceof CompletableFuture) {
-                        return ((CompletableFuture<?>) o.getResult()).join();
+                        return ((CompletableFuture) o.getResult()).join();
                     } else {
                         return o.getResult();
                     }
-                }).toList();
+                }).collect(Collectors.toList());
                 List<ParseResult> parseResults = new ArrayList<>();
                 for (int i = 0; i < allParamResults.size(); i++) {
                     if (allParamResults.get(i) != null) {

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

@@ -32,7 +32,7 @@ public class SetPrefix extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        List<ParameterValidator> validators = Arrays.asList(MaxStringLengthValidator.max(10));
+        List<ParameterValidator> validators = Arrays.asList(MaxStringLengthValidator.max(10L));
         Parameter newPrefixParameter = Parameter
                 .builder()
                 .name("prefix")

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

@@ -14,18 +14,14 @@ 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;
@@ -58,12 +54,6 @@ 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";
@@ -109,21 +99,6 @@ 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
@@ -131,7 +106,6 @@ 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,6 +1,5 @@
 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;
@@ -14,19 +13,11 @@ 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;
@@ -53,18 +44,6 @@ 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";
@@ -82,41 +61,12 @@ 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();
 
@@ -124,7 +74,6 @@ 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,7 +14,6 @@ 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;
@@ -25,7 +24,6 @@ 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;
@@ -58,9 +56,6 @@ 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";
@@ -119,26 +114,12 @@ 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,6 +1,5 @@
 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;
@@ -14,19 +13,11 @@ 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;
@@ -53,18 +44,6 @@ 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";
@@ -82,49 +61,16 @@ 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)
-                .supportsAutoComplete(true)
+                .templated(true).build();
-                .templated(true)
-                .build();
-
         Parameter mode = Parameter
-                .builder()
+                .builder().name(MODE_PARAMETER)
-                .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,19 +13,14 @@ 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;
@@ -58,12 +53,6 @@ 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;
@@ -84,28 +73,12 @@ 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/commands/utility/SetEmote.java

@@ -50,7 +50,7 @@ public class SetEmote extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        List<ParameterValidator> emoteKeyValidators = Arrays.asList(MaxStringLengthValidator.max(255));
+        List<ParameterValidator> emoteKeyValidators = Arrays.asList(MaxStringLengthValidator.max(255L));
         Parameter emoteKey = Parameter
                 .builder()
                 .name(EMOTE_KEY_PARAMETER)

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SlashCommandSuggestor.java

@@ -1,110 +0,0 @@
-package dev.sheldan.abstracto.core.commands.utility;
-
-import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.CommandAlternative;
-import dev.sheldan.abstracto.core.command.CommandReceivedHandler;
-import dev.sheldan.abstracto.core.command.config.features.CoreFeatureDefinition;
-import dev.sheldan.abstracto.core.command.config.features.CoreFeatureMode;
-import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
-import dev.sheldan.abstracto.core.command.service.CommandManager;
-import dev.sheldan.abstracto.core.config.FeatureMode;
-import dev.sheldan.abstracto.core.config.ListenerPriority;
-import dev.sheldan.abstracto.core.models.template.commands.SlashCommandSuggestionModel;
-import dev.sheldan.abstracto.core.service.ChannelService;
-import dev.sheldan.abstracto.core.service.FeatureFlagService;
-import dev.sheldan.abstracto.core.service.FeatureModeService;
-import dev.sheldan.abstracto.core.templating.model.MessageToSend;
-import dev.sheldan.abstracto.core.templating.service.TemplateService;
-import dev.sheldan.abstracto.core.utils.FutureUtils;
-import java.util.Optional;
-import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Message;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class SlashCommandSuggestor implements CommandAlternative {
-
-    @Autowired
-    private FeatureModeService featureModeService;
-
-    @Autowired
-    private CommandManager commandManager;
-
-    @Autowired
-    private CommandReceivedHandler commandReceivedHandler;
-
-    @Autowired
-    private FeatureFlagService featureFlagService;
-
-    @Autowired
-    private TemplateService templateService;
-
-    @Autowired
-    private ChannelService channelService;
-
-    public static final String SUGGESTION_TEMPLATE_KEY = "slash_command_suggestion";
-
-    @Override
-    public Integer getPriority() {
-        return ListenerPriority.MEDIUM;
-    }
-
-    @Override
-    public boolean shouldExecute(UnParsedCommandParameter parameter, Guild guild, Message message) {
-        boolean featureModeActive = featureModeService.featureModeActive(CoreFeatureDefinition.CORE_FEATURE, guild.getIdLong(), CoreFeatureMode.SUGGEST_SLASH_COMMANDS);
-        if(!featureModeActive) {
-            return false;
-        }
-        String commandName = commandReceivedHandler.getCommandName(message);
-        Long guildId = message.getGuildIdLong();
-        Optional<Command> potentialCommand = commandManager.getCommandByNameOptional(commandName, true, guildId);
-        return potentialCommand.isPresent() && potentialCommand.get().getConfiguration().isSlashCommandOnly();
-    }
-
-    @Override
-    public void execute(UnParsedCommandParameter parameter, Message message) {
-        String commandName = commandReceivedHandler.getCommandName(message);
-        Long guildId = message.getGuildIdLong();
-        Optional<Command> potentialCommand = commandManager.getCommandByNameOptional(commandName, true, guildId);
-        // limitation to not check conditions if command is executable, I dont want to completely built the entire command context, as that would require
-        // to parse the parameters, therefore the major checks should suffice
-        if(potentialCommand.isPresent()) {
-            Command command = potentialCommand.get();
-            if(command.getConfiguration().isSlashCommandOnly()) {
-                boolean featureAvailable = featureFlagService.getFeatureFlagValue(command.getFeature(), guildId);
-                if(featureAvailable) {
-                    boolean shouldNotifyUser = command.getFeatureModeLimitations().isEmpty();
-                    for (FeatureMode featureModeLimitation : command.getFeatureModeLimitations()) {
-                        if(featureModeService.featureModeActive(command.getFeature(), guildId, featureModeLimitation)) {
-                            shouldNotifyUser = true;
-                        }
-                    }
-                    if(shouldNotifyUser) {
-                        notifyUser(message, command, commandName, guildId);
-                    }
-                }
-            }
-        }
-    }
-
-    private void notifyUser(Message message, Command command, String commandName, Long guildId) {
-        String path = command.getConfiguration().getSlashCommandConfig().getSlashCommandPath();
-        SlashCommandSuggestionModel model = SlashCommandSuggestionModel
-            .builder()
-            .slashCommandPath(path)
-            .build();
-        Long userId = message.getAuthor().getIdLong();
-        log.info("Suggesting slash command for command {} to user {}.", commandName, userId);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(SUGGESTION_TEMPLATE_KEY, model, guildId);
-        FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, message.getChannel()))
-            .thenAccept(unused -> {
-                log.debug("Successfully suggested command.");
-            }).exceptionally(throwable -> {
-                log.warn("Failed to suggest slash command for command {} to user {}", commandName, userId);
-                return null;
-            });
-    }
-}

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

@@ -6,6 +6,7 @@ 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;
@@ -36,15 +37,15 @@ import java.util.List;
 @Configuration
 public class CoreConfig {
 
+    @Autowired
+    private BotService botService;
+
     @Autowired
     private OkHttpMetrics okHttpMetrics;
 
     @Autowired
     private OkHttpLogger okHttpLogger;
 
-    @Autowired
-    private OkHttpUserAgentSetter okHttpUserAgentSetter;
-
     @Autowired
     private List<CustomJsonSerializer> customJsonSerializers;
 
@@ -94,7 +95,6 @@ public class CoreConfig {
         return new OkHttpClient.Builder()
                 .addInterceptor(okHttpMetrics)
                 .addInterceptor(okHttpLogger)
-                .addInterceptor(okHttpUserAgentSetter)
                 .build();
     }