[maven-release-plugin] prepare release sissi-1.5.16

adding custom template for leave message
updating template to fit new leave model

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.4.38
-ABSTRACTO_VERSION=1.5.23
+VERSION=1.5.15
+ABSTRACTO_VERSION=1.6.17

.github/workflows/build.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v3
@@ -31,3 +31,23 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           user: Sheldan
           token: ${{ secrets.ABSTRACTO_PAT }}
+      - name: Login to Harbor
+        uses: docker/login-action@v3
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Docker build
+        run: docker compose build
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm package sissi

.github/workflows/release.yml

@@ -1,47 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  release:
-    types: [created]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 17
-      - name: Load current version
-        id: version
-        run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
-      - name: Publish to GitHub Packages
-        run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          user: Sheldan
-          token: ${{ secrets.ABSTRACTO_PAT }}
-      - name: Login to Harbor
-        uses: docker/login-action@v2
-        with:
-          registry: harbor.sheldan.dev
-          username: ${{ secrets.HARBOR_USERNAME }}
-          password: ${{ secrets.HARBOR_TOKEN }}
-      - name: Load env files
-        id: dotenv
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: .env
-      - name: Push container
-        run: docker-compose build && docker-compose push
-        env:
-          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
-          VERSION: ${{ steps.dotenv.outputs.version }}
-      - name: Helm push
-        working-directory: ./deployment/helm/
-        run: |-
-          helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
-          helm package sissi
-          helm push sissi*.tgz oci://harbor.sheldan.dev/sissi

.github/workflows/release_manual.yaml

@@ -5,7 +5,7 @@ permissions:
   contents: write
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -18,6 +18,12 @@ jobs:
       - name: Load current version
         id: version
         run: echo "version=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec | cut -d- -f1)" >> $GITHUB_ENV
+      - name: Create a Release
+        uses: elgohr/Github-Release-Action@v5
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          title: Release of version ${{ env.version }}
       - name: Release maven packages
         uses: qcastel/github-actions-maven-release@v1.12.41
         env:
@@ -32,7 +38,7 @@ jobs:
           maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
           access-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Harbor
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: harbor.sheldan.dev
           username: ${{ secrets.HARBOR_USERNAME }}
@@ -52,9 +58,9 @@ jobs:
           changes: |
             {
               "bot.tag": "${{ env.version }}",
-              "restApi.tag": "${{ env.version }}"
-              "privateRestApi.tag": "${{ env.version }}"
-              "templateDeploymentData.tag": "${{ env.version }}"
+              "restApi.tag": "${{ env.version }}",
+              "privateRestApi.tag": "${{ env.version }}",
+              "templateDeploymentData.tag": "${{ env.version }}",
               "dbConfigDeploymentData.tag": "${{ env.version }}"
             }
       - name: Update .env version
@@ -66,7 +72,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

@@ -21,5 +21,9 @@ target/
 *.tar.gz
 *.rar
 
+Chart.lock
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*.tgz

.tiltignore

