[AB-xxx] fixing ui code, and increasing window size in ui

updating dependency

.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.35
+VERSION=1.5.51

.github/workflows/build.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v3
@@ -37,15 +37,4 @@ jobs:
     - name: Build ui application
       working-directory: ./ui/experience-tracking
       run: npm run build
-    - uses: actions/setup-ruby@v1
+
-    - name: Send Webhook Notification
-      if: always()
-      env:
-        JOB_STATUS: ${{ job.status }}
-        WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-        HOOK_OS_NAME: ${{ runner.os }}
-        WORKFLOW_NAME: ${{ github.workflow }}
-      run: |
-        git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook
-        bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL
-      shell: bash

.github/workflows/release_manual.yml

@@ -5,7 +5,7 @@ permissions:
   contents: write
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -64,7 +64,7 @@ jobs:
         with:
           path: .env
       - name: Build and push Docker containers
-        run: docker-compose build && docker-compose push
+        run: docker compose build && docker compose push
         env:
           REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
           VERSION: ${{ steps.dotenv.outputs.version }}

.gitignore

@@ -14,9 +14,7 @@ target/
 
 # Package Files #
 *.jar
-*.war
 *.nar
-*.ear
 *.zip
 *.tar.gz
 *.rar

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Sheldan
+Copyright (c) 2024 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

@@ -8,7 +8,6 @@ Abstracto represents a framework to be used as a basis for a Discord bot. It use
 and provides an extensive tool set to create new commands and a wide range of commands out of the box.
 
 This repository does not provide the full functionality in order to start a discord bot, because it requires a Main class. 
