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

removing banDelete command
updating jda version

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Execute build and Sonar
+name: Execute Build
 
 on:
   push:
@@ -20,26 +20,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'corretto'
-        java-version: 8
+        java-version: 17
     - name: Build with Maven
       run: mvn -B install --file abstracto-application/pom.xml
-    - name: Setup sonarqube
-      uses: warchant/setup-sonar-scanner@v3
-    - name: Run sonarqube
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: sonar-scanner
-       -Dsonar.login=${{ secrets.SONAR_TOKEN }}
-       -Dsonar.organization=sheldan
-       -Dsonar.host.url=https://sonarcloud.io/
-       -Dsonar.projectKey=abstracto-core
-       -Dsonar.java.binaries=**/target/classes
-       -Dsonar.coverage.jacoco.xmlReportPaths=abstracto-application/coverage/target/site/jacoco-aggregate/jacoco.xml
-       -Dsonar.coverage.exclusions=**/*Test.java
     - uses: actions/setup-ruby@v1
     - name: Send Webhook Notification
       if: always()

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: 8
+          java-version: 17
       - name: Load current version
         id: version
         run: echo "version=$(mvn --file abstracto-application/pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
@@ -37,15 +37,20 @@ jobs:
           branch: master
           ssh-key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
           folder: abstracto-application/documentation/target/generated-docs
-      - name: Login to GitHub Packages Docker Registry
+      - name: Login to Harbor
         uses: docker/login-action@v2
         with:
-          registry: docker.pkg.github.com
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Push deployment container
-        working-directory: ./abstracto-application/installer/src/main/docker/deployment
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Load env files
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: ./deployment/installer/.env
+      - name: Push container
         run: docker-compose build && docker-compose push
+        working-directory: ./deployment/installer/
         env:
-          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
-          VERSION: ${{ env.version }}
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Sheldan
+Copyright (c) 2023 Sheldan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,6 @@
 # Abstracto
 
-![Build](https://github.com/Sheldan/abstracto/workflows/Execute%20build%20and%20Sonar/badge.svg)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=abstracto-core&metric=coverage)](https://sonarcloud.io/dashboard?id=abstracto-core)
-[![SonarCloud](https://sonarcloud.io/images/project_badges/sonarcloud-white.svg)](https://sonarcloud.io/dashboard?id=abstracto-core)
+![Build](https://github.com/Sheldan/abstracto/workflows/Execute%20Build/badge.svg)
 [![GitHub license](https://img.shields.io/github/license/Sheldan/abstracto)](https://github.com/Sheldan/abstracto/blob/master/LICENSE)
 
 
@@ -14,22 +12,20 @@ An example implementation of this bot can be seen [here](https://github.com/Shel
 
 
 ## Technologies
-* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 5.0.0-alpha.21
-* [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including Dependency injection and more)
+* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 5.0.0-beta.13
+* [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including dependency injection and more)
 * [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA.
 * [Freemarker](https://github.com/apache/freemarker) is used as a templating engine. This is used to provide internationalization for user facing text and enable dynamic embed configuration.
 * [Ehcache](https://github.com/ehcache/ehcache3) is used as a caching implementation.
 * [Lombok](https://github.com/rzwitserloot/lombok) is used as a framework in order to speed up creation of container classes and builders.
-* [Quartz](https://github.com/quartz-scheduler/quartz) is used as a scheduling framework in order to provide functionalities which either require a delayed or cronjob behaviour.
-* [Docker](https://github.com/docker) is used to package the application into a container and [Docker Compose](https://github.com/docker/compose) is used to connect the required containers together.
+* [Quartz](https://github.com/quartz-scheduler/quartz) is used as a scheduling framework in order to provide functionalities which either require a scheduled or cronjob behaviour.
+* [Docker](https://github.com/docker) is used to package the application into an image and [Docker Compose](https://github.com/docker/compose) is used to build the images
 * [Liquibase](https://github.com/liquibase/liquibase) is used to manage changes to the database
 
 ## Documentation
 A detailed documentation of the pure form of Abstracto including the terminology and commands in HTML form is available [here](https://sheldan.github.io/abstracto-docs/current). The PDF is available [here](https://sheldan.github.io/abstracto-docs/current/documentation.pdf)
 If you want to view the documentation to an earlier released version you need to append the desired version to the URL. The current version will be available aforementioned URL, but it is not right now, because Abstracto has not been released yet.
 
-## Customization documentation 
-TBD when Abstracto is released, as the current version is still being adapted, because of findings from the example customization in Crimson.
 
 ## Issues
 If you find any issue, feel free to create a GitHub issue.

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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -41,13 +41,19 @@ public class ActivateAssignableRolePlace extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter placeName = Parameter.builder().name("name").type(String.class).templated(true).build();
+        Parameter placeName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(placeName);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("activateAssignableRolePlace")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)

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

@@ -36,16 +36,40 @@ public class AddAssignableRoleCondition extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter placeName = Parameter.builder().name("name").type(String.class).templated(true).build();
-        Parameter role = Parameter.builder().name("role").type(Role.class).templated(true).build();
-        Parameter conditionKey = Parameter.builder().name("conditionKey").type(AssignableRoleConditionType.class).templated(true).build();
-        Parameter conditionValue = Parameter.builder().name("conditionParameter").type(String.class).templated(true).build();
+        Parameter placeName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter role = Parameter
+                .builder()
+                .name("role")
+                .type(Role.class)
+                .templated(true)
+                .build();
+        Parameter conditionKey = Parameter
+                .builder()
+                .name("conditionKey")
+                .type(AssignableRoleConditionType.class)
+                .templated(true)
+                .build();
+        Parameter conditionValue = Parameter
+                .builder()
+                .name("conditionParameter")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(placeName, role, conditionKey, conditionValue);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("addAssignableRoleCondition")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

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

@@ -62,17 +62,42 @@ public class AddRoleToAssignableRolePost extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter placeName = Parameter.builder().name("name").type(String.class).templated(true).build();
-        Parameter role = Parameter.builder().name("role").type(Role.class).templated(true).build();
-        Parameter rolePostName = Parameter.builder().name("displayText").type(String.class).templated(true).build();
-        Parameter emote = Parameter.builder().name("emote").type(FullEmote.class).optional(true).templated(true).build();
+        Parameter placeName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter role = Parameter
+                .builder()
+                .name("role")
+                .type(Role.class)
+                .templated(true)
+                .build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("displayText")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter emote = Parameter
+                .builder()
+                .name("emote")
+                .type(FullEmote.class)
+                .optional(true)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(placeName, role, rolePostName, emote);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("addRoleToAssignableRolePlace")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .causesReaction(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)

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

@@ -47,9 +47,24 @@ public class ChangeAssignableRolePlaceConfig extends AbstractConditionableComman
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter assignableRolePlaceName = Parameter.builder().name("name").type(String.class).templated(true).build();
-        Parameter parameterKey = Parameter.builder().name("key").type(AssignableRolePlaceParameterKey.class).templated(true).build();
-        Parameter parameterValue = Parameter.builder().name("value").type(String.class).templated(true).build();
+        Parameter assignableRolePlaceName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter parameterKey = Parameter
+                .builder()
+                .name("key")
+                .type(AssignableRolePlaceParameterKey.class)
+                .templated(true)
+                .build();
+        Parameter parameterValue = Parameter
+                .builder()
+                .name("value")
+                .type(String.class)
+                .templated(true)
+                .build();
 
         List<Parameter> parameters = Arrays.asList(assignableRolePlaceName, parameterKey, parameterValue);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
@@ -57,6 +72,7 @@ public class ChangeAssignableRolePlaceConfig extends AbstractConditionableComman
                 .name("changeAssignableRolePlaceConfig")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)

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

@@ -33,9 +33,6 @@ public class CreateAssignableRolePost extends AbstractConditionableCommand {
     @Autowired
     private ChannelManagementService channelManagementService;
 
-    @Autowired
-    private ServerManagementService serverManagementService;
-
     @Override
     public CommandResult execute(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
@@ -57,20 +54,47 @@ public class CreateAssignableRolePost extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<ParameterValidator> rolePlaceNameValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT));
-        Parameter rolePostName = Parameter.builder().name("name").validators(rolePlaceNameValidator).type(String.class).templated(true).build();
-        Parameter channel = Parameter.builder().name("channel").type(TextChannel.class).templated(true).build();
-        Parameter type = Parameter.builder().name("type").type(AssignableRolePlaceType.class).templated(true).optional(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .validators(rolePlaceNameValidator)
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter channel = Parameter
+                .builder()
+                .name("channel")
+                .type(TextChannel.class)
+                .templated(true)
+                .build();
+        Parameter type = Parameter
+                .builder()
+                .name("type")
+                .type(AssignableRolePlaceType.class)
+                .templated(true)
+                .optional(true)
+                .build();
         List<ParameterValidator> rolePlaceDescriptionValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT));
-        Parameter text = Parameter.builder().name("text").validators(rolePlaceDescriptionValidator).type(String.class).templated(true).build();
+        Parameter text = Parameter
+                .builder()
+                .name("text")
+                .validators(rolePlaceDescriptionValidator)
+                .type(String.class)
+                .templated(true)
+                .build();
         List<String> aliases = Arrays.asList("crRPl", "crAssRoPl");
         List<Parameter> parameters = Arrays.asList(rolePostName, channel, text, type);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("createAssignableRolePlace")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
+                .messageCommandOnly(true)
                 .parameters(parameters)
                 .aliases(aliases)
                 .help(helpInfo)

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

@@ -41,7 +41,12 @@ public class DeactivateAssignableRolePlace extends AbstractConditionableCommand
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter rolePostName = Parameter.builder().name("name").type(String.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
@@ -49,6 +54,7 @@ public class DeactivateAssignableRolePlace extends AbstractConditionableCommand
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

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

@@ -41,7 +41,12 @@ public class DeleteAssignableRolePlace extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter rolePostName = Parameter.builder().name("name").type(String.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
@@ -50,6 +55,7 @@ public class DeleteAssignableRolePlace extends AbstractConditionableCommand {
                 .templated(true)
                 .causesReaction(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .requiresConfirmation(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)

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

@@ -46,15 +46,29 @@ public class EditAssignableRolePlaceText extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<ParameterValidator> rolePlaceNameValidator = Arrays.asList(MaxStringLengthValidator.max(AssignableRolePlace.ASSIGNABLE_PLACE_NAME_LIMIT));
-        Parameter rolePostName = Parameter.builder().name("name").validators(rolePlaceNameValidator).type(String.class).templated(true).build();
-        Parameter newText = Parameter.builder().name("newText").type(String.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder().name("name")
+                .validators(rolePlaceNameValidator)
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter newText = Parameter
+                .builder()
+                .name("newText")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName, newText);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("editAssignableRolePlaceText")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

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

@@ -67,6 +67,7 @@ public class MoveAssignableRolePlace extends AbstractConditionableCommand {
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .causesReaction(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)

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

@@ -35,15 +35,31 @@ public class RemoveAssignableRoleCondition extends AbstractConditionableCommand
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter placeName = Parameter.builder().name("name").type(String.class).templated(true).build();
-        Parameter role = Parameter.builder().name("role").type(Role.class).templated(true).build();
-        Parameter conditionKey = Parameter.builder().name("conditionKey").type(AssignableRoleConditionType.class).templated(true).build();
+        Parameter placeName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter role = Parameter
+                .builder()
+                .name("role")
+                .type(Role.class)
+                .templated(true)
+                .build();
+        Parameter conditionKey = Parameter
+                .builder()
+                .name("conditionKey")
+                .type(AssignableRoleConditionType.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(placeName, role, conditionKey);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("removeAssignableRoleCondition")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

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

@@ -44,16 +44,30 @@ public class RemoveRoleFromAssignableRolePlace extends AbstractConditionableComm
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter rolePostName = Parameter.builder().name("name").type(String.class).templated(true).build();
-        Parameter role = Parameter.builder().name("role").type(ARole.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
+        Parameter role = Parameter
+                .builder()
+                .name("role")
+                .type(ARole.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName, role);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("removeRoleFromAssignableRolePlace")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .causesReaction(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)
                 .help(helpInfo)

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

@@ -48,14 +48,23 @@ public class SetupAssignableRolePlace extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter rolePostName = Parameter.builder().name("name").type(String.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("setupAssignableRolePlace")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

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

@@ -48,15 +48,24 @@ public class ShowAssignableRolePlaceConfig extends AbstractConditionableCommand
 
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter rolePostName = Parameter.builder().name("name").type(String.class).templated(true).build();
+        Parameter rolePostName = Parameter
+                .builder()
+                .name("name")
+                .type(String.class)
+                .templated(true)
+                .build();
         List<Parameter> parameters = Arrays.asList(rolePostName);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("showAssignableRolePlaceConfig")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
                 .async(true)
                 .causesReaction(false)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)
                 .help(helpInfo)

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

@@ -45,11 +45,15 @@ public class ShowAssignableRolePlaces extends AbstractConditionableCommand {
 
     @Override
     public CommandConfiguration getConfiguration() {
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("showAssignableRolePlaces")
                 .module(AssignableRoleModuleDefinition.ASSIGNABLE_ROLES)
                 .templated(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .help(helpInfo)

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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>assignable-roles-int</artifactId>

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/model/database/AssignableRole.java

@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.ComponentPayload;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/model/database/AssignableRoleCondition.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.assignableroles.model.database;
 import dev.sheldan.abstracto.assignableroles.model.condition.AssignableRoleConditionType;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "assignable_role_condition")

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/model/database/AssignableRolePlace.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/model/database/AssignedRoleUser.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.assignableroles.model.database;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</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,100 @@
+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)
+                .slashCommandOnly(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,91 @@
+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 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)
+                .slashCommandOnly(true)
+                .supportsEmbedException(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+}

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

@@ -0,0 +1,115 @@
+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.SlashCommandAutoCompleteService;
+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.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+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;
+
+    @Autowired
+    private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
+
+    @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 List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), CUSTOM_COMMAND_NAME_PARAMETER)) {
+            String input = event.getFocusedOption().getValue();
+            return customCommandService.getCustomCommandsStartingWith(input, event.getGuild())
+                    .stream()
+                    .map(CustomCommand::getName)
+                    .limit(25)
+                    .toList();
+        } else {
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return CustomCommandFeatureDefinition.CUSTOM_COMMAND;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter commandNameParameter = Parameter
+                .builder()
+                .name(CUSTOM_COMMAND_NAME_PARAMETER)
+                .templated(true)
+                .supportsAutoComplete(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)
+                .slashCommandOnly(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,86 @@
+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)
+                .slashCommandOnly(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,13 @@ 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);
+    List<CustomCommand> findByNameStartsWithIgnoreCaseAndServer(String prefix, AServer server);
 }

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

@@ -0,0 +1,66 @@
+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);
+    }
+
+    @Override
+    public List<CustomCommand> getCustomCommandsStartingWith(String prefix, Guild guild) {
+        AServer server = serverManagementService.loadServer(guild);
+        return customCommandManagementService.getCustomCommandsStartingWith(prefix, server);
+    }
+}

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,32 @@ 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);
+    }
+
+    @Override
+    public List<CustomCommand> getCustomCommandsStartingWith(String prefix, AServer server) {
+        return repository.findByNameStartsWithIgnoreCaseAndServer(prefix, 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.4.12</version>
+        <version>1.5.10</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/model/database/CustomCommand.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.customcommand.model.database;
 import dev.sheldan.abstracto.core.models.database.*;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 

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

@@ -1,9 +1,16 @@
 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);
+    List<CustomCommand> getCustomCommandsStartingWith(String prefix, 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,15 @@
+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);
+    List<CustomCommand> getCustomCommandsStartingWith(String prefix, 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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/dynamic-activity/dynamic-activity-int/src/main/java/dev/sheldan/abstracto/activity/models/CustomActivity.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.activity.models;
 
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -52,14 +52,28 @@ public class React extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<Parameter> parameters = new ArrayList<>();
-        parameters.add(Parameter.builder().name("message").type(Message.class).templated(true).build());
-        parameters.add(Parameter.builder().name("text").type(String.class).remainder(true).templated(true).build());
+        Parameter messageParameter = Parameter
+                .builder()
+                .name("message")
+                .type(Message.class)
+                .templated(true)
+                .build();
+        parameters.add(messageParameter);
+        Parameter textParameter = Parameter
+                .builder()
+                .name("text")
+                .type(String.class)
+                .remainder(true)
+                .templated(true)
+                .build();
+        parameters.add(textParameter);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("react")
                 .module(EntertainmentModuleDefinition.ENTERTAINMENT)
                 .templated(true)
                 .causesReaction(true)
+                .messageCommandOnly(true)
                 .async(true)
                 .supportsEmbedException(true)
                 .parameters(parameters)

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/GameServiceBean.java

@@ -23,8 +23,8 @@ import java.security.SecureRandom;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static dev.sheldan.abstracto.entertainment.config.EconomyFeatureConfig.MINES_MINIMUM_MINES_RATIO;
 import static dev.sheldan.abstracto.entertainment.config.GamesFeatureConfig.MINES_CREDITS_FACTOR;
+import static dev.sheldan.abstracto.entertainment.config.GamesFeatureConfig.MINES_MINIMUM_MINES_RATIO;
 
 @Component
 public class GameServiceBean implements GameService {
@@ -134,6 +134,7 @@ public class GameServiceBean implements GameService {
                 .build();
         Optional<EconomyUser> economyUserOptional = economyUserManagementService.getUser(serverUser);
         if(economyUserOptional.isPresent()) {
+            economyService.addCredits(economyUserOptional.get(), -credits);
             economyService.addCredits(economyUserOptional.get(), creditChange);
         }
         mineBoard.setCreditChange(creditChange);

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.4.12</version>
+        <version>1.5.10</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,9 +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";
-    public static final String MINES_MINIMUM_MINES_RATIO = "minesMinMineRatio";
 
     @Override
     public FeatureDefinition getFeature() {
@@ -22,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, MINES_MINIMUM_MINES_RATIO);
+        return Arrays.asList(PAYDAY_CREDITS_CONFIG_KEY);
     }
 }

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

@@ -11,6 +11,7 @@ import java.util.List;
 public class GamesFeatureConfig implements FeatureConfig {
 
     public static final String MINES_CREDITS_FACTOR = "minesCreditsFactor";
+    public static final String MINES_MINIMUM_MINES_RATIO = "minesMinMineRatio";
 
     @Override
     public FeatureDefinition getFeature() {
@@ -19,7 +20,7 @@ public class GamesFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(MINES_CREDITS_FACTOR);
+        return Arrays.asList(MINES_CREDITS_FACTOR, MINES_MINIMUM_MINES_RATIO);
     }
 
 }

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

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
@@ -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.4.12</version>
+        <version>1.5.10</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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,103 @@
+package dev.sheldan.abstracto.experience.command;
+
+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.CommandContext;
+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.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+import dev.sheldan.abstracto.experience.config.ExperienceFeatureDefinition;
+import dev.sheldan.abstracto.experience.config.ExperienceSlashCommandNames;
+import dev.sheldan.abstracto.experience.service.AUserExperienceService;
+import net.dv8tion.jda.api.entities.Member;
+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 ExpLevelUpNotification extends AbstractConditionableCommand {
+
+    private static final String FLAG_PARAMETER = "newValue";
+    private static final String EXP_LEVEL_UP_NOTIFICATION_COMMAND = "expLevelUpNotification";
+    private static final String EXP_LEVEL_UP_NOTIFICATION_RESPONSE = "expLevelUpNotification_response";
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private AUserExperienceService aUserExperienceService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Override
+    public CommandResult execute(CommandContext commandContext) {
+        Boolean newValue = (Boolean) commandContext.getParameters().getParameters().get(0);
+        updateExpLevelNotification(commandContext.getAuthor(), newValue);
+        return CommandResult.fromSuccess();
+    }
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        Boolean newValue = slashCommandParameterService.getCommandOption(FLAG_PARAMETER, event, Boolean.class);
+        updateExpLevelNotification(event.getMember(), newValue);
+        return interactionService.replyEmbed(EXP_LEVEL_UP_NOTIFICATION_RESPONSE, event)
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    private void updateExpLevelNotification(Member member, Boolean newValue) {
+        AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(member);
+        aUserExperienceService.setLevelUpNotification(aUserInAServer, newValue);
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ExperienceFeatureDefinition.EXPERIENCE;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter memberParameter = Parameter
+                .builder()
+                .name(FLAG_PARAMETER)
+                .templated(true)
+                .type(Boolean.class)
+                .build();
+        List<Parameter> parameters = Arrays.asList(memberParameter);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(ExperienceSlashCommandNames.EXPERIENCE)
+                .commandName(EXP_LEVEL_UP_NOTIFICATION_COMMAND)
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(EXP_LEVEL_UP_NOTIFICATION_COMMAND)
+                .module(ExperienceModuleDefinition.EXPERIENCE)
+                .slashCommandConfig(slashCommandConfig)
+                .causesReaction(true)
+                .supportsEmbedException(true)
+                .templated(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+}

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

@@ -104,7 +104,17 @@ public class Rank extends AbstractConditionableCommand {
         AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(toRender);
         AUserExperience experienceObj = userExperienceManagementService.findUserInServer(aUserInAServer);
         log.info("Rendering rank for user {} in server {}.", toRender.getId(), toRender.getGuild().getId());
-        rankModel.setExperienceToNextLevel(experienceLevelService.calculateExperienceToNextLevel(experienceObj.getCurrentLevel().getLevel(), experienceObj.getExperience()));
+        Long currentExpNeeded = experienceObj.getCurrentLevel().getExperienceNeeded();
+        Long experienceNeededToNextLevel = experienceLevelService.calculateExperienceToNextLevel(experienceObj.getCurrentLevel().getLevel(), experienceObj.getExperience());
+        Long nextLevelExperience = experienceLevelService.calculateNextLevel(experienceObj.getCurrentLevel().getLevel()).getExperienceNeeded();
+        Long levelExperience = nextLevelExperience - currentExpNeeded;
+        Long inLevelExperience = experienceObj.getExperience() - currentExpNeeded;
+        rankModel.setExperienceForCurrentLevel(currentExpNeeded);
+        rankModel.setCurrentLevelPercentage(((float) inLevelExperience / levelExperience) * 100);
+        rankModel.setLevelExperience(levelExperience);
+        rankModel.setExperienceToNextLevel(experienceNeededToNextLevel);
+        rankModel.setInLevelExperience(inLevelExperience);
+        rankModel.setNextLevelExperience(nextLevelExperience);
         return templateService.renderEmbedTemplate(RANK_POST_EMBED_TEMPLATE, rankModel, toRender.getGuild().getIdLong());
     }
 

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

@@ -69,6 +69,7 @@ public class SetExpRole extends AbstractConditionableCommand {
                 .module(ExperienceModuleDefinition.EXPERIENCE)
                 .templated(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .requiresConfirmation(true)

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

@@ -46,7 +46,10 @@ public class SyncRoles extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<Parameter> parameters = new ArrayList<>();
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
         return CommandConfiguration.builder()
                 .name("syncExpRoles")
                 .module(ExperienceModuleDefinition.EXPERIENCE)
@@ -54,6 +57,7 @@ public class SyncRoles extends AbstractConditionableCommand {
                 .async(true)
                 .requiresConfirmation(true)
                 .supportsEmbedException(true)
+                .messageCommandOnly(true)
                 .causesReaction(true)
                 .parameters(parameters)
                 .help(helpInfo)

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

@@ -59,13 +59,20 @@ public class UnSetExpRole extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<Parameter> parameters = new ArrayList<>();
-        parameters.add(Parameter.builder().name("role").templated(true).type(ARole.class).build());
+        Parameter roleParameter = Parameter
+                .builder()
+                .name("role")
+                .templated(true)
+                .type(ARole.class)
+                .build();
+        parameters.add(roleParameter);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("unSetExpRole")
                 .module(ExperienceModuleDefinition.EXPERIENCE)
                 .templated(true)
                 .async(true)
+                .messageCommandOnly(true)
                 .causesReaction(true)
                 .requiresConfirmation(true)
                 .supportsEmbedException(true)

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java

@@ -37,12 +37,16 @@ public class JoiningUserRoleListener implements AsyncJoinListener {
 
     @Override
     public DefaultListenerResult execute(MemberJoinModel model) {
+        if(model.getMember().isPending()) {
+            log.info("Joining member {} in guild {} is still pending - ignoring for experience role assignment.", model.getJoiningUser().getUserId(), model.getJoiningUser().getServerId());
+            return DefaultListenerResult.IGNORED;
+        }
         Optional<AUserInAServer> userInAServerOptional = userInServerManagementService.loadUserOptional(model.getServerId(), model.getJoiningUser().getUserId());
         userInAServerOptional.ifPresent(aUserInAServer -> {
             Optional<AUserExperience> userExperienceOptional = userExperienceManagementService.findByUserInServerIdOptional(aUserInAServer.getUserInServerId());
             if(userExperienceOptional.isPresent()) {
                 log.info("User {} joined {} with previous experience. Setting up experience role again (if necessary).", model.getJoiningUser().getUserId(), model.getServerId());
-                userExperienceService.syncForSingleUser(userExperienceOptional.get(), model.getMember()).thenAccept(result ->
+                userExperienceService.syncForSingleUser(userExperienceOptional.get(), model.getMember(), true).thenAccept(result ->
                         log.info("Finished re-assigning experience for re-joining user {} in server {}.", model.getJoiningUser().getUserId(), model.getServerId())
                 );
             } else {

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/MemberPendingRoleListener.java

@@ -0,0 +1,60 @@
+package dev.sheldan.abstracto.experience.listener;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.listener.async.jda.AsyncUpdatePendingListener;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.listener.MemberUpdatePendingModel;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+import dev.sheldan.abstracto.experience.config.ExperienceFeatureDefinition;
+import dev.sheldan.abstracto.experience.model.database.AUserExperience;
+import dev.sheldan.abstracto.experience.service.AUserExperienceService;
+import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Member;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+/**
+ * If a {@link Member member} updates the pending status, this {@link AsyncUpdatePendingListener listener} retrieves the previously stored {@link AUserExperience experience} and gives the
+ * member the necessary {@link net.dv8tion.jda.api.entities.Role role} according to the current configuration, if any
+ */
+@Component
+@Slf4j
+public class MemberPendingRoleListener implements AsyncUpdatePendingListener {
+
+    @Autowired
+    private UserExperienceManagementService userExperienceManagementService;
+
+    @Autowired
+    private AUserExperienceService userExperienceService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Override
+    public DefaultListenerResult execute(MemberUpdatePendingModel model) {
+        Optional<AUserInAServer> userInAServerOptional = userInServerManagementService.loadUserOptional(model.getServerId(), model.getUser().getUserId());
+        userInAServerOptional.ifPresent(aUserInAServer -> {
+            Optional<AUserExperience> userExperienceOptional = userExperienceManagementService.findByUserInServerIdOptional(aUserInAServer.getUserInServerId());
+            if(userExperienceOptional.isPresent()) {
+                log.info("User {} updated pending status {} with previous experience. Setting up experience role again (if necessary).", model.getUser().getUserId(), model.getServerId());
+                userExperienceService.syncForSingleUser(userExperienceOptional.get(), model.getMember(), true).thenAccept(result ->
+                        log.info("Finished re-assigning experience for update pending user {} in server {}.", model.getUser().getUserId(), model.getServerId())
+                );
+            } else {
+                log.info("Member updating pending {} in server {} does not have any previous experience. Not setting up anything.", model.getUser().getUserId(), model.getServerId());
+            }
+        });
+
+        return DefaultListenerResult.PROCESSED;
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ExperienceFeatureDefinition.EXPERIENCE;
+    }
+
+}

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