@@ -0,0 +1,3 @@
+*.tgz
+tilt/sissi-dev/tmpcharts/
+tilt/sissi-dev/charts/*.tgz

LICENSE

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

PRIVACY_POLICY.md

@@ -0,0 +1,164 @@
+# Sissi Discord bot privacy policy
+
+Last updated: 23.02.2025
+
+## Description
+
+The bot requires some information to function properly and in a reasonable way. These features heavily depend which features are enabled for which server, and this list just presents ALL of the features available.
+The detailed list of what information is stored and processed is the following:
+
+### General
+* your Discord user ID (in combination with the server ID) is used to uniquely identify you and associate various properties, such as experience, level, opened modmail threads etc
+* the IDs of the servers this bot is in
+* the IDs of the channel in the servers this bot is in
+* the names of channel groups which were given by their creator
+* the server aliases which were created for commands
+* the name of emotes which are used in the bot for convenience, if they are customized
+* towards which channel (identified by ID) certain messages by the bot are posted. e.g. logging, news, starboard
+* **no message content, username, channel name or role name is stored, except at the places where its mentioned**
+* most of the stored records have a 'created' and 'updated' timestamp, in order to assist in examining bugs and malfunctions
+* which commands have which cooldown in which channel group and in which channel group they are disabled
+* which channel is in which channel group
+* which role is allowed to execute which command
+* which features are enabled
+* which feature modes are enabled
+* **aliases** created for the commands
+* **information** necessary to handle components (buttons, select menus). This information is of varying nature and can be user identifiable information
+* **emotes** which should be used for varying places (assignable roles, particular emotes which are overwriten, such as star board)
+
+
+### Moderation
+* **mute reason**, duration, mute date, who muted whom and in which message was the mute executed
+* the names of filtered invite link servers in order to find out if it would be valid to allow the invite
+* any configured allowed invite links the server ID and the actually used invite
+    * this is necessary in order to determine the server via its ID and allow other unknown invite links. The invite link is necessary as there is no way to map server ID to actual server
+* configured profanity regexes
+    * reported profanities, including which message contains the profanity, and the message which was used to report the profanity, and whether it was identified as a true profanity
+* **the text of notes regarding users**
+    * this is used to enable taking notes about users, and the content is stored directly
+* meta information regarding warnings
+    * **reason for the warning**
+    * date of the warning
+    * the user who warned a user
+    * whether the warning was decayed and when
+* the infractions of each user accompanied with **reason** (if available): warns, mutes, bans, kicks
+
+### Giveaway
+* the give away information: **description**, provider, manager, target date, winners and participants
+
+### Embedded messages
+* embedded message information
+    * this information includes who embedded which message in which channel and is deleted after a few days
+
+### Emote usage tracking
+* the name of emotes which are being tracked in the emote usage tracking system for purely convenience reasons
+* **who** used which emote is **not** tracked
+* at which day an emote was used how many times
+* whether the emote was a reaction
+
+### Reminder
+* **the message content** in order to provide you with the reminder text
+* the date it was created, and the date it is due
+* the id of the message which contained the command
+* whether you have been reminded
+* the users who have joined the reminders
+
+### Modmail
+* the information that a modmail thread existed (creation, status and close date), and the IDs of the messages that have been sent in both directions
+
+### News
+* the ORF integration stores which posts from ORF RSS were already sent.
+* which ORF RSS feeds were subscribed
+
+### Polls
+* the **text** of polls, the creator of polls and who made which decision in polls
+
+### Starboard (best-of)
+* the message which was the origin for the starboard post
+* the message which was the resulting starboard post
+* the author of the message and the amount of stars
+* who reacted to a starboard post
+    * this is necessary to provide the information about 'top star giver' and to disallow duplicate starboard reactions
+
+### Suggestion
+* **the message content** of the message used to create the suggestion
+    * this was used for the message used to update the status of a suggestion, but this is currently disabled
+* the author of the suggestion and the message which has been posted in the suggestions channel
+* every suggestion will be deleted completely from the database a few days after it has reached a final state (rejected, denied, accepted)
+* whether you voted for a suggestion and which decision you made
+
+### Leveling system
+* the amount of messages which were considered for the leveling system
+    * it only considers a message once per minute, so it does not directly translate to your absolute message count
+* the amount of experience, and the experience level you have
+* whether experience gain has been disabled for you
+* the role you received because of the experience system
+* which roles are configured to be used as experience roles and at which level they are assigned
+* which roles are used to disable experience gain
+
+### Entertainment
+* PressF: for **what** the pressF was initiated by whom and who participated
+
+### Economy
+* The amount of credits for each user
+
+### Assignable roles
+* the names of assignable role places and assignable role button text, together with the associated emote markdown (if given)
+* the assigned assignable roles for each member in order to provide the 'unique' assignable role functionality
+* custom configured conditions to enable a level restriction
+
+### Weekly items (for Miepscord)
+* The text of the weekly art posts and the creator of them
+
+### Sticky roles
+* The roles a user had when leaving the server to be re-applied when re-joining (opt out possible)
+
+### Meetups
+* The meta data of meetups: text, location, creator and the decision of each user interacting with the meetup. This information will be deleted a few days after a meetup has passed/is cancelled.
+
+### Twitch
+* The ID/**name** of streamers to follow accompanied with their discord ID
+* The start/end dates of their streams
+    * The individual sections of streams identified by title and game for updating the message
+
+### Custom commands
+* the **names** given to custom commands and the configured **response text**
+
+## Grafana dashboard
+
+There is also a [Grafana](https://grafana.com/) dashboard in order to inspect how the bot is operating.
+The information visible in this dashboard is:
+
+* message events
+* Discord gateway ping
+* starboard reactions
+* amount of command executions
+* emotes currently being processed for tracking
+* embedded messages
+* invite filter activity
+* amount of experience which is currently being processed
+
+All of this information cannot be linked to any user (or any server for that matter, if the bot would be in multiple servers) and is deleted after 15 days.
+
+
+## How can I decide which information is collected?
+It is not possible to opt-out of singular sub-services of the bot. Should you decide that your information should not be collected, please cease usage of the bot immediately (leave any guild the bot operates in).
+
+_Should you decide to no longer utilize the bot, you may request your data to be erased within 30 days as per GDPR if you are a citizen of the EU. You can do this by sending a message to the user "sheldan" on Discord: GDPR Data removal <Username> <UserId>. If your request is incomplete, we cannot acknowledge it and therefore your data will not be removed. In order to identify authentic requests, please contact modmail beforehand by sending a direct message to the bot and stating your intention._
+
+## Open source content
+This bot uses the following open source libraries and frameworks:
+
+* [abstracto](https://github.com/Sheldan/abstracto) is used as a base for this bot, providing most of the functionalities
+* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper used
+* [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including Dependency injection and more)
+* [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA.
+* [Freemarker](https://github.com/apache/freemarker) is used as a templating engine. This is used to provide internationalization for user facing text and enable dynamic embed configuration.
+* [Ehcache](https://github.com/ehcache/ehcache3) is used as a caching implementation.
+* [Lombok](https://github.com/rzwitserloot/lombok) is used as a framework in order to speed up creation of container classes and builders.
+* [Quartz](https://github.com/quartz-scheduler/quartz) is used as a scheduling framework in order to provide functionalities which either require a delayed or cronjob behaviour.
+* [Docker](https://github.com/docker) is used to package the application into a container and [k3s](https://k3s.io/) to orchestrate the containers
+* [Liquibase](https://github.com/liquibase/liquibase) is used to manage changes to the database
+* [Prometheus](https://prometheus.io) to scrap and collect the metrics about how the bot is operating
+
+* [Grafana](https://grafana.com) to visualize metrics of the bot and [Loki](https://grafana.com/oss/loki/) for logging

Tiltfile

@@ -18,7 +18,7 @@ local_resource(
 docker_build_with_restart(
   registry + 'sissi-bot',
   './application/executable/target/jar',
-  entrypoint=['java', '-noverify', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
+  entrypoint=['java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
   dockerfile='./application/executable/Dockerfile',
   live_update=[
     sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
@@ -38,7 +38,8 @@ docker_build(registry + 'sissi-private-rest-api', 'deployment/image-packaging/sr
 docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
 
 
-k8s_yaml(helm('deployment/helm/sissi', values=
+local('cd tilt/sissi-dev && helm dep up')
+k8s_yaml(helm('tilt/sissi-dev', values=
 ['./../Sissi-environments/argocd/apps/sissi/values/local/values.yaml',
 'secrets://./../Sissi-environments/argocd/apps/sissi/values/local/values.secrets.yaml']
 ))

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
@@ -55,12 +55,13 @@
             <artifactId>metrics-impl</artifactId>
         </dependency>
 
-        <!-- modules containing commands -->
         <dependency>
             <groupId>dev.sheldan.abstracto.scheduling</groupId>
             <artifactId>scheduling-impl</artifactId>
         </dependency>
 
+        <!-- modules containing commands -->
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>link-embed-impl</artifactId>
@@ -136,6 +137,11 @@
             <artifactId>statistic-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>sticky-roles-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>giveaway-impl</artifactId>
@@ -160,6 +166,13 @@
             <version>${project.version}</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>dev.sheldan.sissi.application.module</groupId>
+            <artifactId>miepscord</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.sissi.application.module</groupId>
             <artifactId>rss-news</artifactId>

application/executable/src/main/resources/application.properties

@@ -2,8 +2,8 @@ spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
 spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
-spring.jpa.hibernate.default_schema=abstracto
-spring.jpa.properties.hibernate.default_schema=abstracto
+spring.jpa.hibernate.default_schema=${DB_SCHEMA}
+spring.jpa.properties.hibernate.default_schema=${DB_SCHEMA}
 spring.quartz.jdbc.initialize-schema=never
 management.metrics.tags.application=Sissi
 management.endpoint.health.probes.enabled=true

application/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +34,11 @@
                 <artifactId>rssreader</artifactId>
                 <version>${rssreader.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>${jsoup.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

application/sissi-customizations/image-generation-custom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
 
     <artifactId>image-generation-custom</artifactId>

application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java

@@ -50,18 +50,15 @@ public class OrangeSunDogeCommandAlternative implements CommandAlternative {
 
     @Override
     public boolean shouldExecute(UnParsedCommandParameter parameter, Guild guild, Message message) {
-        String contentStripped = message.getContentRaw();
-        String[] parameters = contentStripped.split(" ");
-        return parameters.length == 1 && featureFlagService.isFeatureEnabled(imageGenerationFeatureConfig, guild.getIdLong());
+        return featureFlagService.isFeatureEnabled(imageGenerationFeatureConfig, guild.getIdLong());
     }
 
     @Override
     public void execute(UnParsedCommandParameter parameter, Message message) {
         String contentStripped = message.getContentRaw();
-        List<String> parameters = Arrays.asList(contentStripped.split(" "));
-        String inputText = commandRegistry.getCommandName(parameters.get(0), message.getGuild().getIdLong());
+        String inputText = commandRegistry.getCommandName(contentStripped, message.getGuild().getIdLong());
         File triggeredGifFile = imageGenerationService.getOrangeSunDogeImage(inputText);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object());
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object(), message.getGuildIdLong());
         // template support does not support binary files
         AttachedFile file = AttachedFile
                 .builder()

application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/service/ImageGenerationService.java

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 @Component
 public class ImageGenerationService {
@@ -20,7 +22,7 @@ public class ImageGenerationService {
 
     public File getOrangeSunDogeImage(String inputText) {
         try {
-            return httpService.downloadFileToTempFile(dogeOrangeSunUrl.replace("{1}", inputText));
+            return httpService.downloadFileToTempFile(dogeOrangeSunUrl.replace("{1}", URLEncoder.encode(inputText, StandardCharsets.UTF_8)));
         } catch (IOException e) {
             throw new AbstractoRunTimeException(String.format("Failed to download orange doge image for url %s with error %s", inputText, e.getMessage()));
         }

application/sissi-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application.module.custom</groupId>
         <artifactId>sissi-customizations</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/commands/ModMode.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
 import dev.sheldan.sissi.module.custom.moderation.config.ModerationCustomFeatureDefinition;
@@ -72,6 +73,7 @@ public class ModMode extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(ModerationCustomSlashCommandNames.MODERATION)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName(MOD_MODE_COMMAND)
                 .build();
 

application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/commands/SelfMute.java

@@ -0,0 +1,68 @@
+package dev.sheldan.sissi.module.custom.moderation.commands;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandContext;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.sissi.module.custom.moderation.config.ModerationCustomFeatureDefinition;
+import dev.sheldan.sissi.module.custom.moderation.service.SelfMuteServiceBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class SelfMute extends AbstractConditionableCommand {
+
+    public static final String DURATION_PARAMETER = "duration";
+
+    @Autowired
+    private SelfMuteServiceBean selfMuteServiceBean;
+
+    @Override
+    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
+        List<Object> parameters = commandContext.getParameters().getParameters();
+        Duration muteDuration = (Duration) parameters.get(0);
+        return selfMuteServiceBean.selfMuteMember(commandContext.getAuthor(), muteDuration)
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter durationParameter = Parameter
+                .builder()
+                .name(DURATION_PARAMETER)
+                .type(Duration.class)
+                .templated(true)
+                .build();
+        List<Parameter> parameters = Arrays.asList(durationParameter);
+
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        return CommandConfiguration.builder()
+                .name("selfMute")
+                .async(true)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .supportsEmbedException(true)
+                .causesReaction(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationCustomFeatureDefinition.MODERATION_CUSTOM;
+    }
+}

application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/service/SelfMuteServiceBean.java

@@ -0,0 +1,30 @@
+package dev.sheldan.sissi.module.custom.moderation.service;
+
+import dev.sheldan.abstracto.core.service.MemberService;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Member;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+
+@Slf4j
+@Component
+public class SelfMuteServiceBean {
+
+    @Autowired
+    private MemberService memberService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    private static final String SELF_MUTE_REASON_TEMPLATE = "self_mute_reason";
+
+    public CompletableFuture<Void> selfMuteMember(Member member, Duration duration) {
+        String reason = templateService.renderSimpleTemplate(SELF_MUTE_REASON_TEMPLATE, member.getGuild().getIdLong());
+        log.info("Self muting user {} in server {}.", member.getIdLong(), member.getGuild().getIdLong());
+        return memberService.timeoutUser(member, duration, reason);
+    }
+}

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.1.0/collection.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.1.0/seedData/data.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.1.0/seedData/default_emote.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="moderation_custom_reaction_message_default_emote-insert">
         <insert tableName="default_emote">
             <column name="emote_key" value="reactionReport1"/>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.1.0/seedData/feature.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="moderation_custom_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="moderationCustom"/>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.2.1/collection.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.2.1/seedData/command.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <property name="moderationCustomFeature" value="(SELECT id FROM feature WHERE key = 'moderationCustom')"/>
     <property name="moderationModule" value="(SELECT id FROM module WHERE name = 'moderation')"/>
     <changeSet  author="Sheldan" id="moderationCustom_modmode-commands">

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.2.1/seedData/data.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/collection.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/seedData/data.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/seedData/default_emote.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <changeSet author="Sheldan" id="moderation_custom_reaction_message_question_mark_emote-insert">
+        <insert tableName="default_emote">
+            <column name="emote_key" value="reactionReport6"/>
+            <column name="name" value="❓"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/collection.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/seedData/command.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.5.9/seedData/data.xml

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

application/sissi-customizations/moderation-custom/src/main/resources/migrations/moderation-custom-changeLog.xml

@@ -1,11 +1,9 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd">
     <include file="1.1.0/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.2.1/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.4.45/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.9/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/sissi-customizations/moderation-custom/src/main/resources/moderation-custom.properties

@@ -2,7 +2,7 @@ abstracto.featureFlags.moderationCustom.featureName=moderationCustom
 abstracto.featureFlags.moderationCustom.enabled=false
 
 abstracto.systemConfigs.reportReactionAmount.name=reportReactionAmount
-abstracto.systemConfigs.reportReactionAmount.longValue=5
+abstracto.systemConfigs.reportReactionAmount.longValue=7
 
 abstracto.systemConfigs.modModeRoleId.name=modModeRoleId
 abstracto.systemConfigs.modModeRoleId.longValue=0

application/sissi-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>application</artifactId>
         <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/debra/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,6 +15,11 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.scheduling</groupId>
+            <artifactId>scheduling-int</artifactId>
+            <version>${abstracto.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -28,6 +33,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/api/DebraDonationStatusController.java

@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME;
-
 @RestController
 @RequestMapping(value = "/debra")
 public class DebraDonationStatusController {
@@ -20,50 +18,38 @@ public class DebraDonationStatusController {
 
     @GetMapping(value = "/latestDonations", produces = "application/json")
     public DonationStats getLatestDonations() {
-        Long serverId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
-        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount(serverId);
+        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount();
         List<DonationInfo> donations = donationService.getLatestDonations(donationResponse, Integer.MAX_VALUE)
                 .stream()
                 .map(DonationInfo::fromDonationItemModel)
                 .toList();
         return DonationStats
                 .builder()
-                .totalAmount(donationResponse.getPage().getCollected())
+                .totalAmount(donationResponse.getCurrentDonationAmount())
                 .donations(donations)
                 .build();
     }
 
     @GetMapping(value = "/highestDonations", produces = "application/json")
     public DonationStats getHighestDonations() {
-        Long serverId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
-        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount(serverId);
+        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount();
         List<DonationInfo> donations = donationService.getHighestDonations(donationResponse, Integer.MAX_VALUE)
                 .stream()
                 .map(DonationInfo::fromDonationItemModel)
                 .toList();
         return DonationStats
                 .builder()
-                .totalAmount(donationResponse.getPage().getCollected())
+                .totalAmount(donationResponse.getCurrentDonationAmount())
                 .donations(donations)
                 .build();
     }
 
     @GetMapping(value = "/campaignInfo", produces = "application/json")
     public CampaignInfo getCampaignInfo() {
-        Long serverId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
-        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount(serverId);
+        DonationsResponse donationResponse = donationService.getSynchronizedCachedDonationAmount();
 
-        Description pageObject = donationResponse.getPage();
         return CampaignInfo
                 .builder()
-                .collected(pageObject.getCollected())
-                .collectedNet(pageObject.getCollectedNet())
-                .donationCount(donationResponse.getDonationCount())
-                .currency(pageObject.getCurrency())
-                .percent(pageObject.getPercent())
-                .displayName(pageObject.getDisplayName())
-                .slug(pageObject.getSlug())
-                .target(pageObject.getTarget())
                 .build();
     }
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/api/EndlessStreamController.java

@@ -36,8 +36,8 @@ public class EndlessStreamController {
     public EndlessStreamInfo getLatestDonations(@PathVariable("id") Long id) {
         Long serverId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
         EndlessStream endlessStream = endlessStreamManagementServiceBean.getEndlessStream(id);
-        DonationsResponse donationInfo = donationService.getSynchronizedCachedDonationAmount(serverId);
-        BigDecimal collectedAmount = donationInfo.getPage().getCollected();
+        DonationsResponse donationInfo = donationService.getSynchronizedCachedDonationAmount();
+        BigDecimal collectedAmount = donationInfo.getCurrentDonationAmount();
         Long minuteRate = configService.getLongValueOrConfigDefault(DebraFeatureConfig.ENDLESS_STREAM_MINUTE_RATE, serverId);
         Instant endDate = endlessStream.getStartTime().plus(collectedAmount.multiply(new BigDecimal(minuteRate)).toBigInteger().longValue(), ChronoUnit.MINUTES);
         return EndlessStreamInfo

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/DebraInfoButton.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.debra.config.DebraFeatureDefinition;
 import dev.sheldan.sissi.module.debra.config.DebraSlashCommandNames;
@@ -58,6 +59,7 @@ public class DebraInfoButton extends AbstractConditionableCommand {
                 .enabled(true)
                 .rootCommandName(DebraSlashCommandNames.DEBRA_INTERNAL)
                 .commandName("debrainfobutton")
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .build();
 
         Parameter targetChannelParameter = Parameter

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/Donations.java

@@ -6,9 +6,9 @@ import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
+import dev.sheldan.abstracto.core.command.execution.CommandParameterKey;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
-import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
@@ -26,7 +26,6 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -70,11 +69,12 @@ public class Donations extends AbstractConditionableCommand {
             Integer selectionValue = (Integer) parameters.get(1);
             Integer top = null;
             Integer latest = null;
-            switch (type) {
-                case "top": top = selectionValue; break;
-                default:
-                case "latest" :
-                    latest = selectionValue; break;
+            if(type != null) {
+                DonationsTypeParameterKey typeKey = CommandParameterKey.getEnumFromKey(DonationsTypeParameterKey.class, type);
+                switch (typeKey) {
+                    case LATEST -> latest = selectionValue;
+                    case TOP -> top = selectionValue;
+                }
             }
             messageToSend = getDonationMessageToSend(commandContext.getGuild().getIdLong(), top, latest);
         }
@@ -98,11 +98,10 @@ public class Donations extends AbstractConditionableCommand {
         Integer top = null;
         Integer latest = null;
         if(selectionType != null) {
-            switch (selectionType) {
-                case "top": top = selectionValue; break;
-                default:
-                case "latest" :
-                    latest = selectionValue; break;
+            DonationsTypeParameterKey typeKey = CommandParameterKey.getEnumFromKey(DonationsTypeParameterKey.class, selectionType);
+            switch (typeKey) {
+                case LATEST -> latest = selectionValue;
+                case TOP -> top = selectionValue;
             }
         }
 
@@ -113,7 +112,7 @@ public class Donations extends AbstractConditionableCommand {
 
     private MessageToSend getDonationMessageToSend(Long serverId, Integer top, Integer latest) {
         DonationsModel donationModel;
-        DonationsResponse donationResponse = donationService.fetchCurrentDonationAmount(serverId);
+        DonationsResponse donationResponse = donationService.fetchCurrentDonations();
         donationModel = donationConverter.convertDonationResponse(donationResponse);
         if(top != null) {
             donationModel.setDonations(donationService.getHighestDonations(donationResponse, top));
@@ -124,7 +123,7 @@ public class Donations extends AbstractConditionableCommand {
         } else {
             donationModel.setDonations(new ArrayList<>());
         }
-        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel);
+        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel, serverId);
     }
 
     @Override
@@ -146,7 +145,7 @@ public class Donations extends AbstractConditionableCommand {
                 .templated(true)
                 .name(SELECTION_PARAMETER)
                 .optional(true)
-                .type(String.class)
+                .type(DonationsTypeParameterKey.class)
                 .build();
 
 

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/DonationsTypeParameterKey.java

@@ -0,0 +1,13 @@
+package dev.sheldan.sissi.module.debra.commands;
+
+import dev.sheldan.abstracto.core.command.execution.CommandParameterKey;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum DonationsTypeParameterKey implements CommandParameterKey {
+    TOP("top"), LATEST("latest");
+
+    private String key;
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraFeatureConfig.java

@@ -13,7 +13,6 @@ public class DebraFeatureConfig implements FeatureConfig {
 
     public static final String DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY = "debraDonationNotificationDelayMillis";
     public static final String ENDLESS_STREAM_MINUTE_RATE = "endlessStreamMinuteRate";
-    public static final String DEBRA_DONATION_API_FETCH_SIZE_KEY = "debraDonationApiFetchSize";
     public static final String DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME = "DEBRA_DONATION_NOTIFICATION_SERVER_ID";
     @Override
     public FeatureDefinition getFeature() {
@@ -27,6 +26,6 @@ public class DebraFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY, DEBRA_DONATION_API_FETCH_SIZE_KEY, ENDLESS_STREAM_MINUTE_RATE);
+        return Arrays.asList(DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY, ENDLESS_STREAM_MINUTE_RATE);
     }
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/DebraProperties.java

@@ -10,6 +10,5 @@ import org.springframework.context.annotation.Configuration;
 @Setter
 @ConfigurationProperties(prefix = "sissi.debra")
 public class DebraProperties {
-    private String websocketURL;
-    private String donationAPIUrl;
+    private String donationPageUrl;
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/converter/DonationConverter.java

@@ -1,6 +1,6 @@
 package dev.sheldan.sissi.module.debra.converter;
 
-import dev.sheldan.sissi.module.debra.model.api.Donation;
+import dev.sheldan.sissi.module.debra.model.api.DonationDto;
 import dev.sheldan.sissi.module.debra.model.api.DonationsResponse;
 import dev.sheldan.sissi.module.debra.model.commands.DonationItemModel;
 import dev.sheldan.sissi.module.debra.model.commands.DonationsModel;
@@ -9,20 +9,19 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class DonationConverter {
-    public DonationItemModel convertDonation(Donation donation) {
+    public DonationItemModel convertDonation(DonationDto donation) {
         return DonationItemModel
                 .builder()
                 .donationAmount(donation.getAmount())
-                .firstName(donation.getFirstname())
-                .lastName(donation.getLastname())
-                .anonymous(BooleanUtils.toBoolean(donation.getAnonym()))
+                .name(donation.getName())
+                .anonymous(BooleanUtils.toBoolean(donation.getAnonymous()))
                 .build();
     }
 
     public DonationsModel convertDonationResponse(DonationsResponse response) {
         return DonationsModel
                 .builder()
-                .totalAmount(response.getPage().getCollected())
+                .totalAmount(response.getCurrentDonationAmount())
                 .build();
     }
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/job/DonationFetchJob.java

@@ -0,0 +1,31 @@
+package dev.sheldan.sissi.module.debra.job;
+
+import dev.sheldan.sissi.module.debra.service.DonationService;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.PersistJobDataAfterExecution;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@DisallowConcurrentExecution
+@Component
+@PersistJobDataAfterExecution
+public class DonationFetchJob extends QuartzJobBean {
+
+    @Autowired
+    private DonationService donationService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+        try {
+            log.info("Checking for new donations.");
+            donationService.checkForNewDonations();
+        } catch (Exception e) {
+            log.error("Failed to check for new donations.", e);
+        }
+    }
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/listener/WebsocketListener.java

@@ -1,96 +0,0 @@
-package dev.sheldan.sissi.module.debra.listener;
-
-import dev.sheldan.abstracto.core.listener.AsyncStartupListener;
-import dev.sheldan.abstracto.core.service.ConfigService;
-import dev.sheldan.sissi.module.debra.config.DebraProperties;
-import dev.sheldan.sissi.module.debra.model.listener.DonationResponseModel;
-import dev.sheldan.sissi.module.debra.service.DonationService;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY;
-import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME;
-
-@Component
-@Slf4j
-public class WebsocketListener extends WebSocketListener implements AsyncStartupListener {
-
-    @Autowired
-    private DonationService donationService;
-
-    @Autowired
-    private DebraProperties debraProperties;
-
-    @Autowired
-    private ConfigService configService;
-
-    private WebSocket webSocketObj;
-    private OkHttpClient clientObj;
-
-    @Override
-    public void onOpen(WebSocket webSocket, Response response) {
-        log.info("Connected to donation websocket.");
-        super.onOpen(webSocket, response);
-    }
-
-    @Override
-    public void onMessage(WebSocket webSocket, String text) {
-        CompletableFuture.runAsync(() -> {
-            log.info("Handling received message on websocket.");
-            try {
-                Long targetServerId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
-                Long delayMillis = configService.getLongValueOrConfigDefault(DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY, targetServerId);
-                log.info("Waiting {} milli seconds to send notification.", delayMillis);
-                Thread.sleep(delayMillis);
-                log.info("Loading new donation amount and sending notification.");
-                DonationResponseModel donation = donationService.parseDonationFromMessage(text);
-                donationService.sendDonationNotification(donation).thenAccept(unused -> {
-                    log.info("Successfully notified about donation.");
-                }).exceptionally(throwable -> {
-                    log.error("Failed to notify about donation.", throwable);
-                    return null;
-                });
-            } catch (Exception exception) {
-                log.error("Failed to handle websocket message.", exception);
-            }
-        });
-    }
-
-    @Override
-    public void onFailure(WebSocket webSocket, Throwable t, @Nullable Response response) {
-        log.warn("Websocket connection failed...", t);
-    }
-
-    @Override
-    public void onClosing(WebSocket webSocket, int code, String reason) {
-        log.info("Closing websocket connection. It was closed with code {} and reason {}.", code, reason);
-    }
-
-    @Override
-    public void execute() {
-        if(clientObj != null) {
-            clientObj.connectionPool().evictAll();
-            clientObj.dispatcher().executorService().shutdownNow();
-        }
-        clientObj = new OkHttpClient.Builder()
-                .readTimeout(0, TimeUnit.MILLISECONDS)
-                .retryOnConnectionFailure(true)
-                .build();
-        startConnection(clientObj);
-        clientObj.dispatcher().executorService().shutdown();
-    }
-
-    private void startConnection(OkHttpClient client) {
-        log.info("Starting websocket connection.");
-        Request request = new Request.Builder()
-                .url(debraProperties.getWebsocketURL())
-                .build();
-        this.webSocketObj = client.newWebSocket(request, this);
-    }
-}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/Description.java

@@ -1,28 +0,0 @@
-package dev.sheldan.sissi.module.debra.model.api;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-@Getter
-@Setter
-@Builder
-public class Description {
-    @SerializedName("collected")
-    private BigDecimal collected;
-    @SerializedName("target")
-    private BigDecimal target;
-    @SerializedName("currency")
-    private String currency;
-    @SerializedName("slug")
-    private String slug;
-    @SerializedName("displayname")
-    private String displayName;
-    @SerializedName("collectednet")
-    private BigDecimal collectedNet;
-    @SerializedName("percent")
-    private BigDecimal percent;
-}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/Donation.java

@@ -1,26 +0,0 @@
-package dev.sheldan.sissi.module.debra.model.api;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-@Getter
-@Setter
-@Builder
-public class Donation {
-    @SerializedName("amount")
-    private BigDecimal amount;
-    @SerializedName("currency")
-    private String currency;
-    @SerializedName("text")
-    private String text;
-    @SerializedName("anonym")
-    private Integer anonym;
-    @SerializedName("firstname")
-    private String firstname;
-    @SerializedName("lastname")
-    private String lastname;
-}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/DonationDto.java

@@ -0,0 +1,27 @@
+package dev.sheldan.sissi.module.debra.model.api;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Setter
+@Builder
+@ToString
+public class DonationDto {
+    private BigDecimal amount;
+    private String currency;
+    private String text;
+    private Boolean anonymous;
+    private String name;
+    private LocalDate date;
+
+    public String stringRepresentation() {
+        return String.format("%s %s %s %s %s", name, amount, text, anonymous, date.format(DateTimeFormatter.ISO_DATE));
+    }
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/DonationInfo.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 @Setter
 @Builder
 public class DonationInfo {
-    private String firstName;
+    private String name;
     private BigDecimal donationAmount;
     private Boolean anonymous;
 
@@ -20,7 +20,7 @@ public class DonationInfo {
                 .builder()
                 .donationAmount(donationItemModel.getDonationAmount())
                 .anonymous(donationItemModel.getAnonymous())
-                .firstName(donationItemModel.getFirstName())
+                .name(donationItemModel.getName())
                 .build();
     }
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/api/DonationsResponse.java

@@ -1,21 +1,18 @@
 package dev.sheldan.sissi.module.debra.model.api;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigInteger;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Getter
 @Setter
 @Builder
 public class DonationsResponse {
-    @SerializedName("page")
-    private Description page;
-    @SerializedName("donation_count")
-    private BigInteger donationCount;
-    @SerializedName("donations")
-    private List<Donation> donations;
+    private BigDecimal currentDonationAmount;
+    private BigDecimal donationAmountGoal;
+    private int donationCount;
+    private List<DonationDto> donations;
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/commands/DonationItemModel.java

@@ -5,13 +5,14 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 @Getter
 @Setter
 @Builder
 public class DonationItemModel {
-    private String firstName;
-    private String lastName;
+    private String name;
+    private LocalDate date;
     private BigDecimal donationAmount;
     private Boolean anonymous;
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/database/Donation.java

@@ -0,0 +1,30 @@
+package dev.sheldan.sissi.module.debra.model.database;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+
+@Builder
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "donation")
+@Getter
+@Setter
+@EqualsAndHashCode
+public class Donation {
+    @Id
+    @Column(name = "id", nullable = false)
+    private String id;
+
+    // we cant be sure about duplicates
+    @Column(name = "count")
+    private Integer count;
+
+    @Column(name = "created")
+    private Instant created;
+
+    @Column(name = "updated")
+    private Instant updated;
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/model/listener/DonationResponseModel.java

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 @ToString
 public class DonationResponseModel {
     private String donatorName;
+    private Boolean anonymous;
     private BigDecimal amount;
     private String message;
 }

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/repository/DonationRepository.java

@@ -0,0 +1,9 @@
+package dev.sheldan.sissi.module.debra.repository;
+
+import dev.sheldan.sissi.module.debra.model.database.Donation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DonationRepository extends JpaRepository<Donation, String> {
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java

@@ -1,52 +1,52 @@
 package dev.sheldan.sissi.module.debra.service;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.interaction.ComponentPayloadService;
 import dev.sheldan.abstracto.core.interaction.ComponentService;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
-import dev.sheldan.abstracto.core.service.ConfigService;
+import dev.sheldan.abstracto.core.service.HashService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.CompletableFutureList;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.sissi.module.debra.exception.DonationAmountNotFoundException;
 import dev.sheldan.sissi.module.debra.config.DebraPostTarget;
 import dev.sheldan.sissi.module.debra.config.DebraProperties;
 import dev.sheldan.sissi.module.debra.converter.DonationConverter;
-import dev.sheldan.sissi.module.debra.model.api.Donation;
+import dev.sheldan.sissi.module.debra.model.api.DonationDto;
 import dev.sheldan.sissi.module.debra.model.api.DonationsResponse;
 import dev.sheldan.sissi.module.debra.model.commands.DebraInfoButtonPayload;
 import dev.sheldan.sissi.module.debra.model.commands.DebraInfoModel;
 import dev.sheldan.sissi.module.debra.model.commands.DonationItemModel;
 import dev.sheldan.sissi.module.debra.model.commands.DonationsModel;
+import dev.sheldan.sissi.module.debra.model.database.Donation;
 import dev.sheldan.sissi.module.debra.model.listener.DonationResponseModel;
 import dev.sheldan.sissi.module.debra.model.listener.DonationNotificationModel;
+import dev.sheldan.sissi.module.debra.service.management.DonationManagementServiceBean;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
+import org.apache.commons.lang3.tuple.Pair;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_API_FETCH_SIZE_KEY;
 import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME;
 
 @Component
@@ -62,15 +62,9 @@ public class DonationService {
     @Autowired
     private TemplateService templateService;
 
-    @Autowired
-    private OkHttpClient okHttpClient;
-
     @Autowired
     private DonationConverter donationConverter;
 
-    @Autowired
-    private ConfigService configService;
-
     @Autowired
     private ChannelService channelService;
 
@@ -83,106 +77,215 @@ public class DonationService {
     @Autowired
     private ServerManagementService serverManagementService;
 
+    @Autowired
+    private DonationManagementServiceBean donationManagementServiceBean;
+
+    @Autowired
+    private HashService hashService;
+
     @Autowired
     private DonationService self;
 
     private static final String DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY = "debra_donation_notification";
 
-    private static final Pattern MESSAGE_PATTERN = Pattern.compile("(.*) hat (\\d{1,9},\\d{2}) Euro gespendet!<br \\/>Vielen Dank!<br \\/>Nachricht:<br \\/>(.*)");
-
     private static final String DEBRA_INFO_BUTTON_MESSAGE_TEMPLATE_KEY = "debraInfoButton";
     public static final String DEBRA_INFO_BUTTON_ORIGIN = "DEBRA_INFO_BUTTON";
-
-    public DonationResponseModel parseDonationFromMessage(String message) {
-        Matcher matcher = MESSAGE_PATTERN.matcher(message);
-        if (matcher.find()) {
-            String donatorName = matcher.group(1);
-            String amountString = matcher.group(2);
-            BigDecimal amount = new BigDecimal(amountString.replace(',', '.'));
-            String donationMessage = Optional.ofNullable(matcher.group(3)).map(msg -> msg.replaceAll("(<br>)+", " ")).map(String::trim).orElse("");
-            return DonationResponseModel
-                    .builder()
-                    .message(donationMessage)
-                    .donatorName(donatorName)
-                    .amount(amount)
-                    .build();
-        } else {
-            throw new IllegalArgumentException("String in wrong format");
-        }
-    }
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("d.M.y");
 
     public List<DonationItemModel> getHighestDonations(DonationsResponse response, Integer maxCount) {
-        List<Donation> topDonations = response
+        return response
                 .getDonations()
                 .stream()
-                .sorted(Comparator.comparing(Donation::getAmount)
+                .sorted(Comparator.comparing(DonationDto::getAmount)
                         .reversed())
-                .collect(Collectors.toList());
-        return topDonations
-                .stream()
                 .limit(maxCount)
                 .map(donation -> donationConverter.convertDonation(donation))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public List<DonationItemModel> getLatestDonations(DonationsResponse response, Integer maxCount) {
         return response
                 .getDonations()
                 .stream()
+                .sorted(Comparator.comparing(DonationDto::getDate).reversed())
                 .limit(maxCount)
                 .map(donation -> donationConverter.convertDonation(donation))
                 .collect(Collectors.toList());
     }
 
-    public synchronized DonationsResponse getSynchronizedCachedDonationAmount(Long serverId) {
-        return self.getCachedDonationAmount(serverId);
+    public synchronized DonationsResponse getSynchronizedCachedDonationAmount() {
+        return self.getCachedDonationAmount();
     }
 
     @Cacheable(value = "donation-cache")
-    public synchronized DonationsResponse getCachedDonationAmount(Long serverId) {
-        return self.fetchCurrentDonationAmount(serverId);
+    public synchronized DonationsResponse getCachedDonationAmount() {
+        return self.fetchCurrentDonations();
     }
 
-    public DonationsResponse fetchCurrentDonationAmount(Long serverId) {
+    public DonationsResponse fetchCurrentDonations() {
         try {
-            Long fetchSize = configService.getLongValueOrConfigDefault(DEBRA_DONATION_API_FETCH_SIZE_KEY, serverId);
-            Request request = new Request.Builder()
-                    .url(String.format(debraProperties.getDonationAPIUrl(), fetchSize))
-                    .get()
-                    .build();
-            Response response = okHttpClient.newCall(request).execute();
-            if(!response.isSuccessful()) {
-                log.error("Failed to retrieve donation response. Response had code {} with body {} and headers {}.",
-                        response.code(), response.body().string(), response.headers());
-                throw new DonationAmountNotFoundException();
+            Document donationPage = Jsoup.connect(debraProperties.getDonationPageUrl()).get();
+            DecimalFormat decimalFormat = getDecimalFormat();
+            Element endValueElement = donationPage.getElementById("end-value");
+            String endValueString = endValueElement.text();
+            Elements currentValueElement = donationPage.getElementsByClass("current_amount").get(0).getElementsByClass("value");
+            String[] valueArray = currentValueElement.text().split(" ");
+            String currentValueString = valueArray[0];
+            String currency = valueArray[1];
+            BigDecimal currentValue = (BigDecimal) decimalFormat.parse(currentValueString);
+            BigDecimal endValue = (BigDecimal) decimalFormat.parse(endValueString);
+            Element list = donationPage.getElementsByClass("donor-list").first();
+            Elements donationElements = list.getElementsByClass("list-item");
+            List<DonationDto> donations = new ArrayList<>();
+            for (Element donationMainElement : donationElements.asList()) {
+                Elements nameElement = donationMainElement.getElementsByClass("donor-list-name");
+                Elements dateElement = donationMainElement.getElementsByClass("donor-list-date");
+                Elements amountElement = donationMainElement.getElementsByClass("donor-list-amount");
+                Elements textElement = donationMainElement.getElementsByClass("donor-list-amount-text");
+                LocalDate dateValue;
+                if (dateElement.hasText()) {
+                    dateValue = LocalDate.parse(dateElement.text(), DATE_FORMAT);
+                } else {
+                    dateValue = null;
+                }
+                BigDecimal amount;
+                if (amountElement.hasText()) {
+                    String amountText = amountElement.text().split(" ")[0];
+                    amount = (BigDecimal) decimalFormat.parse(amountText);
+                } else {
+                    amount = null;
+                }
+                String additionalText = textElement.text();
+                String name = nameElement.text();
+                boolean anonymous = name.isBlank();
+                donations.add(DonationDto
+                        .builder()
+                        .anonymous(anonymous)
+                        .name(nameElement.text())
+                        .amount(amount)
+                        .currency(currency)
+                        .name(name)
+                        .text(additionalText)
+                        .date(dateValue)
+                        .build());
             }
-            Gson gson = getGson();
-            return gson.fromJson(response.body().string(), DonationsResponse.class);
+            return DonationsResponse
+                    .builder()
+                    .donations(donations)
+                    .currentDonationAmount(currentValue)
+                    .donationAmountGoal(endValue)
+                    .donationCount(donations.size())
+                    .build();
         } catch (Exception exception) {
             throw new AbstractoRunTimeException(exception);
         }
 
     }
 
-    private Gson getGson() {
-        return new GsonBuilder()
-                .registerTypeAdapter(BigDecimal.class, new BigDecimalGsonAdapter())
-                .create();
+    private DecimalFormat getDecimalFormat() {
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+        symbols.setGroupingSeparator('.');
+        symbols.setDecimalSeparator(',');
+        String pattern = "#,##0.0#";
+
+        DecimalFormat decimalFormat = new DecimalFormat(pattern, symbols);
+        decimalFormat.setParseBigDecimal(true);
+        return decimalFormat;
     }
 
-    private DonationsModel getDonationInfoModel(Long serverId) {
-        return donationConverter.convertDonationResponse(fetchCurrentDonationAmount(serverId));
+    private DonationsModel getDonationInfoModel() {
+        return donationConverter.convertDonationResponse(fetchCurrentDonations());
     }
 
-    public CompletableFuture<Void> sendDonationNotification(DonationResponseModel donation) throws IOException {
+
+    private String hashDonation(DonationDto donation) {
+        return hashService.sha256HashString(donation.stringRepresentation());
+    }
+
+    @Transactional
+    public void checkForNewDonations() {
+        List<Donation> allDonations = donationManagementServiceBean.getAllDonations();
+        Map<String, Integer> existingHashes = allDonations
+                .stream()
+                .collect(Collectors.toMap(Donation::getId, Donation::getCount));
+        DonationsResponse donationResponse = fetchCurrentDonations();
+        Map<String, Pair<Integer, DonationDto>> donationFromPageHashes = new HashMap<>();
+        donationResponse.getDonations().forEach(donationDto -> {
+            String thisHash = hashDonation(donationDto);
+            if(donationFromPageHashes.containsKey(thisHash)) {
+                donationFromPageHashes.put(thisHash, Pair.of(donationFromPageHashes.get(thisHash).getLeft() + 1, donationDto));
+            } else {
+                donationFromPageHashes.put(thisHash, Pair.of(1, donationDto));
+            }
+        });
+
+        Set<String> pageHashesToRemove = new HashSet<>();
+        donationFromPageHashes.entrySet().forEach(pageHash -> {
+            if(existingHashes.containsKey(pageHash.getKey())) {
+                Integer existingDonation = existingHashes.get(pageHash.getKey());
+                int amountDifference = pageHash.getValue().getKey() - existingDonation;
+                if(amountDifference == 0) {
+                    pageHashesToRemove.add(pageHash.getKey()); // it matches 1:1, we know about all of them already
+                } if(amountDifference < 0) {
+                    pageHashesToRemove.add(pageHash.getKey());
+                    log.warn("We have more donations than on the page of hash {}:{}.", pageHash.getKey(), amountDifference);
+                } else {
+                    pageHash.setValue(Pair.of(amountDifference, pageHash.getValue().getRight()));
+                }
+            }
+        });
+        pageHashesToRemove.forEach(donationFromPageHashes::remove);
+        if(donationFromPageHashes.isEmpty()) {
+            log.info("No new donations - ending search.");
+            return;
+        }
+
+        List<CompletableFuture<Void>> notificationFutures = new ArrayList<>();
+        donationFromPageHashes.values().forEach(donationInfo -> {
+            for (int i = 0; i < donationInfo.getLeft(); i++) {
+                DonationDto donationDto = donationInfo.getRight();
+                DonationResponseModel model = DonationResponseModel
+                        .builder()
+                        .message(donationDto.getText())
+                        .donatorName(donationDto.getName())
+                        .amount(donationDto.getAmount())
+                        .anonymous(donationDto.getAnonymous())
+                        .build();
+                notificationFutures.add(sendDonationNotification(model));
+            }
+        });
+        new CompletableFutureList<>(notificationFutures).getMainFuture().thenAccept(unused -> {
+            log.info("All {} notifications send.", notificationFutures.size());
+        }).exceptionally(throwable -> {
+            log.warn("Failed to send notifications about {} new donations.", notificationFutures.size(), throwable);
+            return null;
+        });
+        log.info("Creating/updating {} donation entries.", donationFromPageHashes.size());
+        allDonations.forEach(donation -> {
+            Set<String> donationsToRemoveBecauseUpdate = new HashSet<>();
+            donationFromPageHashes.forEach((key, value) -> {
+                // its assumed that donationFromPageHashes only contains donations that need to be created
+                if (donation.getId().equals(key)) {
+                    donation.setCount(value.getLeft() + donation.getCount());
+                    donationManagementServiceBean.updateDonation(donation);
+                    donationsToRemoveBecauseUpdate.add(key);
+                }
+            });
+            donationsToRemoveBecauseUpdate.forEach(donationFromPageHashes::remove);
+        });
+        donationFromPageHashes.forEach((key, value) ->
+                donationManagementServiceBean.saveDonation(key, value.getLeft()));
+    }
+
+    public CompletableFuture<Void> sendDonationNotification(DonationResponseModel donation) {
         Long targetServerId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
-        DonationsModel donationInfoModel = getDonationInfoModel(targetServerId);
+        DonationsModel donationInfoModel = getDonationInfoModel();
         DonationNotificationModel model = DonationNotificationModel
                 .builder()
                 .donation(donation)
                 .totalDonationAmount(donationInfoModel.getTotalAmount())
                 .build();
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
         List<CompletableFuture<Message>> firstMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId);
         List<CompletableFuture<Message>> secondMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2, targetServerId);
         firstMessage.addAll(secondMessage);

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/management/DonationManagementServiceBean.java

@@ -0,0 +1,33 @@
+package dev.sheldan.sissi.module.debra.service.management;
+
+import dev.sheldan.sissi.module.debra.model.database.Donation;
+import dev.sheldan.sissi.module.debra.repository.DonationRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DonationManagementServiceBean {
+
+    @Autowired
+    private DonationRepository donationRepository;
+
+    public List<Donation> getAllDonations() {
+        return donationRepository.findAll();
+    }
+
+    public void updateDonation(Donation donation) {
+        donationRepository.save(donation);
+    }
+
+    public Donation saveDonation(String hash, Integer count) {
+        Donation donation = Donation
+                .builder()
+                .id(hash)
+                .count(count)
+                .build();
+        return donationRepository.save(donation);
+    }
+
+}

application/sissi-modules/debra/src/main/resources/debra.properties

@@ -4,8 +4,7 @@ abstracto.featureFlags.debra.enabled=false
 abstracto.postTargets.debraDonationNotification.name=debraDonationNotification
 abstracto.postTargets.debraDonationNotification2.name=debraDonationNotification2
 
-sissi.debra.websocketURL=ws://spenden.baba.fm:8765/
-sissi.debra.donationAPIUrl=https://www.altruja.de/api/page/discord-gg-austria-fuer-debra-2023?details=1&num=%s&ort=0
+sissi.debra.donationPageUrl=https://secure.sicherhelfen.org/campaigns/07a3baf6-5cdc-4300-854b-ea2b36b0b218/show
 
 abstracto.systemConfigs.debraDonationNotificationDelayMillis.name=debraDonationNotificationDelayMillis
 abstracto.systemConfigs.debraDonationNotificationDelayMillis.longValue=60000

application/sissi-modules/debra/src/main/resources/migrations/1.3.6/collection.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.3.6/seedData/command.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
     <property name="debraFeature" value="(SELECT id FROM feature WHERE key = 'debra')"/>
 

application/sissi-modules/debra/src/main/resources/migrations/1.3.6/seedData/data.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.3.6/seedData/feature.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan"  id="debra_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="debra"/>

application/sissi-modules/debra/src/main/resources/migrations/1.4.21/collection.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.4.21/seedData/command.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
     <property name="debraFeature" value="(SELECT id FROM feature WHERE key = 'debra')"/>
 

application/sissi-modules/debra/src/main/resources/migrations/1.4.21/seedData/data.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.4.29/collection.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.4.29/tables/endless_stream.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="endless_stream-table">
         <createTable tableName="endless_stream">
             <column name="id" autoIncrement="true" type="BIGINT">

application/sissi-modules/debra/src/main/resources/migrations/1.4.29/tables/tables.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.5.16/collection.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.5.16/seedData/data.xml

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

application/sissi-modules/debra/src/main/resources/migrations/1.5.16/seedData/donation_fetch_job.xml

@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <changeSet author="Sheldan" id="donation_fetch_job-insert">
+        <insert tableName="scheduler_job">
+            <column name="name" value="donationFetchJob"/>
+            <column name="group_name" value="debra"/>
+            <column name="clazz" value="dev.sheldan.sissi.module.debra.job.DonationFetchJob"/>
+            <column name="active" value="true"/>
+            <column name="cron_expression" value="0 */2 * * * ?"/>
+            <column name="recovery" value="false"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

