[SIS-xxx] upgrading abstracto version

upgrading abstracto version
adding avatar to quote response

.env

@@ -0,0 +1,4 @@
+REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
+ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
+VERSION=1.5.11
+ABSTRACTO_VERSION=1.6.13

.github/workflows/build.yml

@@ -14,17 +14,40 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
         with:
-          java-version: 1.8
+          persist-credentials: false
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
       - name: Build with Maven
         run: mvn -s settings.xml -B install --file pom.xml
         env:
           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,38 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  release:
-    types: [created]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - 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 GitHub Packages Docker Registry
-        uses: docker/login-action@v1
-        with:
-          registry: docker.pkg.github.com
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Push deployment container
-        working-directory: ./deployment/image-packaging/src/main/docker
-        run: docker-compose build && docker-compose push
-        env:
-          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/
-          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.4.14
-          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

.github/workflows/release_manual.yaml

@@ -0,0 +1,92 @@
+name: Publishes a new version of Sissi
+on: workflow_dispatch
+permissions:
+  packages: write
+  contents: write
+jobs:
+  publish:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+      - 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:
+          JAVA_HOME: /usr/lib/jvm/java-17-openjdk/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          abstractoUser: Sheldan
+          abstractoToken: ${{ secrets.ABSTRACTO_PAT }}
+        with:
+          git-release-bot-name: "release-bot"
+          git-release-bot-email: "release-bot@sheldan.dev"
+          release-branch-name: master
+          maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
+          access-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Harbor
+        uses: docker/login-action@v3
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Update Chart version file
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/sissi/Chart.yaml'
+          propertyPath: 'version'
+          value: ${{ env.version }}
+          commitChange: false
+      - name: Update value files version
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/sissi/values.yaml'
+          commitChange: false
+          changes: |
+            {
+              "bot.tag": "${{ env.version }}",
+              "restApi.tag": "${{ env.version }}",
+              "privateRestApi.tag": "${{ env.version }}",
+              "templateDeploymentData.tag": "${{ env.version }}",
+              "dbConfigDeploymentData.tag": "${{ env.version }}"
+            }
+      - name: Update .env version
+        run:
+          sed -i '3s/.*/VERSION=${{ env.version }}/' .env
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Build and push Docker containers
+        run: docker compose build && docker compose push
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and 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
+      - name: Fix file permissions
+        run:
+          sudo chmod -R ugo+rwX . # https://github.com/actions/checkout/issues/164
+      - name: Commit updated versions
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: "release-bot"
+          author_email: "release-bot@sheldan.dev"

.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) 2022 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

@@ -0,0 +1,48 @@
+allow_k8s_contexts('k8s-cluster')
+
+load('ext://restart_process', 'docker_build_with_restart')
+registry = 'harbor.sheldan.dev/sissi/'
+abstracto_registry = 'harbor.sheldan.dev/abstracto/'
+
+local_resource(
+  'sissi-java-compile',
+  ' mvn install && ' +
+  ' rm -rf application/executable/target/jar-staging && ' +
+  ' unzip -o application/executable/target/sissi-exec.jar -d application/executable/target/jar-staging && ' +
+  ' rsync --delete --delete-excluded --inplace --checksum --exclude="*-SNAPSHOT.jar" -r application/executable/target/jar-staging/ application/executable/target/jar && ' +
+  ' rm -rf application/executable/target/jar/snapshots && ' +
+  ' mkdir application/executable/target/jar/snapshots && ' +
+  ' rsync --delete --delete-excluded --inplace --checksum --include="*/" --include="*-SNAPSHOT.jar" --exclude="*" -r application/executable/target/jar-staging/BOOT-INF/lib/ application/executable/target/jar/snapshots',
+  deps=['pom.xml'], auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
+
+docker_build_with_restart(
+  registry + 'sissi-bot',
+  './application/executable/target/jar',
+  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'),
+    sync('./application/executable/target/jar/META-INF', '/app/META-INF'),
+    sync('./application/executable/target/jar/BOOT-INF/classes', '/app'),
+    sync('./application/executable/target/jar/snapshots', '/app/lib')
+  ],
+)
+
+docker_build(registry + 'sissi-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
+docker_build(registry + 'sissi-debra-rest-api', 'python/modules/debra-rest-api/', dockerfile='python/modules/debra-rest-api/docker/Dockerfile')
+update_settings(suppress_unused_image_warnings=[registry + "sissi-debra-rest-api"]) # only used in docker image building
+docker_build(registry + 'sissi-image-gen-api', 'python/modules/image-gen-api/', dockerfile='python/modules/image-gen-api/docker/Dockerfile')
+update_settings(suppress_unused_image_warnings=[registry + "sissi-image-gen-api"]) # only used in docker image building
+docker_build(registry + 'sissi-rest-api', 'deployment/image-packaging/src/main/docker/rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry, 'SISSI_REGISTRY_PREFIX': registry})
+docker_build(registry + 'sissi-private-rest-api', 'deployment/image-packaging/src/main/docker/private-rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry, 'SISSI_REGISTRY_PREFIX': registry})
+docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
+
+
+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']
+))
+
+local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
+k8s_resource('chart-sissi', port_forwards='5005:5005')

application/executable/Dockerfile

@@ -0,0 +1,10 @@
+FROM amazoncorretto:17.0.8-alpine3.18
+RUN apk add entr
+
+WORKDIR /app
+ADD BOOT-INF/lib/ /app/lib
+ADD snapshots/ /app/lib
+ADD META-INF /app/META-INF
+ADD BOOT-INF/classes /app
+
+ENTRYPOINT java -cp .:./lib/* dev.sheldan.sissi.executable.Application

application/executable/pom.xml

@@ -3,17 +3,13 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.3.14</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
     <build>
+        <finalName>sissi</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -59,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>
@@ -75,6 +72,11 @@
             <artifactId>webservices-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>twitch-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>utility-impl</artifactId>
@@ -130,6 +132,26 @@
             <artifactId>logging-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <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>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>image-generation-impl</artifactId>
+        </dependency>
+
         <!-- sissi modules  -->
 
         <dependency>
@@ -144,6 +166,19 @@
             <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>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.sissi.application.module</groupId>
             <artifactId>debra</artifactId>
@@ -158,6 +193,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.sissi.application.module.custom</groupId>
+            <artifactId>image-generation-custom</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>

application/executable/src/main/java/dev/sheldan/sissi/executable/SecurityConfig.java

@@ -0,0 +1,18 @@
+package dev.sheldan.sissi.executable;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http.authorizeHttpRequests((authorize) -> authorize
+                .anyRequest().permitAll());
+        return http.build();
+    }
+
+}

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

@@ -1,21 +0,0 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto
-spring.datasource.username=abstracto
-spring.datasource.password=abstracto
-spring.jpa.properties.hibernate.default_schema=abstracto
-spring.quartz.jdbc.initialize-schema=never
-
-spring.jpa.hibernate.ddl-auto = none
-
-spring.jpa.show-sql = false
-
-spring.jpa.properties.hibernate.format_sql = true
-log4j.logger.org.hibernate.SQL=trace
-log4j.logger.org.hibernate.type.descriptor.sql=trace
-log4j.logger.org.hibernate.type=trace
-
-management.metrics.tags.application=sissi
-spring.security.user.name=abstracto
-spring.security.user.password=password
-spring.security.user.roles=USER
-
-spring.application.name=Sissi

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

@@ -1,11 +1,14 @@
 spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
-spring.jpa.hibernate.default_schema=${DB_NAME}
+spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
+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
-spring.security.user.name= ${REST_USER_NAME}
-spring.security.user.password= ${REST_PASSWORD}
-spring.security.user.roles=USER
+management.endpoint.health.probes.enabled=true
+management.health.livenessState.enabled=true
+management.health.readinessState.enabled=true
+spring.application.name=Sissi
 
-spring.application.name=Sissi
+spring.main.allow-circular-references=true

application/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.3.14</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,6 +22,18 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.jena</groupId>
+                <artifactId>apache-jena-libs</artifactId>
+                <version>${apache-jena.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>com.apptasticsoftware</groupId>
+                <artifactId>rssreader</artifactId>
+                <version>${rssreader.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.sheldan.sissi.application.module.custom</groupId>
+        <artifactId>sissi-customizations</artifactId>
+        <version>1.5.12-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>image-generation-custom</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>image-generation-int</artifactId>
+            <version>${abstracto.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.core</groupId>
+            <artifactId>core-int</artifactId>
+            <version>${abstracto.version}</version>
+        </dependency>
+    </dependencies>
+</project>

application/sissi-customizations/image-generation-custom/src/main/assembly/liquibase.xml

@@ -1,19 +1,18 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-    <id>docker-compose</id>
+    <id>liquibase</id>
     <formats>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <outputDirectory>./docker-compose</outputDirectory>
-            <directory>${project.basedir}/src/main/resources/</directory>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources/migrations</directory>
             <includes>
                 <include>**/*</include>
             </includes>
-            <filtered>true</filtered>
         </fileSet>
     </fileSets>
 </assembly>

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

@@ -0,0 +1,77 @@
+package dev.sheldan.sissi.module.custom.imagegeneration.command;
+
+import dev.sheldan.abstracto.core.command.CommandAlternative;
+import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
+import dev.sheldan.abstracto.core.command.service.CommandRegistry;
+import dev.sheldan.abstracto.core.config.ListenerPriority;
+import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.FeatureFlagService;
+import dev.sheldan.abstracto.core.templating.model.AttachedFile;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FileService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.abstracto.imagegeneration.config.ImageGenerationFeatureConfig;
+import dev.sheldan.sissi.module.custom.imagegeneration.service.ImageGenerationService;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class OrangeSunDogeCommandAlternative implements CommandAlternative {
+
+    @Autowired
+    private ImageGenerationService imageGenerationService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Autowired
+    private FileService fileService;
+
+    @Autowired
+    private CommandRegistry commandRegistry;
+
+    @Autowired
+    private FeatureFlagService featureFlagService;
+
+    @Autowired
+    private ImageGenerationFeatureConfig imageGenerationFeatureConfig;
+
+    private static final String DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY = "doge_orangeSun_response";
+
+    @Override
+    public boolean shouldExecute(UnParsedCommandParameter parameter, Guild guild, Message message) {
+        return featureFlagService.isFeatureEnabled(imageGenerationFeatureConfig, guild.getIdLong());
+    }
+
+    @Override
+    public void execute(UnParsedCommandParameter parameter, Message message) {
+        String contentStripped = message.getContentRaw();
+        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(), message.getGuildIdLong());
+        // template support does not support binary files
+        AttachedFile file = AttachedFile
+                .builder()
+                .file(triggeredGifFile)
+                .fileName("doge.png")
+                .build();
+        messageToSend.getAttachedFiles().add(file);
+        FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, message.getGuildChannel()))
+                .thenAccept(unused -> fileService.safeDeleteIgnoreException(messageToSend.getAttachedFiles().get(0).getFile()));
+    }
+
+    @Override
+    public Integer getPriority() {
+        return ListenerPriority.LOW;
+    }
+}

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

