[maven-release-plugin] prepare release v1.5.8

removing custom cooldown handling from payday and slots commands

.github/workflows/release.yml

@@ -47,9 +47,10 @@ jobs:
         id: dotenv
         uses: falti/dotenv-action@v1.0.4
         with:
-          path: deployment/.env
+          path: ./deployment/installer/.env
       - name: Push container
         run: docker-compose build && docker-compose push
+        working-directory: ./deployment/installer/
         env:
           REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
           VERSION: ${{ steps.dotenv.outputs.version }}

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/command/CreateCustomCommand.java

@@ -0,0 +1,99 @@
+package dev.sheldan.abstracto.customcommand.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandFeatureDefinition;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandSlashCommandNames;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+@Slf4j
+public class CreateCustomCommand extends AbstractConditionableCommand {
+
+    private static final String CREATE_CUSTOM_COMMAND_COMMAND = "createCustomCommand";
+    private static final String CUSTOM_COMMAND_NAME_PARAMETER = "commandName";
+    private static final String CUSTOM_COMMAND_CONTENT_PARAMETER = "response";
+    private static final String CREATE_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY = "createCustomCommand_response";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private CustomCommandService customCommandService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        String name = slashCommandParameterService.getCommandOption(CUSTOM_COMMAND_NAME_PARAMETER, event, String.class);
+        String content = slashCommandParameterService.getCommandOption(CUSTOM_COMMAND_CONTENT_PARAMETER, event, String.class);
+
+        customCommandService.createCustomCommand(name, content, event.getMember());
+        return interactionService.replyEmbed(CREATE_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY, event)
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter commandNameParameter = Parameter
+                .builder()
+                .name(CUSTOM_COMMAND_NAME_PARAMETER)
+                .templated(true)
+                .type(String.class)
+                .build();
+
+        Parameter commandContentParameter = Parameter
+                .builder()
+                .name(CUSTOM_COMMAND_CONTENT_PARAMETER)
+                .templated(true)
+                .type(String.class)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(commandNameParameter, commandContentParameter);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(CustomCommandSlashCommandNames.CUSTOM_COMMAND)
+                .commandName("create")
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(CREATE_CUSTOM_COMMAND_COMMAND)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .slashCommandConfig(slashCommandConfig)
+                .causesReaction(true)
+                .supportsEmbedException(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/command/DeleteCustomCommand.java

@@ -0,0 +1,90 @@
+package dev.sheldan.abstracto.customcommand.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandFeatureDefinition;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandSlashCommandNames;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+@Slf4j
+public class DeleteCustomCommand extends AbstractConditionableCommand {
+
+    private static final String DELETE_CUSTOM_COMMAND_COMMAND = "deleteCustomCommand";
+    private static final String DELETE_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY = "deleteCustomCommand_response";
+    private static final String CUSTOM_COMMAND_NAME_PARAMETER = "commandName";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private CustomCommandService customCommandService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        String name = slashCommandParameterService.getCommandOption(CUSTOM_COMMAND_NAME_PARAMETER, event, String.class);
+
+        customCommandService.deleteCustomCommand(name, event.getGuild());
+        return interactionService.replyEmbed(DELETE_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY, event)
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter commandNameParameter = Parameter
+                .builder()
+                .name(CUSTOM_COMMAND_NAME_PARAMETER)
+                .templated(true)
+                .type(String.class)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(commandNameParameter);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(CustomCommandSlashCommandNames.CUSTOM_COMMAND)
+                .commandName("delete")
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(DELETE_CUSTOM_COMMAND_COMMAND)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .slashCommandConfig(slashCommandConfig)
+                .causesReaction(true)
+                .supportsEmbedException(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/command/GetCustomCommand.java

@@ -0,0 +1,94 @@
+package dev.sheldan.abstracto.customcommand.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandFeatureDefinition;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandSlashCommandNames;
+import dev.sheldan.abstracto.customcommand.model.command.CustomCommandResponseModel;
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandService;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class GetCustomCommand extends AbstractConditionableCommand {
+
+    private static final String GET_CUSTOM_COMMAND_COMMAND = "getCustomCommand";
+    private static final String CUSTOM_COMMAND_NAME_PARAMETER = "commandName";
+    private static final String GET_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY = "getCustomCommand_response";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Autowired
+    private CustomCommandService customCommandService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        String name = slashCommandParameterService.getCommandOption(CUSTOM_COMMAND_NAME_PARAMETER, event, String.class);
+        CustomCommand customCommand = customCommandService.getCustomCommand(name, event.getGuild());
+        CustomCommandResponseModel model = CustomCommandResponseModel
+                .builder()
+                .additionalText(customCommand.getAdditionalMessage())
+                .build();
+        return interactionService.replyEmbed(GET_CUSTOM_COMMAND_RESPONSE_TEMPLATE_KEY, model, event)
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter commandNameParameter = Parameter
+                .builder()
+                .name(CUSTOM_COMMAND_NAME_PARAMETER)
+                .templated(true)
+                .type(String.class)
+                .build();
+
+
+        List<Parameter> parameters = Arrays.asList(commandNameParameter);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(CustomCommandSlashCommandNames.CUSTOM_COMMAND_PUBLIC)
+                .commandName("get")
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(GET_CUSTOM_COMMAND_COMMAND)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .slashCommandConfig(slashCommandConfig)
+                .causesReaction(true)
+                .supportsEmbedException(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/command/ListCustomCommands.java

@@ -0,0 +1,85 @@
+package dev.sheldan.abstracto.customcommand.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.service.PaginatorService;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandFeatureDefinition;
+import dev.sheldan.abstracto.customcommand.config.CustomCommandSlashCommandNames;
+import dev.sheldan.abstracto.customcommand.model.command.ListCustomCommandsResponseModel;
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+@Slf4j
+public class ListCustomCommands extends AbstractConditionableCommand {
+
+    private static final String CREATE_CUSTOM_COMMAND_COMMAND = "listCustomCommands";
+    private static final String LIST_CUSTOM_COMMANDS_TEMPLATE_KEY = "listCustomCommands_response";
+    private static final String NO_CUSTOM_COMMANDS_TEMPLATE_KEY = "listCustomCommands_no_commands_response";
+
+    @Autowired
+    private CustomCommandService customCommandService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Autowired
+    private PaginatorService paginatorService;
+
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        List<CustomCommand> customCommands = customCommandService.getCustomCommands(event.getGuild());
+        if(customCommands.isEmpty()) {
+            return interactionService.replyEmbed(NO_CUSTOM_COMMANDS_TEMPLATE_KEY, event)
+                    .thenApply(interactionHook -> CommandResult.fromSuccess());
+        }
+        ListCustomCommandsResponseModel model = ListCustomCommandsResponseModel.fromCommands(customCommands);
+        return paginatorService.createPaginatorFromTemplate(LIST_CUSTOM_COMMANDS_TEMPLATE_KEY, model, event)
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(CustomCommandSlashCommandNames.CUSTOM_COMMAND_PUBLIC)
+                .commandName("list")
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(CREATE_CUSTOM_COMMAND_COMMAND)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .slashCommandConfig(slashCommandConfig)
+                .causesReaction(true)
+                .supportsEmbedException(true)
+                .help(helpInfo)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/repository/CustomCommandRepository.java

@@ -5,9 +5,12 @@ import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface CustomCommandRepository extends JpaRepository<CustomCommand, Long> {
     Optional<CustomCommand> getByNameIgnoreCaseAndServer(String name, AServer server);
+    void deleteByNameAndServer(String name, AServer server);
+    List<CustomCommand> findByServer(AServer server);
 }

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/service/CustomCommandServiceBean.java

@@ -0,0 +1,60 @@
+package dev.sheldan.abstracto.customcommand.service;
+
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+import dev.sheldan.abstracto.customcommand.exception.CustomCommandExistsException;
+import dev.sheldan.abstracto.customcommand.exception.CustomCommandNotFoundException;
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandManagementService;
+import dev.sheldan.abstracto.customcommand.service.management.CustomCommandService;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCommandServiceBean implements CustomCommandService {
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private CustomCommandManagementService customCommandManagementService;
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Override
+    public CustomCommand createCustomCommand(String name, String content, Member creator) {
+        if(customCommandManagementService.getCustomCommandByName(name, creator.getGuild().getIdLong()).isPresent()) {
+            throw new CustomCommandExistsException();
+        }
+        AUserInAServer creatorUser = userInServerManagementService.loadOrCreateUser(creator);
+        return customCommandManagementService.createCustomCommand(name, content, creatorUser);
+    }
+
+    @Override
+    public void deleteCustomCommand(String name, Guild guild) {
+        if(customCommandManagementService.getCustomCommandByName(name, guild.getIdLong()).isEmpty()) {
+            throw new CustomCommandNotFoundException();
+        }
+        AServer server = serverManagementService.loadServer(guild);
+        customCommandManagementService.deleteCustomCommand(name, server);
+    }
+
+    @Override
+    public List<CustomCommand> getCustomCommands(Guild guild) {
+        AServer server = serverManagementService.loadServer(guild);
+        return customCommandManagementService.getCustomCommands(server);
+    }
+
+    @Override
+    public CustomCommand getCustomCommand(String name, Guild guild) {
+        return customCommandManagementService.getCustomCommandByName(name, guild.getIdLong())
+                .orElseThrow(CustomCommandNotFoundException::new);
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/java/dev/sheldan/abstracto/customcommand/service/management/CustomCommandManagementServiceBean.java

@@ -1,12 +1,14 @@
 package dev.sheldan.abstracto.customcommand.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
 import dev.sheldan.abstracto.customcommand.repository.CustomCommandRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Optional;
 
 @Component
@@ -23,4 +25,27 @@ public class CustomCommandManagementServiceBean implements CustomCommandManageme
         AServer server = serverManagementService.loadServer(serverId);
         return repository.getByNameIgnoreCaseAndServer(name, server);
     }
+
+    @Override
+    public CustomCommand createCustomCommand(String name, String content, AUserInAServer creator) {
+        CustomCommand customCommand = CustomCommand
+                .builder()
+                .name(name)
+                .additionalMessage(content)
+                .server(creator.getServerReference())
+                .creator(creator)
+                .build();
+        return repository.save(customCommand);
+    }
+
+    @Override
+    public void deleteCustomCommand(String name, AServer server) {
+        repository.deleteByNameAndServer(name, server);
+    }
+
+    @Override
+    public List<CustomCommand> getCustomCommands(AServer server) {
+        return repository.findByServer(server);
+    }
+
 }

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/1.5.8/collection.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="seedData/data.xml" relativeToChangelogFile="true"/>
+    <include file="tables/tables.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/1.5.8/seedData/command.xml

@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
+    <property name="customCommandFeature" value="(SELECT id FROM feature WHERE key = 'customCommand')"/>
+
+    <changeSet  author="Sheldan"  id="customCommand-commands">
+        <insert tableName="command">
+            <column name="name" value="createCustomCommand"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${customCommandFeature}"/>
+        </insert>
+        <insert tableName="command">
+            <column name="name" value="deleteCustomCommand"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${customCommandFeature}"/>
+        </insert>
+        <insert tableName="command">
+            <column name="name" value="getCustomCommand"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${customCommandFeature}"/>
+        </insert>
+        <insert tableName="command">
+            <column name="name" value="listCustomCommands"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${customCommandFeature}"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/1.5.8/seedData/data.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="command.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/1.5.8/tables/custom_command.xml

@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <changeSet author="Sheldan" id="custom_command-add_auto_increment">
+        <sql>
+            create sequence custom_command_id_seq;
+            alter table custom_command alter id set default nextval('custom_command_id_seq');
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/1.5.8/tables/tables.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="custom_command.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/custom-command/custom-command-impl/src/main/resources/migrations/custom-command-changeLog.xml

@@ -7,4 +7,5 @@
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
     <include file="1.4.0/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.8/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/config/CustomCommandSlashCommandNames.java

@@ -0,0 +1,6 @@
+package dev.sheldan.abstracto.customcommand.config;
+
+public class CustomCommandSlashCommandNames {
+    public static final String CUSTOM_COMMAND = "cc";
+    public static final String CUSTOM_COMMAND_PUBLIC = "customCommands";
+}

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/exception/CustomCommandExistsException.java

@@ -0,0 +1,15 @@
+package dev.sheldan.abstracto.customcommand.exception;
+
+import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
+
+public class CustomCommandExistsException extends AbstractoTemplatableException {
+    @Override
+    public String getTemplateName() {
+        return "custom_command_exists_exception";
+    }
+
+    @Override
+    public Object getTemplateModel() {
+        return new Object();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/exception/CustomCommandNotFoundException.java

@@ -0,0 +1,15 @@
+package dev.sheldan.abstracto.customcommand.exception;
+
+import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
+
+public class CustomCommandNotFoundException extends AbstractoTemplatableException {
+    @Override
+    public String getTemplateName() {
+        return "custom_command_not_found_exception";
+    }
+
+    @Override
+    public Object getTemplateModel() {
+        return new Object();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/model/command/ListCustomCommandModel.java

@@ -0,0 +1,23 @@
+package dev.sheldan.abstracto.customcommand.model.command;
+
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class ListCustomCommandModel {
+    private String name;
+    private String content;
+    private MemberDisplay creator;
+
+    public static ListCustomCommandModel fromCustomCommand(CustomCommand customCommand) {
+        return ListCustomCommandModel
+                .builder()
+                .name(customCommand.getName())
+                .content(customCommand.getAdditionalMessage())
+                .creator(MemberDisplay.fromAUserInAServer(customCommand.getCreator()))
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/model/command/ListCustomCommandsResponseModel.java

@@ -0,0 +1,24 @@
+package dev.sheldan.abstracto.customcommand.model.command;
+
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Builder
+@Getter
+public class ListCustomCommandsResponseModel {
+    private List<ListCustomCommandModel> customCommands;
+
+    public static ListCustomCommandsResponseModel fromCommands(List<CustomCommand> customCommands) {
+        return ListCustomCommandsResponseModel
+                .builder()
+                .customCommands(customCommands
+                        .stream()
+                        .map(ListCustomCommandModel::fromCustomCommand)
+                        .collect(Collectors.toList()))
+                .build();
+    }
+}

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/service/management/CustomCommandManagementService.java

@@ -1,9 +1,15 @@
 package dev.sheldan.abstracto.customcommand.service.management;
 
+import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface CustomCommandManagementService {
     Optional<CustomCommand> getCustomCommandByName(String name, Long serverId);
+    CustomCommand createCustomCommand(String name, String content, AUserInAServer creator);
+    void deleteCustomCommand(String name, AServer server);
+    List<CustomCommand> getCustomCommands(AServer server);
 }

abstracto-application/abstracto-modules/custom-command/custom-command-int/src/main/java/dev/sheldan/abstracto/customcommand/service/management/CustomCommandService.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.customcommand.service.management;
+
+import dev.sheldan.abstracto.customcommand.model.database.CustomCommand;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+
+import java.util.List;
+
+public interface CustomCommandService {
+    CustomCommand createCustomCommand(String name, String content, Member creator);
+    void deleteCustomCommand(String name, Guild guild);
+    List<CustomCommand> getCustomCommands(Guild guild);
+    CustomCommand getCustomCommand(String name, Guild guild);
+}

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/service/EconomyServiceBean.java

@@ -9,8 +9,6 @@ import dev.sheldan.abstracto.entertainment.dto.CreditGambleResult;
 import dev.sheldan.abstracto.entertainment.dto.PayDayResult;
 import dev.sheldan.abstracto.entertainment.dto.SlotsResult;
 import dev.sheldan.abstracto.entertainment.exception.NotEnoughCreditsException;
-import dev.sheldan.abstracto.entertainment.exception.PayDayCooldownException;
-import dev.sheldan.abstracto.entertainment.exception.SlotsCooldownException;
 import dev.sheldan.abstracto.entertainment.model.command.CreditsLeaderboardEntry;
 import dev.sheldan.abstracto.entertainment.model.database.EconomyLeaderboardResult;
 import dev.sheldan.abstracto.entertainment.model.database.EconomyUser;
@@ -19,14 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.security.SecureRandom;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 
-import static dev.sheldan.abstracto.entertainment.config.EconomyFeatureConfig.PAYDAY_COOLDOWN_CONFIG_KEY;
-import static dev.sheldan.abstracto.entertainment.config.EconomyFeatureConfig.SLOTS_COOLDOWN_CONFIG_KEY;
-
 @Component
 public class EconomyServiceBean implements EconomyService {
 
@@ -70,42 +62,6 @@ public class EconomyServiceBean implements EconomyService {
     private static final Integer TRIPLE_FACTOR = 10;
     private static final Integer DOUBLE_FACTOR = 2;
 
-    @Override
-    public boolean canTriggerPayDay(AUserInAServer aUserInAServer) {
-        Optional<EconomyUser> userOptional = economyUserManagementService.getUser(aUserInAServer);
-        return userOptional.map(this::canTriggerPayDay).orElse(true);
-    }
-
-    @Override
-    public boolean canTriggerSlots(AUserInAServer aUserInAServer) {
-        Optional<EconomyUser> userOptional = economyUserManagementService.getUser(aUserInAServer);
-        return userOptional.map(this::canTriggerSlots).orElse(true);
-    }
-
-    @Override
-    public boolean canTriggerPayDay(EconomyUser economyUser) {
-        return slotsTriggerIn(economyUser).isNegative();
-    }
-
-    @Override
-    public boolean canTriggerSlots(EconomyUser economyUser) {
-        return payDayTriggerIn(economyUser).isNegative();
-    }
-
-    @Override
-    public Duration payDayTriggerIn(EconomyUser economyUser) {
-        Long cooldownSeconds = configService.getLongValueOrConfigDefault(PAYDAY_COOLDOWN_CONFIG_KEY, economyUser.getServer().getId());
-        Instant minTimeStamp = Instant.now().minus(cooldownSeconds, ChronoUnit.SECONDS);
-        return Duration.between(economyUser.getLastPayDay(), minTimeStamp);
-    }
-
-    @Override
-    public Duration slotsTriggerIn(EconomyUser economyUser) {
-        Long cooldownSeconds = configService.getLongValueOrConfigDefault(SLOTS_COOLDOWN_CONFIG_KEY, economyUser.getServer().getId());
-        Instant minTimeStamp = Instant.now().minus(cooldownSeconds, ChronoUnit.SECONDS);
-        return Duration.between(economyUser.getLastSlots(), minTimeStamp);
-    }
-
     @Override
     public EconomyUser addCredits(AUserInAServer aUserInAServer, Long credits) {
         Optional<EconomyUser> existingUserOptional = economyUserManagementService.getUser(aUserInAServer);
@@ -137,11 +93,6 @@ public class EconomyServiceBean implements EconomyService {
         Long creditsToAdd = configService.getLongValueOrConfigDefault(EconomyFeatureConfig.PAYDAY_CREDITS_CONFIG_KEY,
                 aUserInAServer.getServerReference().getId());
         EconomyUser economyUser = addCredits(aUserInAServer, creditsToAdd);
-        Duration durationForPayday = payDayTriggerIn(economyUser);
-        if (durationForPayday.isNegative()) {
-            throw new PayDayCooldownException(durationForPayday.abs());
-        }
-        economyUser.setLastPayDay(Instant.now());
         return PayDayResult
                 .builder()
                 .currentCredits(economyUser.getCredits())
@@ -160,17 +111,12 @@ public class EconomyServiceBean implements EconomyService {
         if(user.getCredits() < bid) {
             throw new NotEnoughCreditsException();
         }
-        Duration durationForSlots = slotsTriggerIn(user);
-        if (durationForSlots.isNegative()) {
-            throw new SlotsCooldownException(durationForSlots.abs());
-        }
         SlotGame slotGame = playSlots();
         Integer factor = slotGame.getResultFactor();
         Long creditChange = bid * factor;
         addCredits(user, -bid);
         addCredits(user, creditChange);
 
-        user.setLastSlots(Instant.now());
         return SlotsResult
                 .builder()
                 .bid(bid)

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/service/management/EconomyUserManagementServiceBean.java

@@ -27,8 +27,6 @@ public class EconomyUserManagementServiceBean implements EconomyUserManagementSe
                 .builder()
                 .id(aUserInAServer.getUserInServerId())
                 .server(aUserInAServer.getServerReference())
-                .lastPayDay(Instant.now().minus(1, ChronoUnit.DAYS))
-                .lastSlots(Instant.now().minus(1, ChronoUnit.DAYS))
                 .credits(0L)
                 .user(aUserInAServer)
                 .build();

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/entertainment-config.properties

@@ -10,13 +10,6 @@ abstracto.featureFlags.entertainment.enabled=false
 abstracto.systemConfigs.paydayCredits.name=paydayCredits
 abstracto.systemConfigs.paydayCredits.longValue=120
 
-# maybe replace this by command cooldowns which are globally on the server, instead of only channel group based
-abstracto.systemConfigs.paydayCooldown.name=paydayCooldown
-abstracto.systemConfigs.paydayCooldown.longValue=300
-
-abstracto.systemConfigs.slotsCooldown.name=slotsCooldown
-abstracto.systemConfigs.slotsCooldown.longValue=30
-
 abstracto.featureFlags.economy.featureName=economy
 abstracto.featureFlags.economy.enabled=false
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/migrations/1.5.8/cleanup/deletions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="system_config.xml" relativeToChangelogFile="true"/>
+    <include file="economy_user.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/migrations/1.5.8/cleanup/economy_user.xml

@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <changeSet author="Sheldan" id="economy_user-delete-cooldown-columns">
+        <dropColumn tableName="economy_user">
+            <column name="last_pay_day" />
+            <column name="last_slots" />
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/migrations/1.5.8/cleanup/system_config.xml

@@ -0,0 +1,19 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+
+    <changeSet author="Sheldan" id="economy_cooldown-system-config-deletions">
+        <delete tableName="system_config">
+            <where>name='paydayCooldown'</where>
+        </delete>
+        <delete tableName="system_config">
+            <where>name='slotsCooldown'</where>
+        </delete>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/migrations/1.5.8/collection.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="cleanup/deletions.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/resources/migrations/entertainment-changeLog.xml

@@ -12,4 +12,5 @@
     <include file="1.4.0/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.3/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.11/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.8/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/config/EconomyFeatureConfig.java

@@ -11,8 +11,6 @@ import java.util.List;
 public class EconomyFeatureConfig implements FeatureConfig {
 
     public static final String PAYDAY_CREDITS_CONFIG_KEY = "paydayCredits";
-    public static final String PAYDAY_COOLDOWN_CONFIG_KEY = "paydayCooldown";
-    public static final String SLOTS_COOLDOWN_CONFIG_KEY = "slotsCooldown";
 
     @Override
     public FeatureDefinition getFeature() {
@@ -21,6 +19,6 @@ public class EconomyFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(PAYDAY_CREDITS_CONFIG_KEY, PAYDAY_COOLDOWN_CONFIG_KEY, SLOTS_COOLDOWN_CONFIG_KEY);
+        return Arrays.asList(PAYDAY_CREDITS_CONFIG_KEY);
     }
 }

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/exception/PayDayCooldownException.java

@@ -1,28 +0,0 @@
-package dev.sheldan.abstracto.entertainment.exception;
-
-import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
-import dev.sheldan.abstracto.entertainment.model.exception.PayDayCooldownExceptionModel;
-
-import java.time.Duration;
-
-public class PayDayCooldownException extends AbstractoTemplatableException {
-
-    private final PayDayCooldownExceptionModel model;
-
-    public PayDayCooldownException(Duration duration) {
-        this.model = PayDayCooldownExceptionModel
-                .builder()
-                .tryAgainDuration(duration)
-                .build();
-    }
-
-    @Override
-    public String getTemplateName() {
-        return "payday_cooldown_exception";
-    }
-
-    @Override
-    public Object getTemplateModel() {
-        return model;
-    }
-}

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/exception/SlotsCooldownException.java

@@ -1,28 +0,0 @@
-package dev.sheldan.abstracto.entertainment.exception;
-
-import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
-import dev.sheldan.abstracto.entertainment.model.exception.SlotsCooldownExceptionModel;
-
-import java.time.Duration;
-
-public class SlotsCooldownException extends AbstractoTemplatableException {
-
-    private final SlotsCooldownExceptionModel model;
-
-    public SlotsCooldownException(Duration duration) {
-        this.model = SlotsCooldownExceptionModel
-                .builder()
-                .tryAgainDuration(duration)
-                .build();
-    }
-
-    @Override
-    public String getTemplateName() {
-        return "slots_cooldown_exception";
-    }
-
-    @Override
-    public Object getTemplateModel() {
-        return model;
-    }
-}

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/database/EconomyUser.java

@@ -33,12 +33,6 @@ public class EconomyUser implements Serializable {
     @Column(name = "credits", nullable = false)
     private Long credits;
 
-    @Column(name = "last_slots", nullable = false)
-    private Instant lastSlots;
-
-    @Column(name = "last_pay_day", nullable = false)
-    private Instant lastPayDay;
-
     @Column(name = "created", nullable = false, insertable = false, updatable = false)
     private Instant created;
 

abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/service/EconomyService.java

@@ -10,16 +10,9 @@ import dev.sheldan.abstracto.entertainment.model.database.EconomyUser;
 import lombok.Builder;
 import lombok.Getter;
 
-import java.time.Duration;
 import java.util.List;
 
 public interface EconomyService {
-    boolean canTriggerPayDay(AUserInAServer aUserInAServer);
-    boolean canTriggerSlots(AUserInAServer aUserInAServer);
-    boolean canTriggerPayDay(EconomyUser economyUser);
-    boolean canTriggerSlots(EconomyUser economyUser);
-    Duration payDayTriggerIn(EconomyUser economyUser);
-    Duration slotsTriggerIn(EconomyUser economyUser);
     EconomyUser addCredits(AUserInAServer aUserInAServer, Long credits);
     void addCredits(EconomyUser economyUser, Long credits);
     void addPayDayCredits(AUserInAServer aUserInAServer);

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java

@@ -371,21 +371,30 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
                 userExperienceManagementService.saveUser(aUserExperience);
             }
             if(!Objects.equals(result.getOldRoleId(), result.getNewRoleId())) {
-                if(result.getOldRoleId() != null) {
-                    roleService.removeRoleFromMemberAsync(member, result.getOldRoleId()).thenAccept(unused -> {
-                        log.debug("Removed role {} to member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong());
+                if(result.getOldRoleId() != null && result.getNewRoleId() != null) {
+                    roleService.updateRolesIds(member, Arrays.asList(result.getOldRoleId()), Arrays.asList(result.getNewRoleId())).thenAccept(unused -> {
+                        log.debug("Removed role {} from and added role {} to member {} in server {}.", result.getOldRoleId(), result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong());
                     }).exceptionally(throwable -> {
-                        log.warn("Failed to remove role {} from {} member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable);
-                        return null;
-                    });
-                }
-                if(result.getNewRoleId() != null) {
-                    roleService.addRoleToMemberAsync(member, result.getNewRoleId()).thenAccept(unused -> {
-                        log.debug("Added role {} to member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong());
-                    }).exceptionally(throwable -> {
-                        log.warn("Failed to add role {} to {} member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable);
+                        log.warn("Failed to remove role {} from and add role {} to  member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable);
                         return null;
                     });
+                } else {
+                    if(result.getOldRoleId() != null) {
+                        roleService.removeRoleFromMemberAsync(member, result.getOldRoleId()).thenAccept(unused -> {
+                            log.debug("Removed role {} from member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong());
+                        }).exceptionally(throwable -> {
+                            log.warn("Failed to remove role {} from {} member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable);
+                            return null;
+                        });
+                    }
+                    if(result.getNewRoleId() != null) {
+                        roleService.addRoleToMemberAsync(member, result.getNewRoleId()).thenAccept(unused -> {
+                            log.debug("Added role {} to member {} in server {}.", result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong());
+                        }).exceptionally(throwable -> {
+                            log.warn("Failed to add role {} to {} member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable);
+                            return null;
+                        });
+                    }
                 }
             }
         } else {

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/ShowPoll.java

@@ -0,0 +1,95 @@
+package dev.sheldan.abstracto.suggestion.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.ParameterValidator;
+import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValidator;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
+import dev.sheldan.abstracto.suggestion.config.SuggestionFeatureDefinition;
+import dev.sheldan.abstracto.suggestion.config.SuggestionSlashCommandNames;
+import dev.sheldan.abstracto.suggestion.model.template.PollInfoModel;
+import dev.sheldan.abstracto.suggestion.service.PollService;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class ShowPoll extends AbstractConditionableCommand {
+
+    private static final String COMMAND_NAME = "show";
+    private static final String SHOW_POLL_COMMAND_NAME = "showPoll";
+    private static final String POLL_ID_PARAMETER = "pollId";
+    private static final String SHOW_POLL_TEMPLATE_KEY = "showPoll_response";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private PollService pollService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        Long suggestionId = slashCommandParameterService.getCommandOption(POLL_ID_PARAMETER, event, Long.class, Integer.class).longValue();
+        PollInfoModel pollInfoModel = pollService.getPollInfoModel(suggestionId, event.getGuild().getIdLong());
+        return interactionService.replyEmbed(SHOW_POLL_TEMPLATE_KEY, pollInfoModel, event)
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        List<ParameterValidator> polldIdValidator = Arrays.asList(MinIntegerValueValidator.min(1L));
+        Parameter pollIdParameter = Parameter
+                .builder()
+                .name(POLL_ID_PARAMETER)
+                .validators(polldIdValidator)
+                .type(Long.class)
+                .templated(true)
+                .build();
+
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .hasExample(false)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(pollIdParameter);
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(SuggestionSlashCommandNames.POLL)
+                .commandName(COMMAND_NAME)
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(SHOW_POLL_COMMAND_NAME)
+                .slashCommandConfig(slashCommandConfig)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .supportsEmbedException(true)
+                .causesReaction(false)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return SuggestionFeatureDefinition.POLL;
+    }
+}

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/PollServiceBean.java

@@ -335,7 +335,8 @@ public class PollServiceBean implements PollService {
     public CompletableFuture<Void> addOptionToServerPoll(Long pollId, Long serverId, Member adder, String label, String description) {
         Poll poll = pollManagementService.getPollByPollId(pollId, serverId, PollType.STANDARD);
         log.info("Adding option to server poll {} in server {}.", pollId, serverId);
-        pollOptionManagementService.addOptionToPoll(poll, label, description);
+        AUserInAServer adderUser = userInServerManagementService.loadOrCreateUser(adder);
+        pollOptionManagementService.addOptionToPoll(poll, label, description, adderUser);
         List<PollMessageOption> options = getOptionsOfPoll(poll);
         ServerPollMessageModel model = ServerPollMessageModel.fromPoll(poll, options);
         MessageToSend messageToSend = templateService.renderEmbedTemplate(SERVER_POLL_TEMPLATE_KEY, model);
@@ -487,6 +488,37 @@ public class PollServiceBean implements PollService {
         return messageService.deleteMessageInChannelInServer(serverId, poll.getChannel().getId(), poll.getMessageId());
     }
 
+    @Override
+    public PollInfoModel getPollInfoModel(Long pollId, Long serverId) {
+        Poll poll = pollManagementService.getPollByPollId(pollId, serverId, PollType.STANDARD);
+        Integer totalVotes = getTotalVotesOfPoll(poll);
+        List<PollOptionInfoModel> optionInfoModels = poll.getOptions().stream().map(pollOption -> {
+            Long voteCount = getVotesOfOption(poll, pollOption);
+            return PollOptionInfoModel
+                    .builder()
+                    .value(pollOption.getValue())
+                    .description(pollOption.getDescription())
+                    .label(pollOption.getLabel())
+                    .votes(voteCount)
+                    .percentage(totalVotes > 0 ? (voteCount / (float) totalVotes) * 100 : 0)
+                    .adder(pollOption.getAdder() != null ? MemberDisplay.fromAUserInAServer(pollOption.getAdder()) : null)
+                    .build();
+        }).toList();
+        return PollInfoModel
+                .builder()
+                .id(poll.getPollId())
+                .description(poll.getDescription())
+                .creationDate(poll.getCreated())
+                .targetDate(poll.getTargetDate())
+                .totalVotes(totalVotes)
+                .allowAdditions(poll.getAllowAddition())
+                .allowMultiple(poll.getAllowMultiple())
+                .options(optionInfoModels)
+                .showDecisions(poll.getShowDecisions())
+                .pollDuration(Duration.between(poll.getCreated(), poll.getTargetDate()))
+                .build();
+    }
+
     @Transactional
     public CompletableFuture<Void> updateFinalPollMessage(Long pollId, Guild guild) {
         Poll poll = pollManagementService.getPollByPollId(pollId, guild.getIdLong(), PollType.STANDARD);
@@ -543,22 +575,13 @@ public class PollServiceBean implements PollService {
                     .percentage(0f)
                     .description(description)
                     .build();
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     private List<PollMessageOption> getOptionsOfPoll(Poll poll) {
-        Integer totalVotes = poll
-                .getDecisions()
-                .stream()
-                .map(userDecision -> userDecision.getOptions().size())
-                .mapToInt(Integer::intValue)
-                .sum();
+        Integer totalVotes = getTotalVotesOfPoll(poll);
         return poll.getOptions().stream().map(option -> {
-            Long voteCount = poll
-                    .getDecisions()
-                    .stream()
-                    .filter(decision -> decision.getOptions().stream().anyMatch(pollUserDecisionOption -> pollUserDecisionOption.getPollOption().equals(option)))
-                    .count();
+            Long voteCount = getVotesOfOption(poll, option);
             return PollMessageOption
                     .builder()
                     .value(option.getValue())
@@ -567,7 +590,24 @@ public class PollServiceBean implements PollService {
                     .percentage(totalVotes > 0 ? (voteCount / (float) totalVotes) * 100 : 0)
                     .description(option.getDescription())
                     .build();
-        }).collect(Collectors.toList());
+        }).toList();
+    }
+
+    private Long getVotesOfOption(Poll poll, PollOption option) {
+        return poll
+                .getDecisions()
+                .stream()
+                .filter(decision -> decision.getOptions().stream().anyMatch(pollUserDecisionOption -> pollUserDecisionOption.getPollOption().equals(option)))
+                .count();
+    }
+
+    private Integer getTotalVotesOfPoll(Poll poll) {
+        return poll
+                .getDecisions()
+                .stream()
+                .map(userDecision -> userDecision.getOptions().size())
+                .mapToInt(Integer::intValue)
+                .sum();
     }
 
 }

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/management/PollOptionManagementServiceBean.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.suggestion.service.management;
 
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.suggestion.model.PollCreationRequest;
 import dev.sheldan.abstracto.suggestion.model.database.Poll;
 import dev.sheldan.abstracto.suggestion.model.database.PollOption;
@@ -32,12 +33,18 @@ public class PollOptionManagementServiceBean implements PollOptionManagementServ
 
     @Override
     public void addOptionToPoll(Poll poll, String label, String description) {
+        addOptionToPoll(poll, label, description, null);
+    }
+
+    @Override
+    public void addOptionToPoll(Poll poll, String label, String description, AUserInAServer adder) {
         PollOption option = PollOption
                 .builder()
                 .poll(poll)
                 .label(label)
                 .value(label)
                 .server(poll.getServer())
+                .adder(adder)
                 .description(description)
                 .build();
         pollOptionRepository.save(option);

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/resources/migrations/1.5.6/collection.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="seedData/data.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/resources/migrations/1.5.6/seedData/command.xml

@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
+    <property name="pollFeature" value="(SELECT id FROM feature WHERE key = 'poll')"/>
+
+    <changeSet author="Sheldan" id="showPoll-command">
+        <insert tableName="command">
+            <column name="name" value="showPoll"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${pollFeature}"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/resources/migrations/1.5.6/seedData/data.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+    <include file="command.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/resources/migrations/suggestion-changeLog.xml

@@ -13,4 +13,5 @@
     <include file="1.4.0/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.8/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.26/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.6/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/PollInfoModel.java

@@ -0,0 +1,25 @@
+package dev.sheldan.abstracto.suggestion.model.template;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+public class PollInfoModel {
+    private Long id;
+    private String description;
+    private Boolean allowMultiple;
+    private Boolean showDecisions;
+    private Boolean allowAdditions;
+    private Instant creationDate;
+    private Integer totalVotes;
+    private Instant targetDate;
+    private Duration pollDuration;
+    private List<PollOptionInfoModel> options;
+}

abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/PollOptionInfoModel.java

@@ -0,0 +1,18 @@
+package dev.sheldan.abstracto.suggestion.model.template;
+
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Builder
+public class PollOptionInfoModel {
+    private String value;
+    private String label;
+    private String description;
+    private Long votes;
+    private Float percentage;
+    private MemberDisplay adder;
+}

abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/PollService.java

@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.suggestion.service;
 
 import dev.sheldan.abstracto.suggestion.model.database.PollType;
+import dev.sheldan.abstracto.suggestion.model.template.PollInfoModel;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 
@@ -26,4 +27,5 @@ public interface PollService {
     CompletableFuture<Void> evaluateQuickPoll(Long pollId, Long serverId);
     CompletableFuture<Void> closePoll(Long pollId, Long serverId, String text, Member cause);
     CompletableFuture<Void> cancelPoll(Long pollId, Long serverId, Member cause);
+    PollInfoModel getPollInfoModel(Long pollId, Long serverId);
 }

abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/management/PollOptionManagementService.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.suggestion.service.management;
 
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.suggestion.model.PollCreationRequest;
 import dev.sheldan.abstracto.suggestion.model.database.Poll;
 import dev.sheldan.abstracto.suggestion.model.database.PollOption;
@@ -9,5 +10,6 @@ import java.util.Optional;
 public interface PollOptionManagementService {
     void addOptionsToPoll(Poll poll, PollCreationRequest pollCreationRequest);
     void addOptionToPoll(Poll poll, String label, String description);
+    void addOptionToPoll(Poll poll, String label, String description, AUserInAServer adder);
     Optional<PollOption> getPollOptionByName(Poll poll, String key);
 }

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.5.2</version>
+        <version>1.5.8</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.5.2</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>