application/sissi-modules/debra/src/main/resources/migrations/1.5.16/tables/donation.xml

@@ -0,0 +1,28 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
+    <changeSet author="Sheldan" id="donation-table">
+        <createTable tableName="donation">
+            <column name="id" type="TEXT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="count" type="NUMERIC">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
+        </createTable>
+        <sql>
+            DROP TRIGGER IF EXISTS donation_update_trigger ON donation;
+            CREATE TRIGGER donation_update_trigger BEFORE UPDATE ON donation FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
+        </sql>
+        <sql>
+            DROP TRIGGER IF EXISTS donation_insert_trigger ON donation;
+            CREATE TRIGGER donation_insert_trigger BEFORE INSERT ON donation FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

application/sissi-modules/debra/src/main/resources/migrations/1.5.16/tables/tables.xml

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

application/sissi-modules/debra/src/main/resources/migrations/debra-changeLog.xml

@@ -1,12 +1,9 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <include file="1.3.6/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.21/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.4.29/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.5.16/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/sissi-modules/meetup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.4.40</version>
+        <version>1.5.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CancelMeetup.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
@@ -88,6 +89,7 @@ public class CancelMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("cancel")
                 .build();
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ChangeMeetup.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
 import dev.sheldan.sissi.module.meetup.config.MeetupSlashCommandNames;