@@ -0,0 +1,10 @@
+package dev.sheldan.sissi.module.custom.imagegeneration.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource("classpath:custom-image-generation-config.properties")
+public class CustomImageGenerationConfig {
+}
+

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

@@ -0,0 +1,31 @@
+package dev.sheldan.sissi.module.custom.imagegeneration.service;
+
+import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
+import dev.sheldan.abstracto.core.service.HttpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+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 {
+
+    @Value("${abstracto.feature.imagegeneration.doge.orangeSun.url}")
+    private String dogeOrangeSunUrl;
+
+    @Autowired
+    private HttpService httpService;
+
+    public File getOrangeSunDogeImage(String inputText) {
+        try {
+            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/image-generation-custom/src/main/resources/custom-image-generation-config.properties

@@ -0,0 +1 @@
+abstracto.feature.imagegeneration.doge.orangeSun.url=http://${PRIVATE_REST_API_HOST}:${PRIVATE_REST_API_PORT}/memes/doge/orangeSun/?text={1}

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.3.14</version>
+        <version>1.5.12-SNAPSHOT</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.3.14</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,6 +13,7 @@
 
     <modules>
         <module>moderation-custom</module>
+        <module>image-generation-custom</module>
     </modules>
 
 

application/sissi-modules/debra/pom.xml

@@ -3,13 +3,33 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.3.14</version>
+        <version>1.5.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>dev.sheldan.sissi.application.module</groupId>
     <artifactId>debra</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <classifier>jakarta</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>

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

@@ -0,0 +1,69 @@
+package dev.sheldan.sissi.module.debra.api;
+
+import dev.sheldan.sissi.module.debra.model.api.*;
+import dev.sheldan.sissi.module.debra.service.DonationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+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 {
+
+    @Autowired
+    private DonationService donationService;
+
+    @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);
+        List<DonationInfo> donations = donationService.getLatestDonations(donationResponse, Integer.MAX_VALUE)
+                .stream()
+                .map(DonationInfo::fromDonationItemModel)
+                .toList();
+        return DonationStats
+                .builder()
+                .totalAmount(donationResponse.getPage().getCollected())
+                .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);
+        List<DonationInfo> donations = donationService.getHighestDonations(donationResponse, Integer.MAX_VALUE)
+                .stream()
+                .map(DonationInfo::fromDonationItemModel)
+                .toList();
+        return DonationStats
+                .builder()
+                .totalAmount(donationResponse.getPage().getCollected())
+                .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);
+
+        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

@@ -0,0 +1,51 @@
+package dev.sheldan.sissi.module.debra.api;
+
+import dev.sheldan.abstracto.core.service.ConfigService;
+import dev.sheldan.sissi.module.debra.config.DebraFeatureConfig;
+import dev.sheldan.sissi.module.debra.model.api.DonationsResponse;
+import dev.sheldan.sissi.module.debra.model.api.EndlessStreamInfo;
+import dev.sheldan.sissi.module.debra.model.database.EndlessStream;
+import dev.sheldan.sissi.module.debra.service.DonationService;
+import dev.sheldan.sissi.module.debra.service.management.EndlessStreamManagementServiceBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME;
+
+@RestController
+@RequestMapping(value = "/stream")
+public class EndlessStreamController {
+
+    @Autowired
+    private EndlessStreamManagementServiceBean endlessStreamManagementServiceBean;
+
+    @Autowired
+    private DonationService donationService;
+
+    @Autowired
+    private ConfigService configService;
+
+    @GetMapping(value = "/endlessStream/{id}", produces = "application/json")
+    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();
+        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
+                .builder()
+                .startDate(endlessStream.getStartTime())
+                .endDate(endDate)
+                .donationAmount(collectedAmount.longValue())
+                .minuteRate(minuteRate)
+                .build();
+    }
+}

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