-An example implementation of this bot can be seen [here](https://github.com/Sheldan/Crimson). This repository contains the required configuration in order to run a bot and example customizations.
 
 
 ## Technologies

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

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

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

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

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

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

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

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

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

@@ -42,7 +42,7 @@ public class ShowAssignableRolePlaceConfig extends AbstractConditionableCommand
         List<Object> parameters = commandContext.getParameters().getParameters();
         String name = (String) parameters.get(0);
         AssignableRolePlaceConfig config = service.getAssignableRolePlaceConfig(commandContext.getGuild(), name);
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(ASSIGNABLE_ROLES_CONFIG_POST_TEMPLATE_KEY, config, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(ASSIGNABLE_ROLES_CONFIG_POST_TEMPLATE_KEY, config, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
 

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

@@ -39,7 +39,7 @@ public class ShowAssignableRolePlaces extends AbstractConditionableCommand {
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         AssignablePlaceOverview model = service.getAssignableRolePlaceOverview(commandContext.getGuild());
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(ASSIGNABLE_ROLE_PLACES_OVERVIEW_TEMPLATE_KEY, model, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(ASSIGNABLE_ROLE_PLACES_OVERVIEW_TEMPLATE_KEY, model, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -53,7 +53,7 @@ public class Choose extends AbstractConditionableCommand {
                 .builder()
                 .chosenValue(choice)
                 .build();
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(CHOOSE_RESPONSE_TEMPLATE_KEY, responseModel, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(CHOOSE_RESPONSE_TEMPLATE_KEY, responseModel, commandContext.getChannel()))
             .thenApply(unused -> CommandResult.fromIgnored());
     }
 

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

@@ -66,7 +66,7 @@ public class Mock extends AbstractConditionableCommand {
                 .originalText(messageText)
                 .mockingText(mockingText)
                 .build();
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(MOCK_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(MOCK_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
 

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

@@ -61,7 +61,7 @@ public class PressFCommand extends AbstractConditionableCommand {
         Long defaultDurationSeconds = configService.getLongValueOrConfigDefault(PRESS_F_DEFAULT_DURATION_SECONDS, commandContext.getGuild().getIdLong());
         Duration duration = Duration.ofSeconds(defaultDurationSeconds);
         PressFPromptModel pressFModel = entertainmentService.getPressFModel(text);
-        List<CompletableFuture<Message>> messages = channelService.sendEmbedTemplateInMessageChannelList(RESPONSE_TEMPLATE, pressFModel, commandContext.getChannel());
+        List<CompletableFuture<Message>> messages = channelService.sendEmbedTemplateInMessageChannel(RESPONSE_TEMPLATE, pressFModel, commandContext.getChannel());
         return FutureUtils.toSingleFutureGeneric(messages)
                 .thenAccept(unused -> entertainmentService.persistPressF(text, duration, commandContext.getAuthor(),
                                 pressFModel.getPressFComponentId(), commandContext.getChannel(), messages.get(0).join().getIdLong()))

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

@@ -69,7 +69,7 @@ public class Roll extends AbstractConditionableCommand {
                 .builder()
                 .rolled(rolled)
                 .build();
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(ROLL_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(ROLL_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromIgnored());
     }
 

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

@@ -45,7 +45,7 @@ public class Roulette extends AbstractConditionableCommand {
                 .builder()
                 .result(rouletteResult)
                 .build();
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(ROULETTE_RESPONSE_TEMPLATE_KEY, responseModel, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(ROULETTE_RESPONSE_TEMPLATE_KEY, responseModel, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromIgnored());
     }
 

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

@@ -65,7 +65,7 @@ public class TransferCredits extends AbstractConditionableCommand {
                 .targetMember(MemberDisplay.fromMember(targetMember))
                 .credits(amount)
                 .build();
-        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(TRANSFER_CREDITS_RESPONSE, responseModel, commandContext.getChannel()))
+        return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(TRANSFER_CREDITS_RESPONSE, responseModel, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
 

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

@@ -103,7 +103,7 @@ public class Mines extends AbstractConditionableCommand {
         board.setUserId(event.getMember().getIdLong());
         board.setServerId(serverId);
         board.setCredits(credit);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MINE_BOARD_TEMPLATE_KEY, board);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MINE_BOARD_TEMPLATE_KEY, board, serverId);
         return interactionService.replyMessageToSend(messageToSend, event)
                 .thenCompose(interactionHook -> interactionHook.retrieveOriginal().submit())
                 .thenApply(message -> {
@@ -151,7 +151,7 @@ public class Mines extends AbstractConditionableCommand {
         board.setUserId(commandContext.getAuthor().getIdLong());
         board.setServerId(serverId);
         board.setCredits(credit);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MINE_BOARD_TEMPLATE_KEY, board);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MINE_BOARD_TEMPLATE_KEY, board, serverId);
         List<CompletableFuture<Message>> futures = channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel());
         return FutureUtils.toSingleFutureGeneric(futures)
                 .thenAccept(unused ->  gameService.persistMineBoardMessage(board, futures.get(0).join()))

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/listener/interaction/MinesButtonClickedListener.java

@@ -54,7 +54,7 @@ public class MinesButtonClickedListener implements ButtonClickedListener {
             }
             gameService.uncoverBoard(mineBoard);
         }
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(Mines.MINE_BOARD_TEMPLATE_KEY, mineBoard);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(Mines.MINE_BOARD_TEMPLATE_KEY, mineBoard, model.getServerId());
         interactionService.editOriginal(messageToSend, model.getEvent().getHook()).thenAccept(message -> {
             gameService.updateMineBoard(mineBoard);
             log.info("Updated original mineboard for board {}.", mineBoard.getBoardId());

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

@@ -105,7 +105,9 @@ public class EntertainmentServiceBean implements EntertainmentService {
 
     @Override
     public Integer getLoveCalcValue(String firstPart, String secondPart) {
-        return secureRandom.nextInt(100);
+        String fullInput = firstPart.toLowerCase() + secondPart.toLowerCase();
+        Random random = new Random(fullInput.hashCode());
+        return random.nextInt(100);
     }
 
     @Override
@@ -191,8 +193,8 @@ public class EntertainmentServiceBean implements EntertainmentService {
                     .text(pressF.getText())
                     .messageId(pressF.getMessageId())
                     .build();
-            MessageToSend messageToSend = templateService.renderEmbedTemplate(PRESS_F_RESULT_TEMPLATE_KEY, model);
             Long serverId = pressF.getServer().getId();
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(PRESS_F_RESULT_TEMPLATE_KEY, model, serverId);
             Long channelId = pressF.getPressFChannel().getId();
             Long messageId = pressF.getMessageId();
             return FutureUtils.toSingleFutureGeneric(channelService.sendMessageEmbedToSendToAChannel(messageToSend, pressF.getPressFChannel()))

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

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

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

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

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

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

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/api/LeaderboardController.java

@@ -1,14 +1,26 @@
 package dev.sheldan.abstracto.experience.api;
 
+import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.models.frontend.RoleDisplay;
 import dev.sheldan.abstracto.core.models.frontend.UserDisplay;
 import dev.sheldan.abstracto.core.service.GuildService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.experience.model.api.UserExperienceDisplay;
+import dev.sheldan.abstracto.experience.model.database.AExperienceLevel;
 import dev.sheldan.abstracto.experience.model.database.AExperienceRole;
 import dev.sheldan.abstracto.experience.model.database.AUserExperience;
+import dev.sheldan.abstracto.experience.model.database.LeaderBoardEntryResult;
+import dev.sheldan.abstracto.experience.service.ExperienceLevelService;
+import dev.sheldan.abstracto.experience.service.management.ExperienceLevelManagementService;
+import dev.sheldan.abstracto.experience.service.management.ExperienceRoleManagementService;
 import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
@@ -22,6 +34,7 @@ import org.springframework.data.web.SortDefault;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -37,9 +50,21 @@ public class LeaderboardController {
     @Autowired
     private GuildService guildService;
 
+    @Autowired
+    private ExperienceLevelService experienceLevelService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private ExperienceRoleManagementService experienceRoleManagementService;
+
+    @Autowired
+    private ExperienceLevelManagementService experienceLevelManagementService;
+
     @GetMapping(value = "/leaderboards/{serverId}", produces = "application/json")
     public Page<UserExperienceDisplay> getLeaderboard(@PathVariable("serverId") Long serverId,
-                                                      @PageableDefault(value = 25, page = 0)
+                                                      @PageableDefault(value = 50, page = 0)
                                                     @SortDefault(sort = "experience", direction = Sort.Direction.DESC)
                                                     Pageable pageable) {
         AServer server = serverManagementService.loadServer(serverId);
@@ -49,12 +74,31 @@ public class LeaderboardController {
                 .map(userExperience -> convertFromUser(guild, userExperience, pageable, allElements));
     }
 
+    @GetMapping(value = "/leaderboards/{serverId}/{userId}", produces = "application/json")
+    public List<UserExperienceDisplay> getLeaderboardForUser(@PathVariable("serverId") Long serverId, @PathVariable("userId") Long userId,
+                                                             @RequestParam("windowSize") Integer windowSize) {
+        AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(ServerUser.fromId(serverId, userId));
+        Map<Long, AExperienceRole> experienceRolesForServer = experienceRoleManagementService.getExperienceRolesForServer(aUserInAServer.getServerReference())
+            .stream()
+            .collect(Collectors.toMap(AExperienceRole::getId, Function.identity()));
+
+        Map<Integer, AExperienceLevel> levels =
+            experienceLevelManagementService.getLevelConfig().stream().collect(Collectors.toMap(AExperienceLevel::getLevel, Function.identity()));
+        Guild guild = guildService.getGuildById(serverId);
+        List<LeaderBoardEntryResult> allElements = userExperienceManagementService.getWindowedLeaderboardEntriesForUser(aUserInAServer, windowSize);
+        return allElements.stream()
+            .map(leaderboardEntry -> convertFromLeaderboardEntry(guild, leaderboardEntry, experienceRolesForServer, levels))
+            .toList();
+    }
+
     private UserExperienceDisplay convertFromUser(Guild guild, AUserExperience aUserExperience, Pageable pageable, Page<AUserExperience> page) {
         Long userId = aUserExperience.getUser().getUserReference().getId();
         Member member = guild.getMember(UserSnowflake.fromId(userId));
         AExperienceRole experienceRole = aUserExperience.getCurrentExperienceRole();
         UserDisplay userDisplay = null;
         RoleDisplay roleDisplay = null;
+        Long experienceNeededToNextLevel = experienceLevelService.calculateExperienceToNextLevel(aUserExperience.getCurrentLevel().getLevel(), aUserExperience.getExperience());
+        Long nextLevelExperience = experienceLevelService.calculateNextLevel(aUserExperience.getCurrentLevel().getLevel()).getExperienceNeeded();
         if(experienceRole != null) {
             Role role = guild.getRoleById(experienceRole.getRole().getId());
             if(role != null) {
@@ -66,6 +110,9 @@ public class LeaderboardController {
         if(member != null) {
             userDisplay = UserDisplay.fromMember(member);
         }
+        Long currentExpNeeded = aUserExperience.getCurrentLevel().getExperienceNeeded();
+        Long experienceWithinLevel = aUserExperience.getExperience() - currentExpNeeded;
+        Long experienceNeededForCurrentLevel = nextLevelExperience - currentExpNeeded;
         return UserExperienceDisplay
                 .builder()
                 .id(String.valueOf(userId))
@@ -73,9 +120,56 @@ public class LeaderboardController {
                 .level(aUserExperience.getLevelOrDefault())
                 .rank((int) pageable.getOffset() + page.getContent().indexOf(aUserExperience) + 1)
                 .experience(aUserExperience.getExperience())
+                .experienceToNextLevel(experienceNeededToNextLevel)
+                .currentLevelExperienceNeeded(experienceNeededForCurrentLevel)
+                .experienceOnCurrentLevel(experienceWithinLevel)
+                .percentage(((float) experienceWithinLevel / experienceNeededForCurrentLevel) * 100)
+                .nextLevelExperienceNeeded(nextLevelExperience)
                 .role(roleDisplay)
                 .member(userDisplay)
                 .build();
     }
 
+    private UserExperienceDisplay convertFromLeaderboardEntry(Guild guild, LeaderBoardEntryResult leaderBoardEntryResult,
+                                                              Map<Long, AExperienceRole> experienceRolesForServer, Map<Integer, AExperienceLevel> levels) {
+        Long userId = leaderBoardEntryResult.getUserId();
+        Member member = guild.getMember(UserSnowflake.fromId(userId));
+        UserDisplay userDisplay = null;
+        RoleDisplay roleDisplay = null;
+        Long experienceNeededToNextLevel = experienceLevelService.calculateExperienceToNextLevel(leaderBoardEntryResult.getLevel(),
+            leaderBoardEntryResult.getExperience());
+        AExperienceLevel currentExperienceLevel = levels.get(leaderBoardEntryResult.getLevel());
+        Long nextLevelExperience = experienceLevelService.calculateNextLevel(leaderBoardEntryResult.getLevel()).getExperienceNeeded();
+        if(experienceRolesForServer.containsKey(leaderBoardEntryResult.getRoleId())) {
+            AExperienceRole experienceRole =  experienceRolesForServer.get(leaderBoardEntryResult.getRoleId());
+            Role role = guild.getRoleById(experienceRole.getRole().getId());
+            if(role != null) {
+                roleDisplay = RoleDisplay.fromRole(role);
+            } else {
+                roleDisplay = RoleDisplay.fromARole(experienceRole.getRole());
+            }
+        }
+        if(member != null) {
+            userDisplay = UserDisplay.fromMember(member);
+        }
+        Long currentExpNeeded = currentExperienceLevel.getExperienceNeeded();
+        Long experienceWithinLevel = leaderBoardEntryResult.getExperience() - currentExpNeeded;
+        Long experienceNeededForCurrentLevel = nextLevelExperience - currentExpNeeded;
+        return UserExperienceDisplay
+            .builder()
+            .id(String.valueOf(userId))
+            .messages(leaderBoardEntryResult.getMessageCount())
+            .level(leaderBoardEntryResult.getLevel())
+            .rank(leaderBoardEntryResult.getRank())
+            .experience(leaderBoardEntryResult.getExperience())
+            .experienceToNextLevel(experienceNeededToNextLevel)
+            .currentLevelExperienceNeeded(experienceNeededForCurrentLevel)
+            .experienceOnCurrentLevel(experienceWithinLevel)
+            .percentage(((float) experienceWithinLevel / experienceNeededForCurrentLevel) * 100)
+            .nextLevelExperienceNeeded(nextLevelExperience)
+            .role(roleDisplay)
+            .member(userDisplay)
+            .build();
+    }
+
 }

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

@@ -1,19 +1,24 @@
 package dev.sheldan.abstracto.experience.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
-import dev.sheldan.abstracto.core.command.config.*;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.ParameterValidator;
 import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValidator;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
-import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 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.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.experience.config.ExperienceFeatureDefinition;
 import dev.sheldan.abstracto.experience.config.ExperienceSlashCommandNames;
@@ -23,8 +28,10 @@ import dev.sheldan.abstracto.experience.model.LeaderBoardEntry;
 import dev.sheldan.abstracto.experience.model.template.LeaderBoardEntryModel;
 import dev.sheldan.abstracto.experience.model.template.LeaderBoardModel;
 import dev.sheldan.abstracto.experience.service.AUserExperienceService;
-import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import java.util.ArrayList;
-import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -33,11 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * Shows the experience gain information of the top 10 users in the server, or if a page number is provided as a parameter, only the members which are on this page.
  */
@@ -48,6 +50,7 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
     public static final String LEADER_BOARD_POST_EMBED_TEMPLATE = "leaderboard_post";
     private static final String LEDERBOARD_COMMAND_NAME = "leaderboard";
     private static final String PAGE_PARAMETER = "page";
+    private static final String FOCUS_PARAMETER = "focus";
     @Autowired
     private AUserExperienceService userExperienceService;
 
@@ -80,21 +83,26 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
         List<Object> parameters = commandContext.getParameters().getParameters();
         // parameter is optional, in case its not present, we default to the 0th page
         Integer page = !parameters.isEmpty() ? (Integer) parameters.get(0) : 1;
-        return getMessageToSend(commandContext.getAuthor(), page)
+        return getMessageToSend(commandContext.getAuthor(), page, false)
             .thenCompose(messageToSend -> FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel())))
             .thenApply(aVoid -> CommandResult.fromIgnored());
     }
 
-    private CompletableFuture<MessageToSend> getMessageToSend(Member actorUser, Integer page) {
+    private CompletableFuture<MessageToSend> getMessageToSend(Member actorUser, Integer page, boolean focusMe) {
         AServer server = serverManagementService.loadServer(actorUser.getGuild());
-        LeaderBoard leaderBoard = userExperienceService.findLeaderBoardData(server, page);
+        LeaderBoard leaderBoard;
+        AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(actorUser);
+        if (focusMe) {
+            leaderBoard = userExperienceService.findLeaderBoardDataForUserFocus(aUserInAServer);
+        } else {
+            leaderBoard = userExperienceService.findLeaderBoardData(server, page);
+        }
         List<CompletableFuture> futures = new ArrayList<>();
-        CompletableFuture<List<LeaderBoardEntryModel>> completableFutures = converter.fromLeaderBoard(leaderBoard);
+        CompletableFuture<List<LeaderBoardEntryModel>> completableFutures = converter.fromLeaderBoard(leaderBoard, actorUser.getGuild().getIdLong());
         futures.add(completableFutures);
         log.info("Rendering leaderboard for page {} in server {} for user {}.", page, actorUser.getId(), actorUser.getGuild().getId());
-        AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(actorUser);
         LeaderBoardEntry userRank = userExperienceService.getRankOfUserInServer(aUserInAServer);
-        CompletableFuture<List<LeaderBoardEntryModel>> userRankFuture = converter.fromLeaderBoardEntry(Arrays.asList(userRank));
+        CompletableFuture<List<LeaderBoardEntryModel>> userRankFuture = converter.fromLeaderBoardEntry(Arrays.asList(userRank), actorUser.getGuild().getIdLong());
         futures.add(userRankFuture);
         String leaderboardUrl;
         if(!StringUtils.isBlank(leaderboardExternalURL)) {
@@ -108,6 +116,7 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
                     .builder()
                     .userExperiences(finalModels)
                     .leaderboardUrl(leaderboardUrl)
+                    .showPlacement(!focusMe)
                     .userExecuting(userRankFuture.join().get(0))
                     .build();
             return CompletableFuture.completedFuture(templateService.renderEmbedTemplate(LEADER_BOARD_POST_EMBED_TEMPLATE, leaderBoardModel, actorUser.getGuild().getIdLong()));
@@ -118,12 +127,18 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         Integer page;
+        boolean focusMe;
+        if (slashCommandParameterService.hasCommandOption(FOCUS_PARAMETER, event)) {
+            focusMe = slashCommandParameterService.getCommandOption(FOCUS_PARAMETER, event, Boolean.class);
+        } else {
+            focusMe = false;
+        }
         if(slashCommandParameterService.hasCommandOption(PAGE_PARAMETER, event)) {
             page = slashCommandParameterService.getCommandOption(PAGE_PARAMETER, event, Integer.class);
         } else {
             page = 1;
         }
-        return getMessageToSend(event.getMember(), page)
+        return getMessageToSend(event.getMember(), page, focusMe)
                 .thenCompose(messageToSend -> interactionService.replyMessageToSend(messageToSend, event))
                 .thenApply(aVoid -> CommandResult.fromIgnored());
     }
@@ -139,7 +154,17 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
                 .templated(true)
                 .type(Integer.class)
                 .build();
-        List<Parameter> parameters = Arrays.asList(pageParameter);
+
+        Parameter focusMe = Parameter
+            .builder()
+            .name(FOCUS_PARAMETER)
+            .validators(leaderBoardPageValidators)
+            .optional(true)
+            .slashCommandOnly(true)
+            .templated(true)
+            .type(Boolean.class)
+            .build();
+        List<Parameter> parameters = Arrays.asList(pageParameter, focusMe);
         HelpInfo helpInfo = HelpInfo
                 .builder()
                 .templated(true)

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

@@ -30,7 +30,9 @@ import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,6 +80,9 @@ public class Rank extends AbstractConditionableCommand {
     @Autowired
     private InteractionService interactionService;
 
+    @Value("${abstracto.experience.leaderboard.externalUrl}")
+    private String leaderboardExternalURL;
+
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
@@ -87,7 +92,7 @@ public class Rank extends AbstractConditionableCommand {
         }
         AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(targetMember);
         LeaderBoardEntry userRank = userExperienceService.getRankOfUserInServer(aUserInAServer);
-        CompletableFuture<List<LeaderBoardEntryModel>> future = converter.fromLeaderBoardEntry(Arrays.asList(userRank));
+        CompletableFuture<List<LeaderBoardEntryModel>> future = converter.fromLeaderBoardEntry(Arrays.asList(userRank), commandContext.getGuild().getIdLong());
         RankModel rankModel = RankModel
                 .builder()
                 .member(targetMember)
@@ -107,14 +112,21 @@ public class Rank extends AbstractConditionableCommand {
         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 experienceNeededForCurrentLevel = nextLevelExperience - currentExpNeeded;
-        Long inLevelExperience = experienceObj.getExperience() - currentExpNeeded;
+        Long experienceWithinLevel = experienceObj.getExperience() - currentExpNeeded;
         rankModel.setExperienceForCurrentLevel(currentExpNeeded);
-        rankModel.setCurrentLevelPercentage(((float) inLevelExperience / levelExperience) * 100);
+        rankModel.setCurrentLevelPercentage(((float) experienceWithinLevel / experienceNeededForCurrentLevel) * 100);
-        rankModel.setLevelExperience(levelExperience);
+        rankModel.setLevelExperience(experienceNeededForCurrentLevel);
         rankModel.setExperienceToNextLevel(experienceNeededToNextLevel);
-        rankModel.setInLevelExperience(inLevelExperience);
+        rankModel.setInLevelExperience(experienceWithinLevel);
         rankModel.setNextLevelExperience(nextLevelExperience);
+        String leaderboardUrl;
+        if(!StringUtils.isBlank(leaderboardExternalURL)) {
+            leaderboardUrl = String.format("%s/experience/leaderboards/%s/%s", leaderboardExternalURL, toRender.getGuild().getIdLong(), toRender.getId());
+        } else {
+            leaderboardUrl = null;
+        }
+        rankModel.setLeaderboardUrl(leaderboardUrl);
         return templateService.renderEmbedTemplate(RANK_POST_EMBED_TEMPLATE, rankModel, toRender.getGuild().getIdLong());
     }
 
@@ -128,7 +140,7 @@ public class Rank extends AbstractConditionableCommand {
         }
         AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(targetMember);
         LeaderBoardEntry userRank = userExperienceService.getRankOfUserInServer(aUserInAServer);
-        CompletableFuture<List<LeaderBoardEntryModel>> future = converter.fromLeaderBoardEntry(Arrays.asList(userRank));
+        CompletableFuture<List<LeaderBoardEntryModel>> future = converter.fromLeaderBoardEntry(Arrays.asList(userRank), event.getGuild().getIdLong());
         RankModel rankModel = RankModel
                 .builder()
                 .member(targetMember)

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java

@@ -3,7 +3,6 @@ package dev.sheldan.abstracto.experience.converter;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.experience.model.LeaderBoard;
 import dev.sheldan.abstracto.experience.model.LeaderBoardEntry;
-import dev.sheldan.abstracto.experience.model.database.AUserExperience;
 import dev.sheldan.abstracto.experience.model.template.LeaderBoardEntryModel;
 import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,26 +41,23 @@ public class LeaderBoardModelConverter {
      * @return The list of {@link LeaderBoardEntryModel leaderboarEntryModels} which contain the fully fledged information provided to the
      * leader board template
      */
-    public CompletableFuture<List<LeaderBoardEntryModel>> fromLeaderBoard(LeaderBoard leaderBoard) {
+    public CompletableFuture<List<LeaderBoardEntryModel>> fromLeaderBoard(LeaderBoard leaderBoard, Long serverId) {
         log.debug("Converting {} entries to a list of leaderboard entries.", leaderBoard.getEntries().size());
-        return fromLeaderBoardEntry(leaderBoard.getEntries());
+        return fromLeaderBoardEntry(leaderBoard.getEntries(), serverId);
     }
 
-    public CompletableFuture<List<LeaderBoardEntryModel>> fromLeaderBoardEntry(List<LeaderBoardEntry> leaderBoardEntries) {
+    public CompletableFuture<List<LeaderBoardEntryModel>> fromLeaderBoardEntry(List<LeaderBoardEntry> leaderBoardEntries, Long serverId) {
         List<Long> userIds = new ArrayList<>();
-        Long serverId = leaderBoardEntries.get(0).getExperience().getServer().getId();
         Map<Long, LeaderBoardEntryModel> models = leaderBoardEntries
                 .stream()
                 .map(leaderBoardEntry -> {
-                    AUserExperience experience = leaderBoardEntry.getExperience();
+                    userIds.add(leaderBoardEntry.getUserId());
-                    Long userId = experience.getUser().getUserReference().getId();
-                    userIds.add(userId);
                     return LeaderBoardEntryModel
                             .builder()
-                            .userId(userId)
+                            .userId(leaderBoardEntry.getUserId())
-                            .experience(experience.getExperience())
+                            .experience(leaderBoardEntry.getExperience())
-                            .messageCount(experience.getMessageCount())
+                            .messageCount(leaderBoardEntry.getMessageCount())
-                            .level(experience.getLevelOrDefault())
+                            .level(leaderBoardEntry.getLevel())
                             .rank(leaderBoardEntry.getRank())
                             .build();
                 })

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

@@ -48,7 +48,7 @@ public class AddMemberToChannelLevelAction implements LevelActionListener {
     }
 
     @Override
-    public boolean shouldExecute(AUserExperience aUserExperience, LevelAction levelAction) {
+    public boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction) {
         return aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
     }
 

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

@@ -48,7 +48,7 @@ public class AddRoleLevelAction implements LevelActionListener {
     }
 
     @Override
-    public boolean shouldExecute(AUserExperience aUserExperience, LevelAction levelAction) {
+    public boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction) {
         return aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
     }
 

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

@@ -48,7 +48,7 @@ public class RemoveMemberFromChannelLevelAction implements LevelActionListener {
     }
 
     @Override
-    public boolean shouldExecute(AUserExperience aUserExperience, LevelAction levelAction) {
+    public boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction) {
         return aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
     }
 

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

@@ -49,7 +49,7 @@ public class RemoveRoleLevelAction implements LevelActionListener {
     }
 
     @Override
-    public boolean shouldExecute(AUserExperience aUserExperience, LevelAction levelAction) {
+    public boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction) {
         return aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
     }
 

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

@@ -0,0 +1,106 @@
+package dev.sheldan.abstracto.experience.listener;
+
+import com.google.gson.Gson;
+import dev.sheldan.abstracto.core.exception.InputFormatException;
+import dev.sheldan.abstracto.core.models.ServerUser;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.MemberService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.abstracto.core.utils.ParseUtils;
+import dev.sheldan.abstracto.experience.model.LevelActionPayload;
+import dev.sheldan.abstracto.experience.model.SendMessageToChannelLevelActionMessageModel;
+import dev.sheldan.abstracto.experience.model.SendMessageToChannelLevelActionPayload;
+import dev.sheldan.abstracto.experience.model.database.AUserExperience;
+import dev.sheldan.abstracto.experience.model.database.LevelAction;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class SendMessageToChannelLevelAction implements LevelActionListener {
+
+    public static final String ACTION_NAME = "send_message_to_channel_above_level";
+    private static final String LEVEL_ACTION_SEND_MESSAGE_TEMPLATE_KEY = "levelAction_sendMessageToChannel_template";
+
+    @Autowired
+    private Gson gson;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private MemberService memberService;
+
+    @Override
+    public String getName() {
+        return ACTION_NAME;
+    }
+
+    @Override
+    public void apply(AUserExperience userExperience, LevelAction levelAction, MemberActionModification container) {
+        SendMessageToChannelLevelActionPayload payload = (SendMessageToChannelLevelActionPayload) levelAction.getLoadedPayload();
+        SendMessageToChannelLevelActionMessageModel.SendMessageToChannelLevelActionMessageModelBuilder messageModelBuilder = SendMessageToChannelLevelActionMessageModel
+                .builder()
+                .level(userExperience.getLevelOrDefault())
+                .templateKey(payload.getTemplateKey())
+                .experience(userExperience.getExperience());
+        ServerUser serverUser = ServerUser.fromAUserInAServer(userExperience.getUser());
+        memberService.getMemberInServerAsync(serverUser).thenAccept(member -> {
+            messageModelBuilder.memberDisplay(MemberDisplay.fromMember(member));
+            SendMessageToChannelLevelActionMessageModel model = messageModelBuilder.build();
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(LEVEL_ACTION_SEND_MESSAGE_TEMPLATE_KEY, model, serverUser.getServerId());
+            GuildMessageChannel targetChannel = channelService.getMessageChannelFromServer(serverUser.getServerId(), payload.getChannelId());
+            FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, targetChannel)).thenAccept(unused -> {
+                log.info("Send message to channel action sent a message to channel {} for user {} in server {}.", payload.getChannelId(), serverUser.getUserId(), serverUser.getServerId());
+            }).exceptionally(throwable -> {
+                log.warn("Send message to channel action failed to send a message to channel {} for user {} in server {}.", payload.getChannelId(), serverUser.getUserId(), serverUser.getServerId(), throwable);
+                return null;
+            });
+        }).exceptionally(throwable -> {
+            log.warn("Failed to load member {} in server {} for send message level action towards channel {}.", serverUser.getUserId(), serverUser.getServerId(), payload.getChannelId());
+            return null;
+        });
+    }
+
+    @Override
+    public boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction) {
+        if(!oldLevel.equals(aUserExperience.getLevelOrDefault())) { // this means the user changed level now, this is the path from gaining a lot of experience
+            boolean jumpedLevelToMatch = oldLevel < levelAction.getLevel().getLevel() && aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
+            // this boolean means that the user did NOT have the action earlier, but does now (and more than that)
+            return jumpedLevelToMatch || aUserExperience.getLevelOrDefault().equals(levelAction.getLevel().getLevel()); // or the user matches the level _exactly_, this is the path from normally gaining experience
+        } else {
+            // This case is useful for re-joining, because this means, that the user did _not_ change level, and already is somewhere way above
+            return aUserExperience.getLevelOrDefault() >= levelAction.getLevel().getLevel();
+        }
+    }
+
+    @Override
+    public void prepareAction(LevelAction levelAction) {
+        levelAction.setLoadedPayload(gson.fromJson(levelAction.getPayload(), SendMessageToChannelLevelActionPayload.class));
+    }
+
+    @Override
+    public LevelActionPayload createPayload(Guild guild, String input) {
+        if(!input.contains(";")) {
+            throw new InputFormatException(input, "<#channel>;template_key");
+        }
+        String channelPart = input.substring(0, input.indexOf(";"));
+        GuildChannel channel = ParseUtils.parseGuildChannelFromText(channelPart, guild);
+        String templateKey = input.substring(input.indexOf(";") + 1);
+        return SendMessageToChannelLevelActionPayload
+                .builder()
+                .channelId(channel.getIdLong())
+                .templateKey(templateKey)
+                .build();
+    }
+}

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/model/SendMessageToChannelLevelActionMessageModel.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.experience.model;
+
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class SendMessageToChannelLevelActionMessageModel implements LevelActionPayload {
+    private MemberDisplay memberDisplay;
+    private Integer level;
+    private Long experience;
+    private String templateKey;
+}

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/model/SendMessageToChannelLevelActionPayload.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.experience.model;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class SendMessageToChannelLevelActionPayload implements LevelActionPayload {
+    private Long channelId;
+    private String templateKey;
+}

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/model/api/UserExperienceDisplay.java

@@ -16,4 +16,9 @@ public class UserExperienceDisplay {
     private Long experience;
     private Long messages;
     private RoleDisplay role;
+    private Long experienceToNextLevel;
+    private Long experienceOnCurrentLevel;
+    private Long currentLevelExperienceNeeded;
+    private Float percentage;
+    private Long nextLevelExperienceNeeded;
 }

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/repository/UserExperienceRepository.java

@@ -55,6 +55,33 @@ public interface UserExperienceRepository  extends JpaRepository<AUserExperience
             "WHERE rank.id = :userInServerId", nativeQuery = true)
     LeaderBoardEntryResult getRankOfUserInServer(@Param("userInServerId") Long id, @Param("serverId") Long serverId);
 
+    @Query(value = "WITH user_experience_ranked AS" +
+        "            ( " +
+        "                SELECT us.id, uis.user_id, us.experience, us.role_id, us.level_id, us.message_count, ROW_NUMBER() OVER ( ORDER BY experience DESC ) as rank" +
+        "                FROM user_experience us INNER JOIN user_in_server uis ON us.id = uis.user_in_server_id " +
+        "                INNER JOIN server s ON s.id = uis.server_id WHERE s.id = :serverId" +
+        "            )," +
+        "            user_experience_target as (" +
+        "                SELECT ranking.id as id, ranking.user_id, ranking.experience as experience, ranking.message_count, ranking.level_id as level, ranking.rank " +
+        "                FROM user_experience_ranked ranking" +
+        "                WHERE ranking.id = :userInServerId" +
+        "            )" +
+        "    (SELECT r.id, r.user_id as userId, r.experience, r.level_id as level, r.role_id as roleId, r.message_count as messageCount, r.rank as rank" +
+        "    FROM user_experience_ranked r " +
+        "       CROSS JOIN user_experience_target t" +
+        "    WHERE r.rank <= t.rank " +
+        "    ORDER BY r.rank DESC " +
+        "    LIMIT :before) " +
+        "UNION ALL " +
+        "   (SELECT r.id, r.user_id as userId, r.experience, r.level_id as level, r.role_id as roleId, r.message_count as messageCount, r.rank as rank" +
+        "    FROM user_experience_ranked r" +
+        "       CROSS JOIN user_experience_target t" +
+        "    WHERE r.rank > t.rank " +
+        "    ORDER BY r.rank " +
+        "    LIMIT :after) " +
+        "ORDER BY rank", nativeQuery = true)
+    List<LeaderBoardEntryResult> getRankOfUserWithWindow(@Param("userInServerId") Long id, @Param("serverId") Long serverId, @Param("before") Long beforeInclusive, @Param("after") Long after);
+
     @Modifying(clearAutomatically = true)
     @Query("update AUserExperience u set u.currentExperienceRole = null where u.currentExperienceRole.id = :roleId")
     void removeExperienceRoleFromUsers(@Param("roleId") Long experienceRoleId);

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

@@ -337,8 +337,8 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
                     .builder()
                     .build();
             boolean userChangesLevel = !Objects.equals(newLevel.getLevel(), aUserExperience.getCurrentLevel().getLevel());
+            Integer oldLevel = aUserExperience.getCurrentLevel() != null ? aUserExperience.getCurrentLevel().getLevel() : 0;
             if(userChangesLevel) {
-                Integer oldLevel = aUserExperience.getCurrentLevel() != null ? aUserExperience.getCurrentLevel().getLevel() : 0;
                 log.info("User {} in server {} changed level. New {}, Old {}.", member.getIdLong(),
                         member.getGuild().getIdLong(), newLevel.getLevel(),
                         oldLevel);
@@ -361,7 +361,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
                             .newRole(oldRoleId != null ? RoleDisplay.fromRole(oldRoleId) : null)
                             .newRole(newRoleId != null ? RoleDisplay.fromRole(newRoleId) : null)
                             .build();
-                    MessageToSend messageToSend = templateService.renderEmbedTemplate("experience_level_up_notification", model);
+                    MessageToSend messageToSend = templateService.renderEmbedTemplate("experience_level_up_notification", model, serverId);
                     FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, message.getChannel())).thenAccept(unused -> {
                         log.info("Sent level up notification to user {} in server {} in channel {}.", member.getIdLong(), serverId, message.getChannel().getIdLong());
                     }).exceptionally(throwable -> {
@@ -373,7 +373,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
             }
             aUserExperience.setMessageCount(aUserExperience.getMessageCount() + 1L);
             if(userChangesLevel && featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, server, ExperienceFeatureMode.LEVEL_ACTION)) {
-                levelActionService.applyLevelActionsToUser(aUserExperience)
+                levelActionService.applyLevelActionsToUser(aUserExperience, oldLevel)
                     .thenAccept(unused -> {
                         log.info("Executed level actions for user {}.", userInServerId);
                     })
@@ -491,11 +491,32 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
         int pageOffset = page * pageSize;
         for (int i = 0; i < experiences.size(); i++) {
             AUserExperience userExperience = experiences.get(i);
-            entries.add(LeaderBoardEntry.builder().experience(userExperience).rank(pageOffset + i + 1).build());
+            LeaderBoardEntry entry = LeaderBoardEntry.fromAUserExperience(userExperience);
+            entry.setRank(pageOffset + i + 1);
+            entries.add(entry);
         }
         return LeaderBoard.builder().entries(entries).build();
     }
 
+    @Override
+    public LeaderBoard findLeaderBoardDataForUserFocus(AUserInAServer aUserInAServer) {
+        List<LeaderBoardEntry> allEntries =
+            userExperienceManagementService.getWindowedLeaderboardEntriesForUser(aUserInAServer, 10)
+                .stream().map(leaderBoardEntryResult -> LeaderBoardEntry
+                    .builder()
+                    .experience(leaderBoardEntryResult.getExperience())
+                    .level(leaderBoardEntryResult.getLevel())
+                    .userId(leaderBoardEntryResult.getUserId())
+                    .messageCount(leaderBoardEntryResult.getMessageCount())
+                    .rank(leaderBoardEntryResult.getRank())
+                    .build())
+                .collect(Collectors.toList());
+        return LeaderBoard
+            .builder()
+            .entries(allEntries)
+            .build();
+    }
+
     @Override
     public LeaderBoardEntry getRankOfUserInServer(AUserInAServer userInAServer) {
         log.debug("Retrieving rank for {}", userInAServer.getUserReference().getId());
@@ -509,7 +530,9 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
         if(rankOfUserInServer != null) {
             rank = rankOfUserInServer.getRank();
         }
-        return LeaderBoardEntry.builder().experience(aUserExperience).rank(rank).build();
+        LeaderBoardEntry entry = LeaderBoardEntry.fromAUserExperience(aUserExperience);
+        entry.setRank(rank);
+        return entry;
     }
 
 }

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

@@ -49,6 +49,11 @@ public class LevelActionServiceBean implements LevelActionService {
 
     @Override
     public CompletableFuture<Void> applyLevelActionsToUser(AUserExperience user) {
+        return applyLevelActionsToUser(user,  user.getLevelOrDefault());
+    }
+
+    @Override
+    public CompletableFuture<Void> applyLevelActionsToUser(AUserExperience user, Integer oldLevel) {
         if(levelActions == null || levelActions.isEmpty()) {
             return CompletableFuture.completedFuture(null);
         }
@@ -60,8 +65,16 @@ public class LevelActionServiceBean implements LevelActionService {
 
         Map<Integer, List<LevelAction>> actionConfigMap = new HashMap<>();
 
+        Map<String, LevelActionListener> actionStringListenerMap = levelActions
+                .stream()
+                .collect(Collectors.toMap(a -> a.getName().toLowerCase(), Function.identity()));
+
         levelActionsOfUserInServer.forEach(levelAction -> {
-            if(levelAction.getLevel().getLevel() > user.getLevelOrDefault()) {
+            LevelActionListener listener = actionStringListenerMap.get(levelAction.getAction());
+            if(listener == null) { // if for some reason the config is still in the database, but we don't have code for it anymore
+                return;
+            }
+            if(!listener.shouldExecute(user, oldLevel, levelAction)) {
                 return;
             }
             if(actionConfigMap.containsKey(levelAction.getLevel().getLevel())) {
@@ -73,9 +86,6 @@ public class LevelActionServiceBean implements LevelActionService {
             }
         });
 
-        Map<String, LevelActionListener> actionStringListenerMap = levelActions
-                .stream()
-                .collect(Collectors.toMap(a -> a.getName().toLowerCase(), Function.identity()));
 
         List<Integer> levels = actionConfigMap
                 .keySet()

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

@@ -82,6 +82,12 @@ public class UserExperienceManagementServiceBean implements UserExperienceManage
         return repository.findTop10ByUser_ServerReferenceOrderByExperienceDesc(aServer, PageRequest.of(page, size));
     }
 
+    @Override
+    public List<LeaderBoardEntryResult> getWindowedLeaderboardEntriesForUser(AUserInAServer aUserInAServer, Integer windowSize) {
+        return repository.getRankOfUserWithWindow(aUserInAServer.getUserInServerId(), aUserInAServer.getServerReference().getId(),  windowSize.longValue() / 2 + 1,
+            windowSize.longValue() / 2);
+    }
+
     @Override
     public LeaderBoardEntryResult getRankOfUserInServer(AUserExperience userExperience) {
         return repository.getRankOfUserInServer(userExperience.getId(), userExperience.getServer().getId());

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverterTest.java

@@ -1,87 +0,0 @@
-package dev.sheldan.abstracto.experience.converter;
-
-import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.core.models.database.AUser;
-import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.core.service.MemberService;
-import dev.sheldan.abstracto.experience.model.LeaderBoard;
-import dev.sheldan.abstracto.experience.model.LeaderBoardEntry;
-import dev.sheldan.abstracto.experience.model.database.AUserExperience;
-import dev.sheldan.abstracto.experience.model.template.LeaderBoardEntryModel;
-import net.dv8tion.jda.api.entities.Member;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class LeaderBoardModelConverterTest {
-
-    @InjectMocks
-    public LeaderBoardModelConverter testUnit;
-
-    @Mock
-    private MemberService memberService;
-
-    @Mock
-    private LeaderBoardModelConverter self;
-
-    private static final Long SERVER_ID = 4L;
-    private static final Long USER_ID = 5L;
-    private static final Long USER_ID_2 = 6L;
-    private static final Long USER_IN_SERVER_ID = 7L;
-    private static final Long USER_IN_SERVER_ID_2 = 8L;
-    private static final Long EXPERIENCE = 9L;
-    private static final Long MESSAGES = 10L;
-    private static final Integer LEVEL = 54;
-
-    @Test
-    public void testFromLeaderBoard() {
-        Integer firstRank = 1;
-
-        LeaderBoardEntry entry = getEntry(firstRank, USER_ID, USER_IN_SERVER_ID);
-        Integer secondRank = 2;
-        LeaderBoardEntry entry2 = getEntry(secondRank, USER_ID_2, USER_IN_SERVER_ID_2);
-        List<LeaderBoardEntry> entries = Arrays.asList(entry, entry2);
-        LeaderBoard leaderBoard = Mockito.mock(LeaderBoard.class);
-        when(leaderBoard.getEntries()).thenReturn(entries);
-        Member member = Mockito.mock(Member.class);
-        when(member.getIdLong()).thenReturn(USER_ID);
-        when(memberService.getMembersInServerAsync(SERVER_ID, Arrays.asList(USER_ID, USER_ID_2))).thenReturn(CompletableFuture.completedFuture(Arrays.asList(member)));
-        CompletableFuture<List<LeaderBoardEntryModel>> leaderBoardEntryModels = testUnit.fromLeaderBoard(leaderBoard);
-        LeaderBoardEntryModel firstEntry = leaderBoardEntryModels.join().get(0);
-        Assert.assertEquals(USER_ID, firstEntry.getUserId());
-        LeaderBoardEntryModel secondEntry = leaderBoardEntryModels.join().get(1);
-        Assert.assertEquals(USER_ID_2, secondEntry.getUserId());
-        Assert.assertEquals(entries.size(), leaderBoardEntryModels.join().size());
-    }
-
-    private LeaderBoardEntry getEntry(Integer rank, Long userId, Long userInServerId) {
-        AUserExperience experience = Mockito.mock(AUserExperience.class);
-        when(experience.getMessageCount()).thenReturn(MESSAGES);
-        when(experience.getExperience()).thenReturn(EXPERIENCE);
-        AUserInAServer userInAServer = Mockito.mock(AUserInAServer.class);
-        when(experience.getUser()).thenReturn(userInAServer);
-        AUser user = Mockito.mock(AUser.class);
-        when(userInAServer.getUserReference()).thenReturn(user);
-        when(user.getId()).thenReturn(userId);
-        AServer server = Mockito.mock(AServer.class);
-        when(experience.getServer()).thenReturn(server);
-        when(server.getId()).thenReturn(SERVER_ID);
-        LeaderBoardEntry entry =  Mockito.mock(LeaderBoardEntry.class);
-        when(entry.getRank()).thenReturn(rank);
-        when(entry.getExperience()).thenReturn(experience);
-        return entry;
-    }
-
-
-}

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

@@ -0,0 +1,84 @@
+package dev.sheldan.abstracto.experience.listener;
+
+import dev.sheldan.abstracto.experience.model.database.AExperienceLevel;
+import dev.sheldan.abstracto.experience.model.database.AUserExperience;
+import dev.sheldan.abstracto.experience.model.database.LevelAction;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AddRoleLevelActionTest {
+    @InjectMocks
+    private AddRoleLevelAction action;
+
+    @Mock
+    private AUserExperience exp;
+
+    @Mock
+    private LevelAction levelAction;
+
+    @Mock
+    private AExperienceLevel level;
+
+    private final Integer LOW_LEVEL = 1;
+    private final Integer MID_LEVEL = 2;
+    private final Integer HIGH_LEVEL = 3;
+
+    @Before
+    public void setup() {
+        when(levelAction.getLevel()).thenReturn(level);
+    }
+
+    @Test // rejoin too low case
+    public void noLevelChangeActionNotReached() {
+        executeTest(LOW_LEVEL, LOW_LEVEL, HIGH_LEVEL, false);
+    }
+
+    @Test // re-join exact case
+    public void noLevelChangeActionReached() {
+        executeTest(LOW_LEVEL, LOW_LEVEL, LOW_LEVEL, true);
+    }
+
+    @Test // normal leveling, higher action
+    public void levelChangeActionNotReached() {
+        executeTest(LOW_LEVEL, MID_LEVEL, HIGH_LEVEL, false);
+    }
+
+    @Test // normal leveling
+    public void levelChangeActionReached() {
+        executeTest(LOW_LEVEL, MID_LEVEL, MID_LEVEL, true);
+    }
+
+    @Test // a case for this is a large experience jump
+    public void levelChangeActionOverJumped() {
+        executeTest(LOW_LEVEL, HIGH_LEVEL, MID_LEVEL, true);
+    }
+
+    @Test // a case for this is a re-join
+    public void noLevelChangeActionOverJumped() {
+        executeTest(HIGH_LEVEL, HIGH_LEVEL, LOW_LEVEL, true);
+    }
+
+    @Test // we dont want to re-execute previous actions (previous = lower level)
+    public void levelChangeActionEqualsPrevious() {
+        executeTest(LOW_LEVEL, MID_LEVEL, LOW_LEVEL, true);
+    }
+
+    @Test // we dont want to re-execute previous actions (previous = way lower level)
+    public void levelChangeActionBelow() {
+        executeTest(MID_LEVEL, HIGH_LEVEL, LOW_LEVEL, true);
+    }
+
+    private void executeTest(Integer oldLevel, Integer currentLevel, Integer actionLevel, boolean expected) {
+        when(exp.getLevelOrDefault()).thenReturn(currentLevel);
+        when(level.getLevel()).thenReturn(actionLevel);
+        Assertions.assertThat(action.shouldExecute(exp, oldLevel, levelAction)).isEqualTo(expected);
+    }
+}

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

@@ -0,0 +1,86 @@
+package dev.sheldan.abstracto.experience.listener;
+
+import dev.sheldan.abstracto.experience.model.database.AExperienceLevel;
+import dev.sheldan.abstracto.experience.model.database.AUserExperience;
+import dev.sheldan.abstracto.experience.model.database.LevelAction;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RemoveMemberFromChannelLevelActionTest {
+
+     @InjectMocks
+     private SendMessageToChannelLevelAction action;
+
+     @Mock
+     private AUserExperience exp;
+
+     @Mock
+     private LevelAction levelAction;
+
+     @Mock
+     private AExperienceLevel level;
+
+     private final Integer LOW_LEVEL = 1;
+     private final Integer MID_LEVEL = 2;
+     private final Integer HIGH_LEVEL = 3;
+
+     @Before
+     public void setup() {
+         when(levelAction.getLevel()).thenReturn(level);
+     }
+
+     @Test // rejoin too low case
+     public void noLevelChangeActionNotReached() {
+         executeTest(LOW_LEVEL, LOW_LEVEL, HIGH_LEVEL, false);
+     }
+
+    @Test // re-join exact case
+    public void noLevelChangeActionReached() {
+        executeTest(LOW_LEVEL, LOW_LEVEL, LOW_LEVEL, true);
+    }
+
+    @Test // normal leveling, higher action
+    public void levelChangeActionNotReached() {
+         executeTest(LOW_LEVEL, MID_LEVEL, HIGH_LEVEL, false);
+    }
+
+    @Test // normal leveling
+    public void levelChangeActionReached() {
+         executeTest(LOW_LEVEL, MID_LEVEL, MID_LEVEL, true);
+    }
+
+    @Test // a case for this is a large experience jump
+    public void levelChangeActionOverJumped() {
+        executeTest(LOW_LEVEL, HIGH_LEVEL, MID_LEVEL, true);
+    }
+
+    @Test // a case for this is a re-join
+    public void noLevelChangeActionOverJumped() {
+        executeTest(HIGH_LEVEL, HIGH_LEVEL, LOW_LEVEL, true);
+    }
+
+    @Test // we dont want to re-execute previous actions (previous = lower level)
+    public void levelChangeActionEqualsPrevious() {
+         executeTest(LOW_LEVEL, MID_LEVEL, LOW_LEVEL, false);
+    }
+
+    @Test // we dont want to re-execute previous actions (previous = way lower level)
+    public void levelChangeActionBelow() {
+        executeTest(MID_LEVEL, HIGH_LEVEL, LOW_LEVEL, false);
+    }
+
+    private void executeTest(Integer oldLevel, Integer currentLevel, Integer actionLevel, boolean expected) {
+        when(exp.getLevelOrDefault()).thenReturn(currentLevel);
+        when(level.getLevel()).thenReturn(actionLevel);
+        Assertions.assertThat(action.shouldExecute(exp, oldLevel, levelAction)).isEqualTo(expected);
+    }
+
+}

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

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

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/listener/LevelActionListener.java

@@ -4,15 +4,13 @@ import dev.sheldan.abstracto.experience.model.LevelActionPayload;
 import dev.sheldan.abstracto.experience.model.database.AUserExperience;
 import dev.sheldan.abstracto.experience.model.database.LevelAction;
 import net.dv8tion.jda.api.entities.Guild;
-import org.springframework.stereotype.Component;
 
-@Component
 public interface LevelActionListener {
     String getName();
 
     void apply(AUserExperience userExperience, LevelAction levelAction, MemberActionModification container);
 
-    boolean shouldExecute(AUserExperience aUserExperience, LevelAction levelAction);
+    boolean shouldExecute(AUserExperience aUserExperience, Integer oldLevel, LevelAction levelAction);
 
     void prepareAction(LevelAction levelAction);
 

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

@@ -12,12 +12,19 @@ import lombok.Setter;
 @Setter
 @Builder
 public class LeaderBoardEntry {
-    /**
+    private Long userId;
-     * Object representing the current experience status of a user in a guild.
+    private Integer level;
-     */
+    private Long experience;
-    private AUserExperience experience;
+    private Long messageCount;
-    /**
-     * The rank this user has in the respective guild.
-     */
     private Integer rank;
+
+    public static LeaderBoardEntry fromAUserExperience(AUserExperience aUserExperience) {
+        return LeaderBoardEntry
+            .builder()
+            .experience(aUserExperience.getExperience())
+            .userId(aUserExperience.getUser().getUserReference().getId())
+            .messageCount(aUserExperience.getMessageCount())
+            .level(aUserExperience.getLevelOrDefault())
+            .build();
+    }
 }

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

@@ -7,11 +7,8 @@ public interface LeaderBoardEntryResult {
 
     Long getId();
 
-    /**
+    Long getUserId();
-     * The {@link dev.sheldan.abstracto.core.models.database.AUserInAServer} id of the user
+    Long getRoleId();
-     * @return The ID of the user in a server
-     */
-    Long getUserInServerId();
 
     /**
      * The experience of the {@link dev.sheldan.abstracto.core.models.database.AUserInAServer}

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

@@ -1,6 +1,7 @@
 package dev.sheldan.abstracto.experience.model.template;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
@@ -25,4 +26,9 @@ public class LeaderBoardModel extends SlimUserInitiatedServerContext {
      */
     private LeaderBoardEntryModel userExecuting;
     private String leaderboardUrl;
+    /**
+     * Whether to show the users own placement
+     */
+    @Builder.Default
+    private boolean showPlacement = true;
 }

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

@@ -47,4 +47,5 @@ public class RankModel {
      * The member to show the rank for
      */
     private Member member;
+    private String leaderboardUrl;
 }

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

@@ -54,6 +54,7 @@ public interface AUserExperienceService {
      * from the desired page
      */
     LeaderBoard findLeaderBoardData(AServer server, Integer page);
+    LeaderBoard findLeaderBoardDataForUserFocus(AUserInAServer aUserInAServer);
 
     /**
      * Retrieves the {@link LeaderBoardEntry} from a specific {@link AUserInAServer} containing information about the

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

@@ -12,6 +12,7 @@ import java.util.concurrent.CompletableFuture;
 
 public interface LevelActionService {
     CompletableFuture<Void> applyLevelActionsToUser(AUserExperience user);
+    CompletableFuture<Void> applyLevelActionsToUser(AUserExperience user, Integer oldLevel);
     List<String> getAvailableLevelActions();
     Optional<LevelActionListener> getLevelActionListenerForName(String name);
 

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

@@ -62,6 +62,7 @@ public interface UserExperienceManagementService {
      * @return A list desc ordered by {@link AUserExperience} experience only containing the elements between {@code start} and @{code end}
      */
     List<AUserExperience> findLeaderBoardUsersPaginated(AServer server, Integer page, Integer size);
+    List<LeaderBoardEntryResult> getWindowedLeaderboardEntriesForUser(AUserInAServer aUserInAServer, Integer windowSize);
 
     /**
      * Returns the {@link LeaderBoardEntryResult} of the given {@link AUserExperience}.

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

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

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

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

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

@@ -130,7 +130,7 @@ public class GiveawayServiceBean implements GiveawayService {
         giveawayMessageModel.setJoinedUserCount(giveaway.getParticipants().size() + 1L);
         Long giveawayId = giveaway.getGiveawayId().getId();
         log.info("Adding giveaway participating of user {} to giveaway {} in server {}.", member.getIdLong(), giveawayId, member.getGuild().getIdLong());
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel, member.getGuild().getIdLong());
         return channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), messageChannel, giveaway.getMessageId())
                 .thenAccept(message -> {
             self.persistAddedParticipant(member, giveawayId);
@@ -183,13 +183,13 @@ public class GiveawayServiceBean implements GiveawayService {
                 .winners(winnerDisplays)
                 .build();
         log.info("Sending result message for giveaway {} in server {}.", giveawayId, serverId);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(GIVEAWAY_RESULT_MESSAGE_TEMPLATE_KEY, resultModel);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(GIVEAWAY_RESULT_MESSAGE_TEMPLATE_KEY, resultModel, serverId);
         List<CompletableFuture<Message>> resultFutures = channelService.sendMessageEmbedToSendToAChannel(messageToSend, giveaway.getGiveawayChannel());
 
         GiveawayMessageModel giveawayMessageModel = GiveawayMessageModel.fromGiveaway(giveaway);
         giveawayMessageModel.setWinners(winnerDisplays);
         giveawayMessageModel.setEnded(true);
-        MessageToSend giveawayMessageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel);
+        MessageToSend giveawayMessageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel, serverId);
         log.info("Updating original giveaway message for giveaway {} in server {}.", giveawayId, serverId);
         GuildMessageChannel messageChannel = channelService.getMessageChannelFromServer(giveaway.getServer().getId(), giveaway.getGiveawayChannel().getId());
         CompletableFuture<Message> giveawayUpdateFuture = channelService.editMessageInAChannelFuture(giveawayMessageToSend, messageChannel, giveaway.getMessageId());
@@ -208,7 +208,7 @@ public class GiveawayServiceBean implements GiveawayService {
         GiveawayMessageModel giveawayMessageModel = GiveawayMessageModel.fromGiveaway(giveaway);
         giveawayMessageModel.setCancelled(true);
         schedulerService.stopTrigger(giveaway.getReminderTriggerKey());
-        MessageToSend giveawayMessageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel);
+        MessageToSend giveawayMessageToSend = templateService.renderEmbedTemplate(GIVEAWAY_MESSAGE_TEMPLATE_KEY, giveawayMessageModel, serverId);
 
         GuildMessageChannel messageChannel = channelService.getMessageChannelFromServer(giveaway.getServer().getId(), giveaway.getGiveawayChannel().getId());
         log.debug("Updating original giveaway message to consider cancellation for giveaway {} in server {}.", giveawayId, serverId);

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

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

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

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

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

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

abstracto-application/abstracto-modules/image-generation/image-generation-impl/src/main/java/dev/sheldan/abstracto/imagegeneration/command/AmongusText.java

@@ -58,7 +58,7 @@ public class AmongusText extends AbstractConditionableCommand {
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         String text = (String) commandContext.getParameters().getParameters().get(0);
         File amongusTextImage = imageGenerationService.getAmongusTextImage(text);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(AMONGUS_TEXT_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(AMONGUS_TEXT_EMBED_TEMPLATE_KEY, new Object(), commandContext.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()
@@ -76,7 +76,7 @@ public class AmongusText extends AbstractConditionableCommand {
         event.deferReply().queue();
         String text = slashCommandParameterService.getCommandOption(TEXT_PARAMETER_KEY, event, String.class);
         File amongusTextImage = imageGenerationService.getAmongusTextImage(text);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(AMONGUS_TEXT_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(AMONGUS_TEXT_EMBED_TEMPLATE_KEY, new Object(), event.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

abstracto-application/abstracto-modules/image-generation/image-generation-impl/src/main/java/dev/sheldan/abstracto/imagegeneration/command/Bonk.java

@@ -76,7 +76,7 @@ public class Bonk extends AbstractConditionableCommand {
             }
         }
         File bonkGifFile = imageGenerationService.getBonkGif(member.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(BONK_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(BONK_EMBED_TEMPLATE_KEY, new Object(), commandContext.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()
@@ -99,7 +99,7 @@ public class Bonk extends AbstractConditionableCommand {
             targetMember = event.getMember();
         }
         File bonkGifFile = imageGenerationService.getBonkGif(targetMember.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(BONK_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(BONK_EMBED_TEMPLATE_KEY, new Object(), event.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

abstracto-application/abstracto-modules/image-generation/image-generation-impl/src/main/java/dev/sheldan/abstracto/imagegeneration/command/Pat.java

@@ -76,7 +76,7 @@ public class Pat extends AbstractConditionableCommand {
             }
         }
         File patGifFile = imageGenerationService.getPatGif(member.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(PAT_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(PAT_EMBED_TEMPLATE_KEY, new Object(), commandContext.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()
@@ -99,7 +99,7 @@ public class Pat extends AbstractConditionableCommand {
             targetMember = event.getMember();
         }
         File patGifFile = imageGenerationService.getPatGif(targetMember.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(PAT_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(PAT_EMBED_TEMPLATE_KEY, new Object(), event.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

abstracto-application/abstracto-modules/image-generation/image-generation-impl/src/main/java/dev/sheldan/abstracto/imagegeneration/command/Triggered.java

@@ -68,7 +68,7 @@ public class Triggered extends AbstractConditionableCommand {
             member = (Member) parameters.get(0);
         }
         File triggeredGifFile = imageGenerationService.getTriggeredGif(member.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(TRIGGERED_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(TRIGGERED_EMBED_TEMPLATE_KEY, new Object(), commandContext.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()
@@ -91,7 +91,7 @@ public class Triggered extends AbstractConditionableCommand {
             targetMember = event.getMember();
         }
         File triggeredGifFile = imageGenerationService.getTriggeredGif(targetMember.getEffectiveAvatar().getUrl(imageSize));
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(TRIGGERED_EMBED_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(TRIGGERED_EMBED_TEMPLATE_KEY, new Object(), event.getGuild().getIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -54,7 +54,7 @@ public class MyWarnings extends AbstractConditionableCommand {
                 .totalWarnCount(totalWarnCount)
                 .currentWarnCount(currentWarnCount)
                 .build();
-        channelService.sendEmbedTemplateInTextChannelList(MY_WARNINGS_RESPONSE_EMBED_TEMPLATE, model, commandContext.getChannel());
+        channelService.sendEmbedTemplateInMessageChannel(MY_WARNINGS_RESPONSE_EMBED_TEMPLATE, model, commandContext.getChannel());
         return CommandResult.fromIgnored();
     }
 

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

@@ -90,7 +90,7 @@ public class UserNotes extends AbstractConditionableCommand {
         CompletableFuture<List<NoteEntryModel>> listCompletableFuture = userNotesConverter.fromNotes(userNotes);
         return listCompletableFuture.thenCompose(noteEntryModels -> {
             model.setUserNotes(noteEntryModels);
-            return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(USER_NOTES_RESPONSE_TEMPLATE, model, commandContext.getChannel()))
+            return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(USER_NOTES_RESPONSE_TEMPLATE, model, commandContext.getChannel()))
                     .thenApply(aVoid -> CommandResult.fromIgnored());
         });
     }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/BanModerationActionModalListener.java

@@ -81,7 +81,7 @@ public class BanModerationActionModalListener implements ModalInteractionListene
                 .findFirst()
                 .orElse(null);
         if(StringUtils.isBlank(tempReason)) {
-            reason = templateService.renderSimpleTemplate(DEFAULT_BAN_REASON_TEMPLATE_KEY);
+            reason = templateService.renderSimpleTemplate(DEFAULT_BAN_REASON_TEMPLATE_KEY, model.getServerId());
         } else {
             reason = tempReason;
         }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/HoneyPotRoleAddedListener.java

@@ -78,7 +78,7 @@ public class HoneyPotRoleAddedListener implements RoleAddedListener {
                         .memberDisplay(MemberDisplay.fromMember(model.getTargetMember()))
                         .roleDisplay(RoleDisplay.fromRole(model.getRole()))
                         .build();
-                String banReason = templateService.renderTemplate(HONEYPOT_BAN_REASON_TEMPLATE, reasonModel);
+                String banReason = templateService.renderTemplate(HONEYPOT_BAN_REASON_TEMPLATE, reasonModel, model.getServerId());
                 banService.banUserWithNotification(model.getTargetUser(), banReason, ServerUser.fromMember(model.getTargetMember().getGuild().getSelfMember()),
                         model.getTargetMember().getGuild(), Duration.ofDays(7)).thenAccept(banResult -> {
                     log.info("Banned user {} in guild {} due to role {}.", model.getTargetUser().getUserId(), model.getTargetUser().getServerId(), model.getRoleId());

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/MyWarningsTest.java

@@ -53,7 +53,7 @@ public class MyWarningsTest {
         Long totalWarnCount = 10L;
         when(warnManagementService.getTotalWarnsForUser(aUserInAServer)).thenReturn(totalWarnCount);
         CommandResult result = testUnit.execute(noParameter);
-        verify(channelService, times(1)).sendEmbedTemplateInTextChannelList(eq(MyWarnings.MY_WARNINGS_RESPONSE_EMBED_TEMPLATE), argumentCaptor.capture(), eq(noParameter.getChannel()));
+        verify(channelService, times(1)).sendEmbedTemplateInMessageChannel(eq(MyWarnings.MY_WARNINGS_RESPONSE_EMBED_TEMPLATE), argumentCaptor.capture(), eq(noParameter.getChannel()));
         CommandTestUtilities.checkSuccessfulCompletion(result);
         MyWarningsModel usedModel = argumentCaptor.getValue();
         Assert.assertEquals(activeWarnCount, usedModel.getCurrentWarnCount());

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/UserNotesTest.java

@@ -67,7 +67,7 @@ public class UserNotesTest {
         CompletableFuture<List<NoteEntryModel>> convertedNotes = CompletableFuture.completedFuture(Arrays.asList(firstConvertedNote, secondConvertedNote));
         when(userNotesConverter.fromNotes(userNotes)).thenReturn(convertedNotes);
         CompletableFuture<CommandResult> result = testUnit.executeAsync(parameters);
-        verify(channelService, times(1)).sendEmbedTemplateInTextChannelList(eq(UserNotes.USER_NOTES_RESPONSE_TEMPLATE), captor.capture(), eq(parameters.getChannel()));
+        verify(channelService, times(1)).sendEmbedTemplateInMessageChannel(eq(UserNotes.USER_NOTES_RESPONSE_TEMPLATE), captor.capture(), eq(parameters.getChannel()));
         ListNotesModel usedModel = captor.getValue();
         List<NoteEntryModel> notes = convertedNotes.join();
         Assert.assertEquals(notes.size(), usedModel.getUserNotes().size());
@@ -96,7 +96,7 @@ public class UserNotesTest {
         when(userNotesConverter.fromNotes(userNotes)).thenReturn(convertedNotes);
         CompletableFuture<CommandResult> result = testUnit.executeAsync(parameters);
         List<NoteEntryModel> notes = convertedNotes.join();
-        verify(channelService, times(1)).sendEmbedTemplateInTextChannelList(eq(UserNotes.USER_NOTES_RESPONSE_TEMPLATE), captor.capture(), eq(parameters.getChannel()));
+        verify(channelService, times(1)).sendEmbedTemplateInMessageChannel(eq(UserNotes.USER_NOTES_RESPONSE_TEMPLATE), captor.capture(), eq(parameters.getChannel()));
         ListNotesModel usedModel = captor.getValue();
         Assert.assertEquals(notes.size(), usedModel.getUserNotes().size());
         for (int i = 0; i < usedModel.getUserNotes().size(); i++) {

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

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

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

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

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

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.5.36</version>
+        <version>1.5.53-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,6 +38,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>moderation-int</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.core</groupId>
             <artifactId>metrics-int</artifactId>

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/AnonReply.java

@@ -8,7 +8,7 @@ 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.service.MemberService;
+import dev.sheldan.abstracto.core.service.UserService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
 import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadClosedException;
@@ -40,7 +40,7 @@ public class AnonReply extends AbstractConditionableCommand {
     private ModMailThreadManagementService modMailThreadManagementService;
 
     @Autowired
-    private MemberService memberService;
+    private UserService userService;
 
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
@@ -52,8 +52,8 @@ public class AnonReply extends AbstractConditionableCommand {
             throw new ModMailThreadClosedException();
         }
         Long threadId = modMailThread.getId();
-        return memberService.getMemberInServerAsync(modMailThread.getUser()).thenCompose(member ->
+        return userService.retrieveUserForId(modMailThread.getUser().getUserReference().getId()).thenCompose(user ->
-            modMailThreadService.loadExecutingMemberAndRelay(threadId, text, commandContext.getMessage(), true, member)
+                modMailThreadService.loadExecutingMemberAndRelay(threadId, text, commandContext.getMessage(), true, user, commandContext.getGuild())
         ).thenApply(aVoid -> CommandResult.fromSuccess());
     }
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Close.java

@@ -72,7 +72,8 @@ public class Close extends AbstractConditionableCommand {
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
         // the default value of the note is configurable via template
-        String note = parameters.size() == 1 ? (String) parameters.get(0) : templateService.renderTemplate(MODMAIL_CLOSE_DEFAULT_NOTE_TEMPLATE_KEY, new Object());
+        String note = parameters.size() == 1 ? (String) parameters.get(0) : templateService.renderTemplate(MODMAIL_CLOSE_DEFAULT_NOTE_TEMPLATE_KEY, new Object(), commandContext.getGuild()
+            .getIdLong());
         ModMailThread modMailThread = modMailThreadManagementService.getByChannelId(commandContext.getChannel().getIdLong());
         if(ModMailThreadState.CLOSED.equals(modMailThread.getState()) || ModMailThreadState.CLOSING.equals(modMailThread.getState())) {
             throw new ModMailThreadClosedException();
@@ -81,7 +82,6 @@ public class Close extends AbstractConditionableCommand {
                 .builder()
                 .closingMember(commandContext.getAuthor())
                 .notifyUser(true)
-                .channel(commandContext.getChannel())
                 .log(true)
                 .note(note)
                 .build();
@@ -112,19 +112,18 @@ public class Close extends AbstractConditionableCommand {
         ClosingContext context = ClosingContext
                 .builder()
                 .closingMember(event.getMember())
-                .channel(event.getChannel())
                 .notifyUser(!silently)
                 .log(log)
                 .note(note)
                 .build();
         return interactionService.replyEmbed(CLOSE_RESPONSE, event)
-                .thenCompose(interactionHook -> self.closeThread(context))
+                .thenCompose(interactionHook -> self.closeThread(context, event.getChannelIdLong()))
                 .thenApply(aVoid -> CommandResult.fromIgnored());
     }
 
     @Transactional
-    public CompletableFuture<Void> closeThread(ClosingContext closingContext) {
+    public CompletableFuture<Void> closeThread(ClosingContext closingContext, Long channelId) {
-        ModMailThread modMailThread = modMailThreadManagementService.getByChannelId(closingContext.getChannel().getIdLong());
+        ModMailThread modMailThread = modMailThreadManagementService.getByChannelId(channelId);
         if(ModMailThreadState.CLOSED.equals(modMailThread.getState()) || ModMailThreadState.CLOSING.equals(modMailThread.getState())) {
             throw new ModMailThreadClosedException();
         }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/CloseSilently.java

@@ -47,7 +47,8 @@ public class CloseSilently extends AbstractConditionableCommand {
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
         // default note text is configurable via template, because the note is optional
-        String note = parameters.size() == 1 ? (String) parameters.get(0) : templateService.renderTemplate("modmail_close_default_note", new Object());
+        String note = parameters.size() == 1 ? (String) parameters.get(0) : templateService.renderTemplate("modmail_close_default_note", new Object(), commandContext.getGuild()
+            .getIdLong());
         ModMailThread modMailThread = modMailThreadManagementService.getByChannelId(commandContext.getChannel().getIdLong());
         if(ModMailThreadState.CLOSED.equals(modMailThread.getState()) || ModMailThreadState.CLOSING.equals(modMailThread.getState())) {
             throw new ModMailThreadClosedException();

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Contact.java

@@ -25,6 +25,7 @@ import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementS
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
@@ -44,7 +45,7 @@ import java.util.concurrent.CompletableFuture;
 @Slf4j
 public class Contact extends AbstractConditionableCommand {
 
-    private static final String CONTACT_PARAMETER = "contact";
+    private static final String COMMAND_NAME = "contact";
     private static final String USER_PARMETER = "user";
     private static final String MODMAIL_THREAD_ALREADY_EXISTS_TEMPLATE = "modmail_thread_already_exists";
     private static final String CONTACT_RESPONSE = "contact_response";
@@ -84,27 +85,24 @@ public class Contact extends AbstractConditionableCommand {
                     .existingModMailThread(existingThread)
                     .executingMemberDisplay(MemberNameDisplay.fromMember(targetUser))
                     .build();
-            List<CompletableFuture<Message>> futures = channelService.sendEmbedTemplateInTextChannelList(MODMAIL_THREAD_ALREADY_EXISTS_TEMPLATE, model, commandContext.getChannel());
+            List<CompletableFuture<Message>> futures = channelService.sendEmbedTemplateInMessageChannel(MODMAIL_THREAD_ALREADY_EXISTS_TEMPLATE, model, commandContext.getChannel());
             return FutureUtils.toSingleFutureGeneric(futures).thenApply(aVoid -> CommandResult.fromIgnored());
         } else {
-            return modMailThreadService.createModMailThreadForUser(targetUser, null,  false, commandContext.getUndoActions())
+            return modMailThreadService.createModMailThreadForUser(targetUser.getUser(), targetUser.getGuild(), null,  false, commandContext.getUndoActions(), false)
-                    .thenCompose(unused -> modMailThreadService.sendContactNotification(targetUser, unused, commandContext.getChannel()))
+                    .thenCompose(unused -> modMailThreadService.sendContactNotification(targetUser.getUser(), unused, commandContext.getChannel()))
                     .thenApply(aVoid -> CommandResult.fromSuccess());
         }
     }
 
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        Member member = slashCommandParameterService.getCommandOption(USER_PARMETER, event, Member.class);
+        User user = slashCommandParameterService.getCommandOption(USER_PARMETER, event, User.class);
-        if(!member.getGuild().equals(event.getGuild())) {
+        AUserInAServer userInAServer = userManagementService.loadOrCreateUser(event.getGuild().getIdLong(), user.getIdLong());
-            throw new EntityGuildMismatchException();
-        }
-        AUserInAServer user = userManagementService.loadOrCreateUser(member);
         // if this AUserInAServer already has an open thread, we should instead post a message
         // containing a link to the channel, instead of opening a new one
-        if(modMailThreadManagementService.hasOpenModMailThreadForUser(user)) {
+        if(modMailThreadManagementService.hasOpenModMailThreadForUser(userInAServer)) {
-            log.info("Modmail thread for user {} in server {} already exists. Notifying user {}.", event.getMember().getId(), event.getGuild().getId(), user.getUserReference().getId());
+            log.info("Modmail thread for userInAServer {} in server {} already exists. Notifying userInAServer {}.", event.getMember().getId(), event.getGuild().getId(), userInAServer.getUserReference().getId());
-            ModMailThread existingThread = modMailThreadManagementService.getOpenModMailThreadForUser(user);
+            ModMailThread existingThread = modMailThreadManagementService.getOpenModMailThreadForUser(userInAServer);
             ModMailThreadExistsModel model = ModMailThreadExistsModel
                     .builder()
                     .existingModMailThread(existingThread)
@@ -114,9 +112,9 @@ public class Contact extends AbstractConditionableCommand {
                     .thenApply(interactionHook -> CommandResult.fromSuccess());
         } else {
             CompletableFuture<InteractionHook> response = interactionService.replyEmbed(CONTACT_RESPONSE, event);
-            CompletableFuture<MessageChannel> threadFuture = modMailThreadService.createModMailThreadForUser(member, null, false, new ArrayList<>());
+            CompletableFuture<MessageChannel> threadFuture = modMailThreadService.createModMailThreadForUser(user, event.getGuild(), null, false, new ArrayList<>(), false);
             return CompletableFuture.allOf(response, threadFuture)
-                    .thenCompose(unused -> modMailThreadService.sendContactNotification(member, threadFuture.join(), response.join()))
+                    .thenCompose(unused -> modMailThreadService.sendContactNotification(user, threadFuture.join(), response.join()))
                     .thenApply(o -> CommandResult.fromSuccess());
         }
     }
@@ -126,7 +124,7 @@ public class Contact extends AbstractConditionableCommand {
         Parameter responseText = Parameter
                 .builder()
                 .name(USER_PARMETER)
-                .type(Member.class)
+                .type(User.class)
                 .templated(true)
                 .build();
         List<Parameter> parameters = Arrays.asList(responseText);
@@ -139,11 +137,11 @@ public class Contact extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(ModMailSlashCommandNames.MODMAIL)
-                .commandName(CONTACT_PARAMETER)
+                .commandName(COMMAND_NAME)
                 .build();
 
         return CommandConfiguration.builder()
-                .name(CONTACT_PARAMETER)
+                .name(COMMAND_NAME)
                 .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .slashCommandConfig(slashCommandConfig)

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/DenyModmailAppeal.java

@@ -0,0 +1,121 @@
+package dev.sheldan.abstracto.modmail.command;
+
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.condition.CommandCondition;
+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.config.FeatureMode;
+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.modmail.condition.ModMailContextCondition;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.config.ModMailMode;
+import dev.sheldan.abstracto.modmail.config.ModMailSlashCommandNames;
+import dev.sheldan.abstracto.modmail.exception.ModMailThreadClosedException;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThreadState;
+import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
+import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.InteractionHook;
+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 DenyModmailAppeal extends AbstractConditionableCommand {
+
+    private static final String COMMAND_NAME = "denyappeal";
+    private static final String FULL_COMMAND_NAME = "denyModmailAppeal";
+    private static final String REASON_PARAMETER = "reason";
+
+    private static final String RESPONSE_TEMPLATE = "denyModmailAppeal_response";
+
+    @Autowired
+    private ModMailContextCondition requiresModMailCondition;
+
+    @Autowired
+    private ModMailThreadManagementService modMailThreadManagementService;
+
+    @Autowired
+    private ModMailThreadService modMailThreadService;
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        ModMailThread modMailThread = modMailThreadManagementService.getByChannelId(event.getChannel().getIdLong());
+        if(ModMailThreadState.CLOSED.equals(modMailThread.getState()) || ModMailThreadState.CLOSING.equals(modMailThread.getState())) {
+            throw new ModMailThreadClosedException();
+        }
+        String reason = slashCommandParameterService.getCommandOption(REASON_PARAMETER, event, String.class);
+        CompletableFuture<InteractionHook> response = interactionService.replyEmbed(RESPONSE_TEMPLATE, event);
+        CompletableFuture<Void> threadFuture = modMailThreadService.rejectAppeal(modMailThread, reason, event.getMember());
+        return CompletableFuture.allOf(response, threadFuture)
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter responseText = Parameter
+                .builder()
+                .name(REASON_PARAMETER)
+                .type(String.class)
+                .templated(true)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(responseText);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(ModMailSlashCommandNames.MODMAIL)
+                .commandName(COMMAND_NAME)
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(FULL_COMMAND_NAME)
+                .module(ModMailModuleDefinition.MODMAIL)
+                .parameters(parameters)
+                .slashCommandConfig(slashCommandConfig)
+                .help(helpInfo)
+                .slashCommandOnly(true)
+                .supportsEmbedException(true)
+                .templated(true)
+                .build();
+    }
+
+    @Override
+    public List<CommandCondition> getConditions() {
+        List<CommandCondition> conditions = super.getConditions();
+        conditions.add(requiresModMailCondition);
+        return conditions;
+    }
+
+    @Override
+    public List<FeatureMode> getFeatureModeLimitations() {
+        return List.of(ModMailMode.MOD_MAIL_APPEALS);
+    }
+}

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Reply.java

@@ -9,6 +9,7 @@ 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.service.MemberService;
+import dev.sheldan.abstracto.core.service.UserService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
 import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadClosedException;
@@ -39,7 +40,7 @@ public class Reply extends AbstractConditionableCommand {
     private ModMailThreadManagementService modMailThreadManagementService;
 
     @Autowired
-    private MemberService memberService;
+    private UserService userService;
 
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
@@ -50,8 +51,8 @@ public class Reply extends AbstractConditionableCommand {
             throw new ModMailThreadClosedException();
         }
         Long threadId = modMailThread.getId();
-        return memberService.getMemberInServerAsync(modMailThread.getUser()).thenCompose(member ->
+        return userService.retrieveUserForId(modMailThread.getUser().getUserReference().getId()).thenCompose(user ->
-            modMailThreadService.loadExecutingMemberAndRelay(threadId, text, commandContext.getMessage(), false, member)
+            modMailThreadService.loadExecutingMemberAndRelay(threadId, text, commandContext.getMessage(), false, user, commandContext.getGuild())
         ).thenApply(aVoid -> CommandResult.fromSuccess());
     }
 
@@ -65,7 +66,7 @@ public class Reply extends AbstractConditionableCommand {
                 .optional(true)
                 .templated(true)
                 .build();
-        List<Parameter> parameters = Arrays.asList(responseText);
+        List<Parameter> parameters = List.of(responseText);
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("reply")

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailInitialButtonListener.java

@@ -14,6 +14,7 @@ import dev.sheldan.abstracto.modmail.model.dto.ServiceChoicesPayload;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Guild;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +26,7 @@ import java.util.ArrayList;
 public class ModMailInitialButtonListener implements ButtonClickedListener {
 
     @Autowired
-    private MemberService memberService;
+    private GuildService guildService;
 
     @Autowired
     private ModMailThreadService modMailThreadService;
@@ -51,20 +52,20 @@ public class ModMailInitialButtonListener implements ButtonClickedListener {
         Long userId = choices.getUserId();
         log.debug("Executing action for creationg a modmail thread in server {} for user {}.", chosenServer.getServerId(), userId);
         ArrayList<UndoActionInstance> undoActions = new ArrayList<>();
-        memberService.getMemberInServerAsync(chosenServer.getServerId(), userId)
+        Guild guild = guildService.getGuildById(chosenServer.getServerId());
-                .thenCompose(member -> channelService.retrieveMessageInChannel(model.getEvent().getChannel(), choices.getMessageId())
+        boolean appeal = chosenServer.getAppealModmail() != null && chosenServer.getAppealModmail();
+        channelService.retrieveMessageInChannel(model.getEvent().getChannel(), choices.getMessageId())
                 .thenCompose(originalMessage -> {
                     try {
-                        return modMailThreadService.createModMailThreadForUser(member, originalMessage, true, undoActions);
+                        return modMailThreadService.createModMailThreadForUser(model.getEvent().getUser(), guild, originalMessage, true, undoActions, appeal);
                     } catch (Exception ex) {
                         log.error("Failed to setup thread correctly", ex);
                         undoActionService.performActions(undoActions);
                         return null;
                     }
                 })
-                .thenAccept(unused -> self.cleanup(model)))
+                .thenAccept(unused -> self.cleanup(model)).exceptionally(throwable -> {
-                .exceptionally(throwable -> {
+                    log.warn("Failed to setup modmail thread.");
-                    log.error("Failed to setup thread correctly", throwable);
                     undoActionService.performActions(undoActions);
                     return null;
                 });

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageDeletedListener.java

@@ -7,6 +7,7 @@ import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.listener.MessageDeletedModel;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.MessageService;
+import dev.sheldan.abstracto.core.service.UserService;
 import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
 import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
@@ -33,7 +34,7 @@ public class ModMailMessageDeletedListener implements AsyncMessageDeletedListene
     private ModMailMessageDeletedListener self;
 
     @Autowired
-    private MemberService memberService;
+    private UserService userService;
 
     @Override
     public DefaultListenerResult execute(MessageDeletedModel model) {
@@ -47,8 +48,8 @@ public class ModMailMessageDeletedListener implements AsyncMessageDeletedListene
             Long channelId = thread.getChannel().getId();
             Long serverId = thread.getServer().getId();
             log.info("Deleting message for mod mail thread {} in channel {} in server {}.", thread.getId(), channelId, serverId);
-            memberService.getMemberInServerAsync(model.getServerId(), modMailMessage.getThreadReference().getUser().getUserReference().getId()).thenAccept(member -> {
+            userService.retrieveUserForId(modMailMessage.getThreadReference().getUser().getUserReference().getId()).thenAccept(user -> {
-                CompletableFuture<Void> dmDeletePromise = messageService.deleteMessageInChannelWithUser(member.getUser(), dmMessageId);
+                CompletableFuture<Void> dmDeletePromise = messageService.deleteMessageInChannelWithUser(user, dmMessageId);
                 CompletableFuture<Void> channelDeletePromise;
                 if(hasMessageInChannel) {
                     channelDeletePromise = messageService.deleteMessageInChannelInServer(serverId, channelId, channelMessage);