@@ -131,6 +132,7 @@ public class ChangeMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("changeMeetup")
                 .build();
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ChangeMeetupTime.java

@@ -11,6 +11,7 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.ComponentService;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
@@ -150,6 +151,7 @@ public class ChangeMeetupTime extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("changeTime")
                 .build();
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java

@@ -12,6 +12,7 @@ import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.ComponentService;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
@@ -165,6 +166,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
         Parameter topicParameter = Parameter
                 .builder()
                 .templated(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(256)))
                 .name(TOPIC_PARAMETER)
                 .type(String.class)
                 .build();
@@ -173,6 +175,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .builder()
                 .templated(true)
                 .name(DESCRIPTION_PARAMETER)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(2048)))
                 .remainder(true)
                 .optional(true)
                 .type(String.class)
@@ -183,6 +186,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .templated(true)
                 .name(LOCATION_PARAMETER)
                 .remainder(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(100)))
                 .optional(true)
                 .slashCommandOnly(true)
                 .type(String.class)
@@ -198,6 +202,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("create")
                 .build();
 

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/NotifyMeetupParticipants.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
+import dev.sheldan.abstracto.core.interaction.slash.SlashCommandPrivilegeLevels;
 import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
 import dev.sheldan.sissi.module.meetup.config.MeetupSlashCommandNames;