@@ -0,0 +1,93 @@
+package dev.sheldan.sissi.module.debra.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.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;
+import dev.sheldan.sissi.module.debra.service.DonationService;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class DebraInfoButton extends AbstractConditionableCommand {
+
+    private static final String DEBRA_INFO_BUTTON = "debraInfoButton";
+    private static final String DEBRA_INFO_BUTTON_RESPONSE_TEMPLATE_KEY = "debraInfoButton_response";
+    private static final String TARGET_CHANNEL_PARAMETER_KEY = "targetChannel";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @Autowired
+    private DonationService donationService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        GuildMessageChannel targetChannel = slashCommandParameterService.getCommandOption(TARGET_CHANNEL_PARAMETER_KEY, event, GuildMessageChannel.class);
+        return donationService.sendDebraInfoButtonMessage(targetChannel)
+                .thenCompose(unused -> interactionService.replyEmbed(DEBRA_INFO_BUTTON_RESPONSE_TEMPLATE_KEY, event))
+                .thenApply(interactionHook -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(DebraSlashCommandNames.DEBRA_INTERNAL)
+                .commandName("debrainfobutton")
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
+                .build();
+
+        Parameter targetChannelParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(TARGET_CHANNEL_PARAMETER_KEY)
+                .type(GuildMessageChannel.class)
+                .build();
+
+
+        List<Parameter> parameters = Arrays.asList(targetChannelParameter);
+
+        return CommandConfiguration.builder()
+                .name(DEBRA_INFO_BUTTON)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .slashCommandConfig(slashCommandConfig)
+                .async(true)
+                .slashCommandOnly(true)
+                .parameters(parameters)
+                .supportsEmbedException(true)
+                .causesReaction(false)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return DebraFeatureDefinition.DEBRA;
+    }
+}

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

@@ -4,24 +4,32 @@ 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.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;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.sissi.module.debra.config.DebraFeatureDefinition;
 import dev.sheldan.sissi.module.debra.config.DebraSlashCommandNames;
+import dev.sheldan.sissi.module.debra.converter.DonationConverter;
+import dev.sheldan.sissi.module.debra.model.api.DonationsResponse;
 import dev.sheldan.sissi.module.debra.model.commands.DonationsModel;
 import dev.sheldan.sissi.module.debra.service.DonationService;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 
@@ -30,6 +38,8 @@ public class Donations extends AbstractConditionableCommand {
 
     private static final String DONATIONS_COMMAND_NAME = "donations";
     private static final String DONATIONS_RESPONSE_TEMPLATE_KEY = "donations_response";
+    private static final String SELECTION_PARAMETER = "type";
+    private static final String SELECTION_VALUE_PARAMETER = "parametervalue";
 
     @Autowired
     private ChannelService channelService;
@@ -43,27 +53,78 @@ public class Donations extends AbstractConditionableCommand {
     @Autowired
     private TemplateService templateService;
 
+    @Autowired
+    private DonationConverter donationConverter;
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        MessageToSend messageToSend = getDonationMessageToSend();
+        List<Object> parameters = commandContext.getParameters().getParameters();
+        MessageToSend messageToSend;
+        if(parameters.isEmpty()) {
+            messageToSend = getDonationMessageToSend(commandContext.getGuild().getIdLong(), null, null);
+        } else {
+            String type = (String) parameters.get(0);
+            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;
+            }
+            messageToSend = getDonationMessageToSend(commandContext.getGuild().getIdLong(), top, latest);
+        }
         return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
 
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        MessageToSend messageToSend = getDonationMessageToSend();
+        String selectionType = null;
+        if(slashCommandParameterService.hasCommandOption(SELECTION_PARAMETER, event)) {
+            selectionType = slashCommandParameterService.getCommandOption(SELECTION_PARAMETER, event, String.class);
+        }
+        Integer selectionValue = 5;
+        if(slashCommandParameterService.hasCommandOption(SELECTION_VALUE_PARAMETER, event)) {
+            selectionValue = slashCommandParameterService.getCommandOption(SELECTION_VALUE_PARAMETER, event, Integer.class);
+        }
+        if(selectionValue > 20) {
+            selectionValue = 5;
+        }
+        Integer top = null;
+        Integer latest = null;
+        if(selectionType != null) {
+            switch (selectionType) {
+                case "top": top = selectionValue; break;
+                default:
+                case "latest" :
+                    latest = selectionValue; break;
+            }
+        }
+
+        MessageToSend messageToSend = getDonationMessageToSend(event.getGuild().getIdLong(), top, latest);
         return interactionService.replyMessageToSend(messageToSend, event)
                 .thenApply(interactionHook -> CommandResult.fromSuccess());
     }
 
-    private MessageToSend getDonationMessageToSend() {
-        BigDecimal currentDonationAmount = donationService.fetchCurrentDonationAmount();
-        DonationsModel donationModel = DonationsModel
-                .builder()
-                .donationAmount(currentDonationAmount)
-                .build();
-        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel);
+    private MessageToSend getDonationMessageToSend(Long serverId, Integer top, Integer latest) {
+        DonationsModel donationModel;
+        DonationsResponse donationResponse = donationService.fetchCurrentDonationAmount(serverId);
+        donationModel = donationConverter.convertDonationResponse(donationResponse);
+        if(top != null) {
+            donationModel.setDonations(donationService.getHighestDonations(donationResponse, top));
+            donationModel.setType(DonationsModel.DonationType.TOP);
+        } else if(latest != null) {
+            donationModel.setType(DonationsModel.DonationType.LATEST);
+            donationModel.setDonations(donationService.getLatestDonations(donationResponse, latest));
+        } else {
+            donationModel.setDonations(new ArrayList<>());
+        }
+        return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel, serverId);
     }
 
     @Override
@@ -77,15 +138,35 @@ public class Donations extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(DebraSlashCommandNames.DEBRA)
-                .commandName("donations")
+                .commandName(DONATIONS_COMMAND_NAME)
                 .build();
 
+        Parameter selectionParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(SELECTION_PARAMETER)
+                .optional(true)
+                .type(String.class)
+                .build();
+
+
+        Parameter selectionValueParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(SELECTION_VALUE_PARAMETER)
+                .optional(true)
+                .type(Integer.class)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(selectionParameter, selectionValueParameter);
+
         return CommandConfiguration.builder()
                 .name(DONATIONS_COMMAND_NAME)
                 .module(UtilityModuleDefinition.UTILITY)
                 .templated(true)
                 .slashCommandConfig(slashCommandConfig)
                 .async(true)
+                .parameters(parameters)
                 .supportsEmbedException(true)
                 .causesReaction(false)
                 .help(helpInfo)

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