@@ -138,7 +138,10 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
                 // we store when the user is eligible for experience _again_
                 Long maxSeconds = configService.getLongValueOrConfigDefault(EXP_COOLDOWN_SECONDS_KEY, serverId);
                 serverExperience.put(userId, Instant.now().plus(maxSeconds, ChronoUnit.SECONDS));
-                CompletableFuture.runAsync(() -> self.addExperienceToMember(member, message), experienceUpdateExecutor);
+                CompletableFuture.runAsync(() -> self.addExperienceToMember(member, message), experienceUpdateExecutor).exceptionally(throwable -> {
+                    log.error("Failed to add experience to member {} in server {}.", message.getAuthor().getId(), message.getGuild().getIdLong(), throwable);
+                    return null;
+                });
             }
         } finally {
             runTimeExperienceService.releaseLock();
@@ -252,17 +255,17 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
     public CompletableFuture<Void> syncUser(Member member, List<AExperienceRole> roles) {
         AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(member);
         AUserExperience userExperience = userExperienceManagementService.findByUserInServerId(aUserInAServer.getUserInServerId());
-        return  calculateAndApplyExperienceRole(userExperience, member, roles);
+        return  calculateAndApplyExperienceRole(userExperience, member, roles, false);
     }
 
     @Override
-    public CompletableFuture<Void> syncForSingleUser(AUserExperience userExperience, Member member) {
+    public CompletableFuture<Void> syncForSingleUser(AUserExperience userExperience, Member member, boolean forceRoles) {
         List<AExperienceRole> roles = experienceRoleManagementService.getExperienceRolesForServer(userExperience.getServer());
         roles.sort(Comparator.comparing(role -> role.getLevel().getLevel()));
-        return calculateAndApplyExperienceRole(userExperience, member, roles);
+        return calculateAndApplyExperienceRole(userExperience, member, roles, forceRoles);
     }
 
-    private CompletableFuture<Void> calculateAndApplyExperienceRole(AUserExperience userExperience, Member member, List<AExperienceRole> roles) {
+    private CompletableFuture<Void> calculateAndApplyExperienceRole(AUserExperience userExperience, Member member, List<AExperienceRole> roles, boolean forceRoles) {
         AExperienceRole calculatedNewRole = experienceRoleService.calculateRole(roles, userExperience.getCurrentLevel().getLevel());
         Long oldRoleId = userExperience.getCurrentExperienceRole() != null && userExperience.getCurrentExperienceRole().getRole() != null ? userExperience.getCurrentExperienceRole().getRole().getId() : null;
         Long newRoleId = calculatedNewRole != null ? calculatedNewRole.getRole().getId() : null;
@@ -270,7 +273,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
         userExperience.setCurrentExperienceRole(calculatedNewRole);
 
         CompletableFuture<Void> returningFuture;
-        if(!Objects.equals(oldRoleId, newRoleId)) {
+        if(!Objects.equals(oldRoleId, newRoleId) || forceRoles) {
             CompletableFuture<Void> addingFuture;
             if(oldRoleId != null) {
                 addingFuture = roleService.removeRoleFromMemberAsync(member, oldRoleId);
@@ -336,11 +339,13 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
                         oldLevel);
                 aUserExperience.setCurrentLevel(newLevel);
                 AExperienceRole calculatedNewRole = experienceRoleService.calculateRole(roles, newLevel.getLevel());
-                Long oldRoleId = aUserExperience.getCurrentExperienceRole() != null ? aUserExperience.getCurrentExperienceRole().getRole().getId() : null;
-                Long newRoleId = calculatedNewRole != null ? calculatedNewRole.getRole().getId() : null;
+                Long oldRoleId = aUserExperience.getCurrentExperienceRole() != null && aUserExperience.getCurrentExperienceRole().getRole() != null ? aUserExperience.getCurrentExperienceRole().getRole().getId() : null;
+                Long newRoleId = calculatedNewRole != null && calculatedNewRole.getRole() != null ? calculatedNewRole.getRole().getId() : null;
                 result.setOldRoleId(oldRoleId);
                 result.setNewRoleId(newRoleId);
-                if(message != null && featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, serverId, ExperienceFeatureMode.LEVEL_UP_NOTIFICATION)) {
+                if(message != null
+                        && aUserExperience.getLevelUpNotification()
+                        && featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, serverId, ExperienceFeatureMode.LEVEL_UP_NOTIFICATION)) {
                     LevelUpNotificationModel model = LevelUpNotificationModel
                             .builder()
                             .memberDisplay(MemberDisplay.fromMember(member))
@@ -366,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 {
@@ -429,6 +443,13 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
         userExperience.setExperienceGainDisabled(false);
     }
 
+    @Override
+    public void setLevelUpNotification(AUserInAServer aUserInAServer, Boolean newValue) {
+        Optional<AUserExperience> aUserExperienceOptional = userExperienceManagementService.findByUserInServerIdOptional(aUserInAServer.getUserInServerId());
+        AUserExperience aUserExperience = aUserExperienceOptional.orElseGet(() -> userExperienceManagementService.createUserInServer(aUserInAServer));
+        aUserExperience.setLevelUpNotification(newValue);
+    }
+
     /**
      * Renders a {@link MessageToSend messageToSend} to be used as a status message for the ongoing user synchronization
      * @param current The amount of users which have been synced

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

@@ -57,9 +57,14 @@ public class ExperienceLevelServiceBean implements ExperienceLevelService {
 
     @Override
     public Long calculateExperienceToNextLevel(Integer level, Long currentExperience) {
-        AExperienceLevel nextLevel = experienceLevelManagementService.getLevelOptional(level + 1)
-                .orElseThrow(() -> new AbstractoRunTimeException(String.format("Could not find level %s", level)));
+        AExperienceLevel nextLevel = calculateNextLevel(level);
         return nextLevel.getExperienceNeeded() - currentExperience;
     }
 
+    @Override
+    public AExperienceLevel calculateNextLevel(Integer level) {
+        return experienceLevelManagementService.getLevelOptional(level + 1)
+                .orElseThrow(() -> new AbstractoRunTimeException(String.format("Could not find level %s", level)));
+    }
+
 }

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

@@ -58,6 +58,7 @@ public class UserExperienceManagementServiceBean implements UserExperienceManage
                 .messageCount(0L)
                 .server(aUserInAServer.getServerReference())
                 .experienceGainDisabled(false)
+                .levelUpNotification(true)
                 .user(aUserInAServer)
                 .id(aUserInAServer.getUserInServerId())
                 .currentLevel(startingLevel)

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/migrations/1.4.17/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="tables/tables.xml" relativeToChangelogFile="true"/>
+    <include file="seedData/data.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/migrations/1.4.17/seedData/command.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" >
+    <property name="experienceModule" value="(SELECT id FROM module WHERE name = 'experience')"/>
+    <property name="experienceFeature" value="(SELECT id FROM feature WHERE key = 'experience')"/>
+    <changeSet  author="Sheldan"  id="experience-expLevelUpNotification_command">
+        <insert tableName="command">
+            <column name="name" value="expLevelUpNotification"/>
+            <column name="module_id" valueComputed="${experienceModule}"/>
+            <column name="feature_id" valueComputed="${experienceFeature}"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/migrations/1.4.17/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/experience-tracking/experience-tracking-impl/src/main/resources/migrations/1.4.17/tables/tables.xml

@@ -0,0 +1,12 @@
+<?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="user_experience.xml" relativeToChangelogFile="true"/>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/migrations/1.4.17/tables/user_experience.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="user_experience-add_level_up_notification">
+        <addColumn tableName="user_experience">
+            <column name="level_up_notification" type="BOOLEAN" defaultValueBoolean="true"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>

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

@@ -9,4 +9,5 @@
     <include file="1.0-experience/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.2.15/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.8/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.4.17/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListenerTest.java

@@ -67,7 +67,7 @@ public class JoiningUserRoleListenerTest {
     public void testUserWithExperienceRejoining() {
         AUserExperience experience = Mockito.mock(AUserExperience.class);
         when(userExperienceManagementService.findByUserInServerIdOptional(USER_IN_SERVER_ID)).thenReturn(Optional.of(experience));
-        when(userExperienceService.syncForSingleUser(experience, member)).thenReturn(CompletableFuture.completedFuture(null));
+        when(userExperienceService.syncForSingleUser(experience, member, true)).thenReturn(CompletableFuture.completedFuture(null));
         when(model.getMember()).thenReturn(member);
         DefaultListenerResult result = testUnit.execute(model);
         Assert.assertEquals(DefaultListenerResult.PROCESSED, result);
@@ -75,9 +75,18 @@ public class JoiningUserRoleListenerTest {
 
     @Test
     public void testUserWithOutExperienceRejoining() {
+        when(model.getMember()).thenReturn(member);
         when(userExperienceManagementService.findByUserInServerIdOptional(USER_IN_SERVER_ID)).thenReturn(Optional.empty());
         testUnit.execute(model);
-        verify(userExperienceService, times(0)).syncForSingleUser(any(), any());
+        verify(userExperienceService, times(0)).syncForSingleUser(any(), any(), eq(true));
+    }
+
+    @Test
+    public void testPendingUserJoining() {
+        when(member.isPending()).thenReturn(true);
+        when(model.getMember()).thenReturn(member);
+        testUnit.execute(model);
+        verify(userExperienceService, times(0)).syncForSingleUser(any(), any(), eq(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.4.12</version>
+        <version>1.5.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/model/database/ADisabledExpRole.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.experience.model.database;
 import dev.sheldan.abstracto.core.models.database.ARole;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/model/database/AExperienceLevel.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.experience.model.database;
 
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/model/database/AExperienceRole.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/model/database/AUserExperience.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
@@ -60,6 +60,9 @@ public class AUserExperience implements Serializable {
     @Column(name = "experience_gain_disabled", nullable = false)
     private Boolean experienceGainDisabled = false;
 
+    @Column(name = "level_up_notification")
+    private Boolean levelUpNotification;
+
     /**
      * The {@link AExperienceLevel level} which the user currently has.
      */

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/model/template/RankModel.java

@@ -23,6 +23,26 @@ public class RankModel {
      * The necessary experience to the next level up.
      */
     private Long experienceToNextLevel;
+    /**
+     * Total experience needed for this level
+     */
+    private Long experienceForCurrentLevel;
+    /**
+     * Percentage of progress within this level
+     */
+    private Float currentLevelPercentage;
+    /**
+     * The total amount of experience needed for this level
+     */
+    private Long levelExperience;
+    /**
+     * The experience which has been reached _within_ this level
+     */
+    private Long inLevelExperience;
+    /**
+     * The experience needed to reach the next level
+     */
+    private Long nextLevelExperience;
     /**
      * The member to show the rank for
      */

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceService.java

@@ -44,7 +44,7 @@ public interface AUserExperienceService {
 
     CompletableFuture<Void> syncUserRolesWithFeedback(AServer server, MessageChannel messageChannel);
 
-    CompletableFuture<Void> syncForSingleUser(AUserExperience userExperience, Member member);
+    CompletableFuture<Void> syncForSingleUser(AUserExperience userExperience, Member member, boolean changeRoles);
 
     /**
      * Loads the desired page of the ordered complete leaderboard from the {@link AServer} and returns the information as a {@link LeaderBoard}
@@ -75,6 +75,7 @@ public interface AUserExperienceService {
      * @param userInAServer The {@link AUserInAServer} to enable experience for
      */
     void enableExperienceForUser(AUserInAServer userInAServer);
+    void setLevelUpNotification(AUserInAServer aUserInAServer, Boolean newValue);
 
     boolean experienceGainEnabledInChannel(MessageChannel messageChannel);