@@ -22,6 +23,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -48,19 +50,6 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
     private static final String NOTIFY_MEETUP_PARTICIPANTS_COMMAND = "notifyMeetupParticipants";
     private static final String NOTIFY_MEETUP_PARTICIPANTS_RESPONSE = "notifyMeetupParticipants_response";
 
-    @Override
-    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        List<Object> parameters = commandContext.getParameters().getParameters();
-        Long meetupId = (Long) parameters.get(0);
-        Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, commandContext.getGuild().getIdLong());
-        if(!meetup.getOrganizer().getUserReference().getId().equals(commandContext.getAuthor().getIdLong())) {
-            throw new NotMeetupOrganizerException();
-        }
-        String notificationMessage = (String) parameters.get(1);
-        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, null)
-                .thenApply(unused -> CommandResult.fromSuccess());
-    }
-
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         Long meetupId = slashCommandParameterService.getCommandOption(MEETUP_ID_PARAMETER, event, Integer.class).longValue();
@@ -68,12 +57,15 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
         if(!meetup.getOrganizer().getUserReference().getId().equals(event.getMember().getIdLong())) {
             throw new NotMeetupOrganizerException();
         }
-        MeetupDecision toNotify = null;
-        if(slashCommandParameterService.hasCommandOption(NOTIFICATION_MEETUP_DECISION, event)) {
-            toNotify = MeetupDecision.valueOf(slashCommandParameterService.getCommandOption(NOTIFICATION_MEETUP_DECISION, event, String.class));
+        List<MeetupDecision> decisionsToNotify = new ArrayList<>();
+        for (int i = 0; i < MeetupDecision.values().length; i++) {
+            if(slashCommandParameterService.hasCommandOption(NOTIFICATION_MEETUP_DECISION + "_" + i, event)) {
+                String choice = slashCommandParameterService.getCommandOption(NOTIFICATION_MEETUP_DECISION + "_" + i, event, String.class);
+                decisionsToNotify.add(MeetupDecision.valueOf(choice));
+            }
         }
         String notificationMessage = slashCommandParameterService.getCommandOption(NOTIFICATION_MESSAGE_PARAMETER, event, String.class);
-        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, toNotify)
+        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, decisionsToNotify)
                 .thenCompose(unused -> interactionService.replyEmbed(NOTIFY_MEETUP_PARTICIPANTS_RESPONSE, event))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