@@ -0,0 +1,33 @@
+package dev.sheldan.sissi.module.debra.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.ehcache.config.builders.CacheManagerBuilder;
+import org.ehcache.jsr107.Eh107Configuration;
+import org.ehcache.xml.XmlConfiguration;
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.URL;
+
+@Configuration
+@Slf4j
+@EnableCaching
+public class CacheConfig {
+
+    @Bean
+    public JCacheManagerCustomizer cacheManagerCustomizer() {
+        URL myUrl = getClass().getResource("/donation-cache-config.xml");
+        XmlConfiguration xmlConfig = new XmlConfiguration(myUrl);
+        org.ehcache.CacheManager myCacheManager = CacheManagerBuilder.newCacheManager(xmlConfig);
+        return cm -> {
+            myCacheManager.getRuntimeConfiguration().getCacheConfigurations().entrySet().forEach(cacheConfiguration -> {
+                javax.cache.configuration.Configuration<?, ?> jConfiguration = Eh107Configuration.fromEhcacheCacheConfiguration(cacheConfiguration.getValue());
+                log.info("Creating custom cache: " + cacheConfiguration.getKey());
+                cm.createCache(cacheConfiguration.getKey(), jConfiguration);
+            });
+        };
+    }
+}
+

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

@@ -12,6 +12,8 @@ import java.util.List;
 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() {
@@ -25,6 +27,6 @@ public class DebraFeatureConfig implements FeatureConfig {
 
     @Override
     public List<String> getRequiredSystemConfigKeys() {
-        return Arrays.asList(DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY);
+        return Arrays.asList(DEBRA_DONATION_NOTIFICATION_DELAY_CONFIG_KEY, DEBRA_DONATION_API_FETCH_SIZE_KEY, ENDLESS_STREAM_MINUTE_RATE);
     }
 }

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

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

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

@@ -2,4 +2,5 @@ package dev.sheldan.sissi.module.debra.config;
 
 public class DebraSlashCommandNames {
     public static final String DEBRA = "debra";
+    public static final String DEBRA_INTERNAL = "debrainternal";
 }

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

@@ -0,0 +1,28 @@
+package dev.sheldan.sissi.module.debra.converter;
+
+import dev.sheldan.sissi.module.debra.model.api.Donation;
+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;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DonationConverter {
+    public DonationItemModel convertDonation(Donation donation) {
+        return DonationItemModel
+                .builder()
+                .donationAmount(donation.getAmount())
+                .firstName(donation.getFirstname())
+                .lastName(donation.getLastname())
+                .anonymous(BooleanUtils.toBoolean(donation.getAnonym()))
+                .build();
+    }
+
+    public DonationsModel convertDonationResponse(DonationsResponse response) {
+        return DonationsModel
+                .builder()
+                .totalAmount(response.getPage().getCollected())
+                .build();
+    }
+}

application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/exception/DonationAmountNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.sheldan.sissi.module.debra;
+package dev.sheldan.sissi.module.debra.exception;
 
 import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
 

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

@@ -0,0 +1,71 @@
+package dev.sheldan.sissi.module.debra.listener;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.ListenerPriority;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
+import dev.sheldan.abstracto.core.interaction.button.listener.ButtonClickedListener;
+import dev.sheldan.abstracto.core.interaction.button.listener.ButtonClickedListenerModel;
+import dev.sheldan.abstracto.core.interaction.button.listener.ButtonClickedListenerResult;
+import dev.sheldan.abstracto.core.service.MessageService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.sissi.module.debra.config.DebraFeatureDefinition;
+import dev.sheldan.sissi.module.debra.service.DonationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class DebraInfoButtonClickedListener implements ButtonClickedListener {
+
+    @Autowired
+    private MessageService messageService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    private static final String DEBRA_INFO_MESSAGE_TEMPLATE_KEY = "debraInfoMessage";
+    private static final String DEBRA_INFO_MESSAGE_RESPONSE_TEMPLATE_KEY = "debraInfoMessage_response";
+
+    @Override
+    public ButtonClickedListenerResult execute(ButtonClickedListenerModel model) {
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_INFO_MESSAGE_TEMPLATE_KEY, new Object(), model.getServerId());
+        messageService.sendMessageToSendToUser(model.getEvent().getUser(), messageToSend).thenAccept(interactionHook -> {
+            log.info("Send debra info message to user {}", model.getEvent().getUser().getIdLong());
+        }).exceptionally(throwable -> {
+            log.error("Failed to send debra info message to user {}", model.getEvent().getUser().getIdLong(), throwable);
+            return null;
+        });
+        MessageToSend responseMessageToSend = templateService.renderEmbedTemplate(DEBRA_INFO_MESSAGE_RESPONSE_TEMPLATE_KEY, new Object(), model.getServerId());
+        FutureUtils.toSingleFutureGeneric(interactionService.sendMessageToInteraction(responseMessageToSend, model.getEvent().getInteraction().getHook()))
+        .thenAccept(interactionHook -> {
+            log.info("Send debra info message response to user {}", model.getEvent().getUser().getIdLong());
+        }).exceptionally(throwable -> {
+            log.error("Failed to send debra info message response to user {}", model.getEvent().getUser().getIdLong(), throwable);
+            return null;
+        });
+        return ButtonClickedListenerResult.ACKNOWLEDGED;
+    }
+
+    @Override
+    public Boolean handlesEvent(ButtonClickedListenerModel model) {
+        return model.getOrigin().equals(DonationService.DEBRA_INFO_BUTTON_ORIGIN);
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return DebraFeatureDefinition.DEBRA;
+    }
+
+    @Override
+    public Integer getPriority() {
+        return ListenerPriority.MEDIUM;
+    }
+
+
+}

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

@@ -3,7 +3,7 @@ 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.Donation;
+import dev.sheldan.sissi.module.debra.model.listener.DonationResponseModel;
 import dev.sheldan.sissi.module.debra.service.DonationService;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
@@ -49,7 +49,7 @@ public class WebsocketListener extends WebSocketListener implements AsyncStartup
                 log.info("Waiting {} milli seconds to send notification.", delayMillis);
                 Thread.sleep(delayMillis);
                 log.info("Loading new donation amount and sending notification.");