@@ -105,6 +97,8 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .templated(true)
                 .name(NOTIFICATION_MEETUP_DECISION)
                 .type(String.class)
+                .listSize(MeetupDecision.values().length)
+                .isListParam(true)
                 .optional(true)
                 .choices(meetupDecisions)
                 .slashCommandOnly(true)
@@ -120,6 +114,7 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("notify")
                 .build();
 
@@ -129,6 +124,7 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .templated(true)
                 .slashCommandConfig(slashCommandConfig)
                 .async(true)
+                .slashCommandOnly(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
                 .parameters(parameters)

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupConfirmationListener.java

@@ -115,7 +115,7 @@ public class MeetupConfirmationListener implements ButtonClickedListener {
         messageModel.setCancelled(false);
         Long meetupId = payload.getMeetupId();
         Long serverId = payload.getGuildId();
-        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel);
+        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel, model.getServerId());
         List<CompletableFuture<Message>> messageFutures = channelService.sendMessageToSendToChannel(messageToSend, model.getEvent().getMessageChannel());
         FutureUtils.toSingleFutureGeneric(messageFutures).thenAccept(unused -> {
             messageService.deleteMessage(model.getEvent().getMessage());

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java

@@ -59,8 +59,8 @@ public class MeetupDecisionListener implements ButtonClickedListener {
         }
         MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup);
         addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision());
-        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel);
-        channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), model.getEvent().getChannel(), meetup.getMessageId())
+        MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel, model.getServerId());
+        channelService.editMessageInAChannelFuture(messageToSend, model.getEvent().getChannel(), meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId()))
                 .exceptionally(throwable -> {
                     log.info("Failed to update message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId(), throwable);

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java

@@ -206,8 +206,8 @@ public class MeetupServiceBean {
                 .collect(Collectors.toList());
     }
 
-    public MessageToSend getMeetupMessage(MeetupMessageModel model) {
-        return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model);
+    public MessageToSend getMeetupMessage(MeetupMessageModel model, Long serverId) {
+        return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model, serverId);
     }
 
     public CompletableFuture<Void> cancelMeetup(Meetup meetup) {
@@ -221,7 +221,7 @@ public class MeetupServiceBean {
                 .map(meetupComponent -> meetupComponent.getId().getComponentId())
                 .collect(Collectors.toList());
         model.setCancelled(true);
-        MessageToSend meetupMessage = getMeetupMessage(model);
+        MessageToSend meetupMessage = getMeetupMessage(model, serverId);
         return messageService.editMessageInChannel(channel, meetupMessage, meetup.getMessageId())
                 .thenAccept(unused -> self.notifyParticipants(meetupId, serverId))
                 .thenAccept(unused -> self.cleanupMeetup(meetupId, serverId, componentPayloads));
@@ -231,7 +231,7 @@ public class MeetupServiceBean {
     public void notifyParticipants(Long meetupId, Long serverId) {
         Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId);
         MeetupMessageModel model = getMeetupMessageModel(meetup);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model, serverId);
         meetup
                 .getParticipants()
                 .stream()
@@ -293,8 +293,8 @@ public class MeetupServiceBean {
         }
     }
 
-    public CompletableFuture<Void> notifyMeetupParticipants(Meetup meetup, String message, MeetupDecision toNotify) {
-        List<MeetupDecision> decisionsToBeNotified = toNotify == null ? Arrays.asList(MeetupDecision.MAYBE, MeetupDecision.YES) : Arrays.asList(toNotify);
+    public CompletableFuture<Void> notifyMeetupParticipants(Meetup meetup, String message, List<MeetupDecision> toNotify) {
+        List<MeetupDecision> decisionsToBeNotified = toNotify == null || toNotify.isEmpty() ? Arrays.asList(MeetupDecision.MAYBE, MeetupDecision.YES) : toNotify;
         List<MemberDisplay> participants = meetup
                 .getParticipants()
                 .stream()
@@ -319,7 +319,7 @@ public class MeetupServiceBean {
     public void remindParticipants(Long meetupId, Long serverId) {
         Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId);
         MeetupMessageModel model = getMeetupMessageModel(meetup);
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model);
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model, serverId);
         meetup
                 .getParticipants()
                 .stream()
@@ -372,7 +372,7 @@ public class MeetupServiceBean {
         List<Long> userIdsToNotify = participants
                 .stream()
                 .map(meetupParticipator -> meetupParticipator.getParticipator().getUserReference().getId())
-                .collect(Collectors.toList());
+                .toList();
 
         Long serverId = meetup.getServer().getId();
 
@@ -415,7 +415,7 @@ public class MeetupServiceBean {
         List<Long> userInServerIds = participants
                 .stream()
                 .map(meetupParticipant -> meetupParticipant.getParticipator().getUserInServerId())
-                .collect(Collectors.toList());
+                .toList();
         meetup
                 .getParticipants().removeIf(meetupParticipant -> userInServerIds.contains(meetupParticipant.getParticipator().getUserInServerId()));
         MeetupMessageModel meetupMessageModel = getMeetupMessageModel(meetup);
@@ -423,7 +423,7 @@ public class MeetupServiceBean {
         meetupMessageModel.setMaybeParticipants(new ArrayList<>());
         meetupMessageModel.setNoTimeParticipants(new ArrayList<>());
 
-        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel);
+        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId);
         GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId());
         return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId))
@@ -457,7 +457,7 @@ public class MeetupServiceBean {
         Long meetupId = meetup.getId().getId();
         Long serverId = meetup.getId().getServerId();
         MeetupMessageModel meetupMessageModel = getMeetupMessageModel(meetup);
-        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel);
+        MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId);
         GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId());
         return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId())
                 .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId))

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/collection.xml

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

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/seedData/command.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
     <property name="meetupFeature" value="(SELECT id FROM feature WHERE key = 'meetup')"/>
 

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/seedData/data.xml

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

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/seedData/feature.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan"  id="meetup_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="meetup"/>

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/seedData/meetup_cleanup_job.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="meetup-cleanup-job-insert">
         <insert tableName="scheduler_job">
             <column name="name" value="meetupCleanupJob"/>

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/seedData/reminder_job.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="meetup-reminder-job-insert">
         <insert tableName="scheduler_job">
             <column name="name" value="meetupReminderJob"/>

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/tables/meetup.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="meetup-table">
         <createTable tableName="meetup">
             <column name="id" type="BIGINT">

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/tables/meetup_participator.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="meetup_participator-table">
         <createTable tableName="meetup_participator">
             <column name="meetup_participator_user_in_server_id" type="BIGINT">

application/sissi-modules/meetup/src/main/resources/migrations/1.1.0/tables/tables.xml

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

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/collection.xml

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

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/seedData/command.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
     <property name="meetupFeature" value="(SELECT id FROM feature WHERE key = 'meetup')"/>
 

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/seedData/data.xml

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

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/tables/meetup_component.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
     <changeSet author="Sheldan" id="meetup_component-table">
         <createTable tableName="meetup_component">
             <column name="component_id" type="VARCHAR(100)">

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/tables/meetup_participator.xml

@@ -1,11 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd"  >
 <changeSet author="Sheldan" id="meetup_participator-table">
     <sql>
         ALTER TABLE meetup_participator DROP CONSTRAINT check_meetup_participator_decision;

application/sissi-modules/meetup/src/main/resources/migrations/1.2.0/tables/tables.xml

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