-                Donation donation = donationService.parseDonationFromMessage(text);
+                DonationResponseModel donation = donationService.parseDonationFromMessage(text);
                 donationService.sendDonationNotification(donation).thenAccept(unused -> {
                     log.info("Successfully notified about donation.");
                 }).exceptionally(throwable -> {
@@ -65,13 +65,10 @@ public class WebsocketListener extends WebSocketListener implements AsyncStartup
     @Override
     public void onFailure(WebSocket webSocket, Throwable t, @Nullable Response response) {
         log.warn("Websocket connection failed...", t);
-        webSocket.close(1000, null);
-        webSocket.close(1000, "Connection closed");
     }
 
     @Override
     public void onClosing(WebSocket webSocket, int code, String reason) {
-        webSocket.close(1000, null);
         log.info("Closing websocket connection. It was closed with code {} and reason {}.", code, reason);
     }
 

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

@@ -0,0 +1,20 @@
+package dev.sheldan.sissi.module.debra.model.api;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+@Builder
+@Getter
+public class CampaignInfo {
+    private BigInteger donationCount;
+    private BigDecimal collected;
+    private BigDecimal target;
+    private String currency;
+    private String slug;
+    private String displayName;
+    private BigDecimal collectedNet;
+    private BigDecimal percent;
+}

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,26 @@
+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/DonationInfo.java

@@ -0,0 +1,26 @@
+package dev.sheldan.sissi.module.debra.model.api;
+
+import dev.sheldan.sissi.module.debra.model.commands.DonationItemModel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Builder
+public class DonationInfo {
+    private String firstName;
+    private BigDecimal donationAmount;
+    private Boolean anonymous;
+
+    public static DonationInfo fromDonationItemModel(DonationItemModel donationItemModel) {
+        return DonationInfo
+                .builder()
+                .donationAmount(donationItemModel.getDonationAmount())
+                .anonymous(donationItemModel.getAnonymous())
+                .firstName(donationItemModel.getFirstName())
+                .build();
+    }
+}

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

@@ -0,0 +1,14 @@
+package dev.sheldan.sissi.module.debra.model.api;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Builder
+public class DonationStats {
+    private List<DonationInfo> donations;
+    private BigDecimal totalAmount;
+}

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

@@ -0,0 +1,21 @@
+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.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;
+}

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

@@ -0,0 +1,15 @@
+package dev.sheldan.sissi.module.debra.model.api;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.Instant;
+
+@Builder
+@Getter
+public class EndlessStreamInfo {
+    private Instant endDate;
+    private Instant startDate;
+    private Long donationAmount;
+    private Long minuteRate;
+}

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

@@ -0,0 +1,12 @@
+package dev.sheldan.sissi.module.debra.model.commands;
+
+import dev.sheldan.abstracto.core.interaction.button.ButtonPayload;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Builder
+@Getter
+@Setter
+public class DebraInfoButtonPayload implements ButtonPayload {
+}

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

@@ -0,0 +1,10 @@
+package dev.sheldan.sissi.module.debra.model.commands;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class DebraInfoModel {
+    private String buttonId;
+}

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

@@ -0,0 +1,17 @@
+package dev.sheldan.sissi.module.debra.model.commands;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Builder
+public class DonationItemModel {
+    private String firstName;
+    private String lastName;
+    private BigDecimal donationAmount;
+    private Boolean anonymous;
+}

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

@@ -2,11 +2,21 @@ package dev.sheldan.sissi.module.debra.model.commands;
 
 import lombok.Builder;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Getter
 @Builder
+@Setter
 public class DonationsModel {
-    private BigDecimal donationAmount;
+    private BigDecimal totalAmount;
+    private DonationType type;
+    private List<DonationItemModel> donations;
+
+    public enum DonationType {
+        LATEST, TOP
+    }
+
 }

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

@@ -0,0 +1,31 @@
+package dev.sheldan.sissi.module.debra.model.database;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+
+@Builder
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "endless_stream")
+@Getter
+@Setter
+@EqualsAndHashCode
+public class EndlessStream {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "start_time")
+    private Instant startTime;
+
+    @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/DonationNotificationModel.java

@@ -1,6 +1,5 @@
 package dev.sheldan.sissi.module.debra.model.listener;
 
-import dev.sheldan.sissi.module.debra.model.Donation;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -9,6 +8,6 @@ import java.math.BigDecimal;
 @Getter
 @Builder
 public class DonationNotificationModel {
-    private Donation donation;
+    private DonationResponseModel donation;
     private BigDecimal totalDonationAmount;
 }

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

@@ -1,4 +1,4 @@
-package dev.sheldan.sissi.module.debra.model;
+package dev.sheldan.sissi.module.debra.model.listener;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 @Getter
 @Builder
 @ToString
-public class Donation {
+public class DonationResponseModel {
     private String donatorName;
     private BigDecimal amount;
     private String message;

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

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

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

@@ -0,0 +1,22 @@
+package dev.sheldan.sissi.module.debra.service;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+
+public class BigDecimalGsonAdapter implements JsonDeserializer<BigDecimal> {
+    @Override
+    public BigDecimal deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        try {
+            return new BigDecimal(json.getAsString()
+                    .replace(".", "")
+                    .replace(',', '.'));
+        } catch (NumberFormatException e) {
+            throw new JsonParseException(e);
+        }
+    }
+}

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

@@ -1,31 +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.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.FutureUtils;
-import dev.sheldan.sissi.module.debra.DonationAmountNotFoundException;
+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.model.Donation;
+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.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.listener.DonationResponseModel;
 import dev.sheldan.sissi.module.debra.model.listener.DonationNotificationModel;
 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.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.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.math.BigDecimal;
-import java.net.URL;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 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
@@ -41,19 +62,45 @@ public class DonationService {
     @Autowired
     private TemplateService templateService;
 
+    @Autowired
+    private OkHttpClient okHttpClient;
+
+    @Autowired
+    private DonationConverter donationConverter;
+
+    @Autowired
+    private ConfigService configService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Autowired
+    private ComponentService componentService;
+
+    @Autowired
+    private ComponentPayloadService componentPayloadService;
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @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 Pattern DONATION_PAGE_AMOUNT_PARTNER = Pattern.compile("\"metric4\",\\s*\"(.*)\"");
 
-    public Donation parseDonationFromMessage(String message) {
+    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 Donation
+            return DonationResponseModel
                     .builder()
                     .message(donationMessage)
                     .donatorName(donatorName)
@@ -64,35 +111,103 @@ public class DonationService {
         }
     }
 
-    public BigDecimal fetchCurrentDonationAmount() {
-        try (InputStream is = new URL(debraProperties.getDonationsPageURL()).openStream()) {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is));
-            String line;
-            while ((line = br.readLine()) != null) {
-                Matcher matcher = DONATION_PAGE_AMOUNT_PARTNER.matcher(line);
-                if (matcher.find()) {
-                    return new BigDecimal(matcher.group(1).replace(',', '.'));
-                }
-            }
-            log.warn("Did not find the donation amount in the configured URL {}", debraProperties.getDonationsPageURL());
-            throw new DonationAmountNotFoundException();
-        } catch (IOException ex) {
-            log.warn("Failed to load page for parsing donation amount {}.", debraProperties.getDonationsPageURL(), ex);
-            throw new DonationAmountNotFoundException();
-        }
+    public List<DonationItemModel> getHighestDonations(DonationsResponse response, Integer maxCount) {
+        List<Donation> topDonations = response
+                .getDonations()
+                .stream()
+                .sorted(Comparator.comparing(Donation::getAmount)
+                        .reversed())
+                .collect(Collectors.toList());
+        return topDonations
+                .stream()
+                .limit(maxCount)
+                .map(donation -> donationConverter.convertDonation(donation))
+                .collect(Collectors.toList());
     }
 
-    public CompletableFuture<Void> sendDonationNotification(Donation donation) {
+    public List<DonationItemModel> getLatestDonations(DonationsResponse response, Integer maxCount) {
+        return response
+                .getDonations()
+                .stream()
+                .limit(maxCount)
+                .map(donation -> donationConverter.convertDonation(donation))
+                .collect(Collectors.toList());
+    }
+
+    public synchronized DonationsResponse getSynchronizedCachedDonationAmount(Long serverId) {
+        return self.getCachedDonationAmount(serverId);
+    }
+
+    @Cacheable(value = "donation-cache")
+    public synchronized DonationsResponse getCachedDonationAmount(Long serverId) {
+        return self.fetchCurrentDonationAmount(serverId);
+    }
+
+    public DonationsResponse fetchCurrentDonationAmount(Long serverId) {
+        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();
+            }
+            Gson gson = getGson();
+            return gson.fromJson(response.body().string(), DonationsResponse.class);
+        } catch (Exception exception) {
+            throw new AbstractoRunTimeException(exception);
+        }
+
+    }
+
+    private Gson getGson() {
+        return new GsonBuilder()
+                .registerTypeAdapter(BigDecimal.class, new BigDecimalGsonAdapter())
+                .create();
+    }
+
+    private DonationsModel getDonationInfoModel(Long serverId) {
+        return donationConverter.convertDonationResponse(fetchCurrentDonationAmount(serverId));
+    }
+
+    public CompletableFuture<Void> sendDonationNotification(DonationResponseModel donation) throws IOException {
+        Long targetServerId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
+        DonationsModel donationInfoModel = getDonationInfoModel(targetServerId);
         DonationNotificationModel model = DonationNotificationModel
                 .builder()
                 .donation(donation)
-                .totalDonationAmount(fetchCurrentDonationAmount())
+                .totalDonationAmount(donationInfoModel.getTotalAmount())
                 .build();
-        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model);
-        Long targetServerId = Long.parseLong(System.getenv(DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME));
+        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);
         return FutureUtils.toSingleFutureGeneric(firstMessage);
     }
+
+    public CompletableFuture<Void> sendDebraInfoButtonMessage(GuildMessageChannel guildMessageChannel) {
+        String buttonId = componentService.generateComponentId();
+        DebraInfoModel model = DebraInfoModel
+                .builder()
+                .buttonId(buttonId)
+                .build();
+
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_INFO_BUTTON_MESSAGE_TEMPLATE_KEY, model, guildMessageChannel.getGuild().getIdLong());
+        return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, guildMessageChannel)).thenAccept(unused -> {
+            self.persistButtonPayload(guildMessageChannel, buttonId);
+        });
+    }
+
+    @Transactional
+    public void persistButtonPayload(GuildMessageChannel guildMessageChannel, String buttonId) {
+        DebraInfoButtonPayload payload = DebraInfoButtonPayload
+                .builder()
+                .build();
+        AServer server = serverManagementService.loadServer(guildMessageChannel.getGuild().getIdLong());
+        componentPayloadService.createButtonPayload(buttonId, payload, DEBRA_INFO_BUTTON_ORIGIN, server);
+    }
 }

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

@@ -0,0 +1,17 @@
+package dev.sheldan.sissi.module.debra.service.management;
+
+import dev.sheldan.sissi.module.debra.model.database.EndlessStream;
+import dev.sheldan.sissi.module.debra.repository.EndlessStreamRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EndlessStreamManagementServiceBean {
+
+    @Autowired
+    private EndlessStreamRepository endlessStreamRepository;
+
+    public EndlessStream getEndlessStream(Long id) {
+        return endlessStreamRepository.getReferenceById(id);
+    }
+}

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

@@ -5,7 +5,13 @@ abstracto.postTargets.debraDonationNotification.name=debraDonationNotification
 abstracto.postTargets.debraDonationNotification2.name=debraDonationNotification2
 
 sissi.debra.websocketURL=ws://spenden.baba.fm:8765/
-sissi.debra.donationsPageURL=https://em.altruja.de/discord-fuer-debra-2022
+sissi.debra.donationAPIUrl=https://www.altruja.de/api/page/discord-schmetterlingsaktion-2024?details=1&num=%s&ort=0
 
 abstracto.systemConfigs.debraDonationNotificationDelayMillis.name=debraDonationNotificationDelayMillis
-abstracto.systemConfigs.debraDonationNotificationDelayMillis.longValue=60000
+abstracto.systemConfigs.debraDonationNotificationDelayMillis.longValue=60000
+
+abstracto.systemConfigs.endlessStreamMinuteRate.name=endlessStreamMinuteRate
+abstracto.systemConfigs.endlessStreamMinuteRate.longValue=1
+
+abstracto.systemConfigs.debraDonationApiFetchSize.name=debraDonationApiFetchSize
+abstracto.systemConfigs.debraDonationApiFetchSize.longValue=1000

application/sissi-modules/debra/src/main/resources/donation-cache-config.xml

@@ -0,0 +1,24 @@
+<config
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xmlns='http://www.ehcache.org/v3'
+        xsi:schemaLocation="
+            http://www.ehcache.org/v3
+            http://www.ehcache.org/schema/ehcache-core-3.8-1.xsd">
+    <cache uses-template="default" alias="donation-cache">
+        <expiry>
+            <ttl unit="seconds">120</ttl>
+        </expiry>
+
+        <resources>
+            <heap unit="entries">5</heap>
+        </resources>
+    </cache>
+    <cache-template name="default">
+        <expiry>
+            <ttl unit="seconds">600</ttl>
+        </expiry>
+        <resources>
+            <heap>50</heap>
+        </resources>
+    </cache-template>
+</config>

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

@@ -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-modules/debra/src/main/resources/migrations/1.4.21/seedData/command.xml

@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns: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="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
+    <property name="debraFeature" value="(SELECT id FROM feature WHERE key = 'debra')"/>
+
+    <changeSet author="Sheldan" id="debraInfoButton-command">
+        <insert tableName="command">
+            <column name="name" value="debraInfoButton"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${debraFeature}"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>

application/sissi-modules/debra/src/main/resources/migrations/1.4.21/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-modules/debra/src/main/resources/migrations/1.4.29/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="tables/tables.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

application/sissi-modules/debra/src/main/resources/migrations/1.4.29/tables/endless_stream.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="endless_stream-table">
+        <createTable tableName="endless_stream">
+            <column name="id" autoIncrement="true" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="start_time" type="TIMESTAMP WITHOUT TIME ZONE">
+                <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 endless_stream_update_trigger ON endless_stream;
+            CREATE TRIGGER endless_stream_update_trigger BEFORE UPDATE ON endless_stream FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
+        </sql>
+        <sql>
+            DROP TRIGGER IF EXISTS endless_stream_insert_trigger ON endless_stream;
+            CREATE TRIGGER endless_stream_insert_trigger BEFORE INSERT ON endless_stream FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

application/sissi-modules/debra/src/main/resources/migrations/1.4.29/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="endless_stream.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

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

@@ -1,10 +1,8 @@
 <?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"/>
 </databaseChangeLog>

application/sissi-modules/meetup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.application</groupId>
         <artifactId>sissi-modules</artifactId>
-        <version>1.3.14</version>
+        <version>1.5.12-SNAPSHOT</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

@@ -0,0 +1,160 @@
+package dev.sheldan.sissi.module.meetup.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.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;
+import dev.sheldan.sissi.module.meetup.exception.NotMeetupOrganizerException;
+import dev.sheldan.sissi.module.meetup.model.database.Meetup;
+import dev.sheldan.sissi.module.meetup.service.MeetupServiceBean;
+import dev.sheldan.sissi.module.meetup.service.management.MeetupManagementServiceBean;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+@Component
+public class ChangeMeetup extends AbstractConditionableCommand {
+
+    private static final String CHANGE_MEETUP_COMMAND = "changeMeetup";
+    private static final String MEETUP_ID_PARAMETER = "meetupId";
+    private static final String MEETUP_NEW_VALUE_PARAMETER = "newValue";
+    private static final String MEETUP_PROPERTY_PARAMETER = "property";
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private MeetupManagementServiceBean meetupManagementServiceBean;
+
+    @Autowired
+    private MeetupServiceBean meetupServiceBean;
+
+    @Autowired
+    private InteractionService interactionService;
+
+    @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 property = (String) parameters.get(1);
+        MeetupProperty propertyEnum = MeetupProperty.valueOf(property);
+        String newValue = (String) parameters.get(2);
+        return updateMeetup(meetup, propertyEnum, newValue).thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    private CompletableFuture<Void> updateMeetup(Meetup meetup, MeetupProperty propertyEnum, String newValue) {
+        CompletableFuture<Void> future;
+        switch (propertyEnum) {
+            case TOPIC:
+                future = meetupServiceBean.changeMeetupTopic(meetup, newValue);
+                break;
+            case LOCATION:
+                future = meetupServiceBean.changeMeetupLocation(meetup, newValue);
+                break;
+            default:
+                case DESCRIPTION:
+                future = meetupServiceBean.changeMeetupDescription(meetup, newValue);
+                break;
+        }
+        return future;
+    }
+
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        Long meetupId = slashCommandParameterService.getCommandOption(MEETUP_ID_PARAMETER, event, Integer.class).longValue();
+        Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, event.getGuild().getIdLong());
+        if(!meetup.getOrganizer().getUserReference().getId().equals(event.getMember().getIdLong())) {
+            throw new NotMeetupOrganizerException();
+        }
+        String newValue = slashCommandParameterService.getCommandOption(MEETUP_NEW_VALUE_PARAMETER, event, String.class);
+        String property = slashCommandParameterService.getCommandOption(MEETUP_PROPERTY_PARAMETER, event, String.class);
+        MeetupProperty propertyEnum = MeetupProperty.valueOf(property);
+        return updateMeetup(meetup, propertyEnum, newValue)
+                .thenCompose(commandResult -> interactionService.replyEmbed("changeMeetup_response", event))
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter meetupIdParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(MEETUP_ID_PARAMETER)
+                .type(Long.class)
+                .build();
+
+        List<String> meetupProperties = Arrays
+                .stream(MeetupProperty.values())
+                .map(Enum::name)
+                .collect(Collectors.toList());
+
+        Parameter meetupPropertyParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(MEETUP_PROPERTY_PARAMETER)
+                .type(String.class)
+                .choices(meetupProperties)
+                .build();
+
+        Parameter newValueParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(MEETUP_NEW_VALUE_PARAMETER)
+                .type(String.class)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(meetupIdParameter, meetupPropertyParameter, newValueParameter);
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
+                .commandName("changeMeetup")
+                .build();
+
+        return CommandConfiguration.builder()
+                .name(CHANGE_MEETUP_COMMAND)
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .slashCommandConfig(slashCommandConfig)
+                .supportsEmbedException(true)
+                .causesReaction(true)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return MeetupFeatureDefinition.MEETUP;
+    }
+
+    public enum MeetupProperty {
+        DESCRIPTION, TOPIC, LOCATION
+    }
+}

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

@@ -5,12 +5,14 @@ import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.validator.MaxStringLengthValidator;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.interaction.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;
@@ -71,7 +73,9 @@ public class CreateMeetup extends AbstractConditionableCommand {
     private static final String MEETUP_TIME_PARAMETER = "meetupTime";
     private static final String TOPIC_PARAMETER = "topic";
     private static final String DESCRIPTION_PARAMETER = "description";
+    private static final String LOCATION_PARAMETER = "location";
     private static final String CONFIRMATION_TEMPLATE = "createMeetup_confirmation";
+    private static final String DEFAULT_LOCATION_STRING = "\"\"";
 
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
@@ -86,7 +90,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
         }
         AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor());
         AChannel meetupChannel = channelManagementService.loadChannel(commandContext.getChannel().getIdLong());
-        Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, meetupTopic, description, organizer, meetupChannel);
+        Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, meetupTopic, description, organizer, meetupChannel, DEFAULT_LOCATION_STRING);
         String confirmationId = componentService.generateComponentId();
         String cancelId = componentService.generateComponentId();
         MeetupConfirmationModel model = MeetupConfirmationModel
@@ -95,6 +99,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .guildId(commandContext.getGuild().getIdLong())
                 .description(description)
                 .topic(meetupTopic)
+                .location(meetup.getLocation())
                 .confirmationId(confirmationId)
                 .cancelId(cancelId)
                 .meetupId(meetup.getId().getId())
@@ -117,10 +122,17 @@ public class CreateMeetup extends AbstractConditionableCommand {
         } else {
             description = "";
         }
+
+        String location;
+        if(slashCommandParameterService.hasCommandOption(LOCATION_PARAMETER, event)) {
+            location = slashCommandParameterService.getCommandOption(LOCATION_PARAMETER, event, String.class);
+        } else {
+            location = DEFAULT_LOCATION_STRING;
+        }
         Instant meetupTime = Instant.ofEpochSecond(time);
         AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(event.getMember());
         AChannel meetupChannel = channelManagementService.loadChannel(event.getChannel().getIdLong());
-        Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, topic, description, organizer, meetupChannel);
+        Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, topic, description, organizer, meetupChannel, location);
         String confirmationId = componentService.generateComponentId();
         String cancelId = componentService.generateComponentId();
         MeetupConfirmationModel model = MeetupConfirmationModel
@@ -129,6 +141,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .guildId(event.getGuild().getIdLong())
                 .description(description)
                 .topic(topic)
+                .location(meetup.getLocation())
                 .confirmationId(confirmationId)
                 .cancelId(cancelId)
                 .meetupId(meetup.getId().getId())
@@ -153,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();
@@ -161,12 +175,24 @@ public class CreateMeetup extends AbstractConditionableCommand {
                 .builder()
                 .templated(true)
                 .name(DESCRIPTION_PARAMETER)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(2048)))
                 .remainder(true)
                 .optional(true)
                 .type(String.class)
                 .build();
 
-        List<Parameter> parameters = Arrays.asList(timeParameter, topicParameter, descriptionParameter);
+        Parameter locationParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(LOCATION_PARAMETER)
+                .remainder(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(100)))
+                .optional(true)
+                .slashCommandOnly(true)
+                .type(String.class)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(timeParameter, topicParameter, descriptionParameter, locationParameter);
         HelpInfo helpInfo = HelpInfo
                 .builder()
                 .templated(true)
@@ -176,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/ListMeetups.java

@@ -49,19 +49,19 @@ public class ListMeetups extends AbstractConditionableCommand {
 
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        MessageToSend messageToSend = getMessageToSend(commandContext.getGuild().getIdLong());
+        MessageToSend messageToSend = getMessageToSend(commandContext.getGuild().getIdLong(), commandContext.getChannel().getIdLong());
         return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()))
                 .thenApply(unused -> CommandResult.fromIgnored());
     }
 
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        return interactionService.replyMessageToSend(getMessageToSend(event.getGuild().getIdLong()), event)
+        return interactionService.replyMessageToSend(getMessageToSend(event.getGuild().getIdLong(), event.getChannel().getIdLong()), event)
                 .thenApply(interactionHook -> CommandResult.fromSuccess());
     }
 
-    private MessageToSend getMessageToSend(Long serverId) {
-        List<Meetup> meetups = meetupManagementServiceBean.getIncomingMeetups();
+    private MessageToSend getMessageToSend(Long serverId, Long channelId) {
+        List<Meetup> meetups = meetupManagementServiceBean.getIncomingMeetups(serverId, channelId);
         List<MeetupListItemModel> listItems = meetups
                 .stream()
                 .map(MeetupListItemModel::fromMeetup)

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

@@ -10,20 +10,24 @@ 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;
 import dev.sheldan.sissi.module.meetup.exception.NotMeetupOrganizerException;
 import dev.sheldan.sissi.module.meetup.model.database.Meetup;
+import dev.sheldan.sissi.module.meetup.model.database.MeetupDecision;
 import dev.sheldan.sissi.module.meetup.service.MeetupServiceBean;
 import dev.sheldan.sissi.module.meetup.service.management.MeetupManagementServiceBean;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 @Component
 public class NotifyMeetupParticipants extends AbstractConditionableCommand {
@@ -42,22 +46,10 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
 
     private static final String MEETUP_ID_PARAMETER = "meetupId";
     private static final String NOTIFICATION_MESSAGE_PARAMETER = "notificationMessage";
+    private static final String NOTIFICATION_MEETUP_DECISION = "decision";
     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)
-                .thenApply(unused -> CommandResult.fromSuccess());
-    }
-
     @Override
     public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
         Long meetupId = slashCommandParameterService.getCommandOption(MEETUP_ID_PARAMETER, event, Integer.class).longValue();
@@ -65,8 +57,15 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
         if(!meetup.getOrganizer().getUserReference().getId().equals(event.getMember().getIdLong())) {
             throw new NotMeetupOrganizerException();
         }
+        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)
+        return meetupServiceBean.notifyMeetupParticipants(meetup, notificationMessage, decisionsToNotify)
                 .thenCompose(unused -> interactionService.replyEmbed(NOTIFY_MEETUP_PARTICIPANTS_RESPONSE, event))
                 .thenApply(unused -> CommandResult.fromSuccess());
     }
@@ -88,7 +87,24 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .remainder(true)
                 .build();
 
-        List<Parameter> parameters = Arrays.asList(meetupIdParameter, notificationMessage);
+        List<String> meetupDecisions = Arrays
+                .stream(MeetupDecision.values())
+                .map(Enum::name)
+                .collect(Collectors.toList());
+
+        Parameter meetupDecisionChoice = Parameter
+                .builder()
+                .templated(true)
+                .name(NOTIFICATION_MEETUP_DECISION)
+                .type(String.class)
+                .listSize(MeetupDecision.values().length)
+                .isListParam(true)
+                .optional(true)
+                .choices(meetupDecisions)
+                .slashCommandOnly(true)
+                .build();
+
+        List<Parameter> parameters = Arrays.asList(meetupIdParameter, notificationMessage, meetupDecisionChoice);
         HelpInfo helpInfo = HelpInfo
                 .builder()
                 .templated(true)
@@ -98,6 +114,7 @@ public class NotifyMeetupParticipants extends AbstractConditionableCommand {
                 .builder()
                 .enabled(true)
                 .rootCommandName(MeetupSlashCommandNames.MEETUP)
+                .defaultPrivilege(SlashCommandPrivilegeLevels.ADMIN)
                 .commandName("notify")
                 .build();
 
@@ -107,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/config/MeetupFeatureConfig.java

@@ -2,8 +2,14 @@ package dev.sheldan.sissi.module.meetup.config;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.FeatureMode;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
+
+import static dev.sheldan.sissi.module.meetup.config.MeetupFeatureMode.ATTACH_ICS_FILE;
+
 @Component
 public class MeetupFeatureConfig implements FeatureConfig {
     @Override
@@ -11,4 +17,8 @@ public class MeetupFeatureConfig implements FeatureConfig {
         return MeetupFeatureDefinition.MEETUP;
     }
 
+    @Override
+    public List<FeatureMode> getAvailableModes() {
+        return Arrays.asList(ATTACH_ICS_FILE);
+    }
 }

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/config/MeetupFeatureMode.java

@@ -0,0 +1,15 @@
+package dev.sheldan.sissi.module.meetup.config;
+
+import dev.sheldan.abstracto.core.config.FeatureMode;
+import lombok.Getter;
+
+@Getter
+public enum MeetupFeatureMode implements FeatureMode {
+    ATTACH_ICS_FILE("attachIcsFile");
+
+    private final String key;
+
+    MeetupFeatureMode(String key) {
+        this.key = key;
+    }
+}

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/job/MeetupCleanupJob.java

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
 @PersistJobDataAfterExecution
 public class MeetupCleanupJob extends QuartzJobBean {
 
-
     @Autowired
     private MeetupServiceBean meetupServiceBean;
 

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

@@ -16,6 +16,7 @@ import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.utils.FileService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.sissi.module.meetup.config.MeetupFeatureDefinition;
 import dev.sheldan.sissi.module.meetup.model.database.Meetup;
@@ -76,6 +77,9 @@ public class MeetupConfirmationListener implements ButtonClickedListener {
     @Autowired
     private MeetupComponentManagementServiceBean meetupComponentManagementServiceBean;
 
+    @Autowired
+    private FileService fileService;
+
     @Override
     public ButtonClickedListenerResult execute(ButtonClickedListenerModel model) {
         MeetupConfirmationPayload payload = (MeetupConfirmationPayload) model.getDeserializedPayload();
@@ -104,13 +108,20 @@ public class MeetupConfirmationListener implements ButtonClickedListener {
         messageModel.setNoId(noButtonId);
         messageModel.setMaybeId(maybeButtonId);
         messageModel.setNoTimeId(noTimeButtonId);
+        meetup.setYesButtonId(yesButtonId);
+        meetup.setMaybeButtonId(maybeButtonId);
+        meetup.setNoTimeButtonId(noTimeButtonId);
+        meetup.setNotInterestedButtonId(noButtonId);
         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());
+            messageToSend.getAttachedFiles().forEach(attachedFile -> {
+                fileService.safeDeleteIgnoreException(attachedFile.getFile());
+            });
             Message meetupMessage = messageFutures.get(0).join();
             messageService.pinMessage(meetupMessage);
             self.persistPayloads(meetupId, serverId, yesButtonId, noButtonId, maybeButtonId, noTimeButtonId, meetupMessage);

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/model/command/MeetupConfirmationModel.java

@@ -14,6 +14,7 @@ public class MeetupConfirmationModel {
     private MemberDisplay organizer;
     private Instant meetupTime;
     private Long meetupId;
+    private String location;
     private String topic;
     private String description;
     private Long guildId;