[SIS-xxx] upgrading abstracto version

adding custom template for leave message updating template to fit new leave model
Commit from GitHub Actions (Publishes a new version of Sissi)
2026-01-03 16:27:48 +00:00 · 2025-11-13 00:11:01 +01:00 · 2025-10-12 18:42:28 +00:00 · 2025-10-12 18:37:06 +00:00 · 2025-10-12 18:37:05 +00:00 · 2025-10-12 20:19:40 +02:00
61 changed files with 179 additions and 73 deletions
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.5.8
-ABSTRACTO_VERSION=1.6.11
+VERSION=1.5.14
+ABSTRACTO_VERSION=1.6.16
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,3 +31,23 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          user: Sheldan
          token: ${{ secrets.ABSTRACTO_PAT }}
+      - name: Login to Harbor
+        uses: docker/login-action@v3
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Docker build
+        run: docker compose build
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm package sissi
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/image-generation-custom/pom.xml
+++ b/application/sissi-customizations/image-generation-custom/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application.module.custom</groupId>
        <artifactId>sissi-customizations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>

    <artifactId>image-generation-custom</artifactId>
--- a/application/sissi-customizations/moderation-custom/pom.xml
+++ b/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.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/pom.xml
+++ b/application/sissi-customizations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>application</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/debra/pom.xml
+++ b/application/sissi-modules/debra/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/meetup/pom.xml
+++ b/application/sissi-modules/meetup/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java
@@ -166,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();
@@ -174,6 +175,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                .builder()
                .templated(true)
                .name(DESCRIPTION_PARAMETER)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(2048)))
                .remainder(true)
                .optional(true)
                .type(String.class)
@@ -184,6 +186,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
                .templated(true)
                .name(LOCATION_PARAMETER)
                .remainder(true)
+                .validators(Arrays.asList(MaxStringLengthValidator.max(100)))
                .optional(true)
                .slashCommandOnly(true)
                .type(String.class)
--- a/application/sissi-modules/miepscord/pom.xml
+++ b/application/sissi-modules/miepscord/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-modules</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/pom.xml
+++ b/application/sissi-modules/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -14,6 +14,7 @@
        <module>quotes</module>
        <module>meetup</module>
        <module>debra</module>
+        <module>miepscord</module>
        <module>rss-news</module>
    </modules>

--- a/application/sissi-modules/quotes/pom.xml
+++ b/application/sissi-modules/quotes/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/commands/QuoteCommand.java
+++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/commands/QuoteCommand.java
@@ -23,6 +23,7 @@ import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
 import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
 import dev.sheldan.sissi.module.quotes.model.database.Quote;
 import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
+import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -37,6 +38,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

@Component
+@Slf4j
 public class QuoteCommand extends AbstractConditionableCommand {

    private static final String QUOTE_COMMAND = "quote";
@@ -76,6 +78,7 @@ public class QuoteCommand extends AbstractConditionableCommand {
            foundQuote = quoteServiceBean.getRandomQuoteForMember(user);
        }
        Quote quoteToDisplay = foundQuote.orElseThrow(QuoteNotFoundException::new);
+        log.info("Displaying quote {} in server {}.", quoteToDisplay.getId(), quoteToDisplay.getServer().getId());
        return quoteServiceBean.renderQuoteToMessageToSend(quoteToDisplay)
                .thenCompose(messageToSend -> self.sendMessageToChannel(messageToSend, commandContext.getChannel()))
                .thenApply(unused -> CommandResult.fromSuccess());
@@ -98,6 +101,7 @@ public class QuoteCommand extends AbstractConditionableCommand {
            foundQuote = quoteServiceBean.getRandomQuote(server);
        }
        Quote quoteToDisplay = foundQuote.orElseThrow(QuoteNotFoundException::new);
+        log.info("Displaying quote {} in server {}.", quoteToDisplay.getId(), quoteToDisplay.getServer().getId());
        return quoteServiceBean.renderQuoteToMessageToSend(quoteToDisplay)
                .thenCompose(messageToSend -> self.replyMessage(event, messageToSend))
                .thenApply(unused -> CommandResult.fromSuccess());
--- a/application/sissi-modules/rss-news/pom.xml
+++ b/application/sissi-modules/rss-news/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-modules</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/helm/sissi/Chart.yaml
+++ b/deployment/helm/sissi/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: sissi
 description: A Helm chart for Kubernetes
 type: application
-version: 1.5.8
+version: 1.5.14
--- a/deployment/helm/sissi/values.yaml
+++ b/deployment/helm/sissi/values.yaml
@@ -3,7 +3,7 @@ bot:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-bot
-  tag: 1.5.8
+  tag: 1.5.14
  livenessProbe:
    initialDelaySeconds: 60
    periodSeconds: 5
@@ -22,7 +22,7 @@ restApi:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-rest-api
-  tag: 1.5.8
+  tag: 1.5.14
  podAnnotations: {}
  podSecurityContext: {}
  securityContext: {}
@@ -62,7 +62,7 @@ privateRestApi:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-private-rest-api
-  tag: 1.5.8
+  tag: 1.5.14
  podAnnotations: {}
  podSecurityContext: {}
  securityContext: {}
@@ -93,23 +93,23 @@ templateDeployment:
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-template-deployment
-  tag: 1.6.11
+  tag: 1.6.16
 templateDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-template-data
-  tag: 1.5.8
+  tag: 1.5.14
 dbConfigDeployment:
  enabled: true
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-db-deployment
-  tag: 1.6.11
+  tag: 1.6.16
 dbConfigDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-db-data
-  tag: 1.5.8
+  tag: 1.5.14
 dbCredentials:
  host: null
  port: null
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/image-packaging/src/main/docker/db-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/db-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config/ /var/db-config/
 ADD liquibase-artifacts /var/db-config/liquibase-zips
--- a/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION
 ARG ABSTRACTO_VERSION
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api

-FROM ${SISSI_REGISTRY_PREFIX}sissi-image-gen-api:${VERSION:-latest} AS sissi-image-gen-api
+FROM image_gen AS sissi-image-gen-api

 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
 COPY --from=image-gen-api /python /python
--- a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
@@ -2,7 +2,7 @@ ARG REGISTRY_PREFIX
 ARG SISSI_REGISTRY_PREFIX
 ARG VERSION
 ARG ABSTRACTO_VERSION
-FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} AS debra-api
+FROM debra_rest AS debra-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api

--- a/deployment/image-packaging/src/main/docker/sissi/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/sissi/Dockerfile
@@ -12,7 +12,7 @@ RUN $JAVA_HOME/bin/jlink \
         --compress=2 \
         --output /customjre

-FROM alpine:3.21
+FROM alpine:3.22.1

 ENV JAVA_HOME=/jre
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
--- a/deployment/image-packaging/src/main/docker/template-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/template-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config /var/template-config/
 ADD template-artifacts /var/template-config/templates
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.7"

 services:
  bot-packaging:
@@ -23,9 +22,9 @@ services:
        REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
        VERSION: ${VERSION}
        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
+      additional_contexts:
+        debra_rest: "service:debra-rest-api"
    image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest}
-    depends_on:
-      - debra-rest-api
  private-rest-api-packaging:
    build:
      context: deployment/image-packaging/src/main/docker/private-rest-api
@@ -34,9 +33,9 @@ services:
        SISSI_REGISTRY_PREFIX: ${REGISTRY_PREFIX}
        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
        VERSION: ${VERSION}
+      additional_contexts:
+        image_gen: "service:image-gen-api"
    image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest}
-    depends_on:
-      - image-gen-api
  db-data:
    build:
      context: deployment/image-packaging/src/main/docker/db-data
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
    <groupId>dev.sheldan.sissi</groupId>
    <artifactId>sissi</artifactId>
    <name>Sissi</name>
-    <version>1.5.9</version>
+    <version>1.5.15-SNAPSHOT</version>

    <properties>
        <maven.compiler.target>17</maven.compiler.target>
        <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.6.11</abstracto.version>
-        <abstracto.templates.version>1.4.59</abstracto.templates.version>
+        <abstracto.version>1.6.16</abstracto.version>
+        <abstracto.templates.version>1.4.62</abstracto.templates.version>
        <apache-jena.version>4.9.0</apache-jena.version>
        <rssreader.version>3.5.0</rssreader.version>
    </properties>
@@ -28,7 +28,6 @@
        <module>application</module>
        <module>templates</module>
        <module>deployment</module>
-        <module>application/sissi-modules/miepscord</module>
    </modules>

    <repositories>
@@ -73,7 +72,7 @@
        <connection>scm:git:${project.scm.url}</connection>
        <developerConnection>scm:git:${project.scm.url}</developerConnection>
        <url>https://github.com/Sheldan/Sissi.git</url>
-        <tag>sissi-1.5.9</tag>
+        <tag>HEAD</tag>
    </scm>

 </project>
--- a/templates/custom/user_leave_embed.ftl
+++ b/templates/custom/user_leave_embed.ftl
@@ -0,0 +1,76 @@
+{
+<#assign mapping={
+'bp': '340380695585095680',
+'np': '400642855682572288',
+'bk': '299162473775366144',
+'mi': '400642854248120330',
+'na': '400642590267146240',
+'br': '400642587620278273',
+'lo': '400643490020851712',
+'lr': '400642584617418753',
+'lm': '400642579881787402',
+'bo': '400642539889229825',
+'bm': '299162333668835328',
+'gm': '400642460713484308',
+'up': '299162129284726784',
+'ap': '336786889589915659',
+'dd': '336786578103992323',
+'dr': '298790326943088670',
+'ms': '298790213453479937',
+'bs': '298790020192403456',
+'di': '298790014974820356',
+'in': '298789520084566018'
+}>
+<#assign groups={
+'1': {'bp': 1, 'np': 2, 'bk': 3, 'mi': 4, 'na': 5, 'br': 6, 'lo': 7, 'lr': 8, 'lm': 9, 'bo': 10, 'bm': 11, 'gm': 12},
+'2': {'up': 1, 'ap': 2},
+'3': {'dd': 1, 'dr': 2},
+'4': {'ms': 1, 'bs': 2},
+'5': {'di': 1},
+'6': {'in': 1}
+}>
+<#assign allowedRoleIds=[]>
+<#assign reverseMapping={}>
+<#list mapping as key, value>
+    <#assign allowedRoleIds=allowedRoleIds + [value]>
+    <#assign reverseMapping=reverseMapping + {value: key}>
+</#list>
+<#assign relevantRoles={}>
+<#assign relevantRoleIds=[]>
+<#list roles as role>
+    <#if allowedRoleIds?seq_contains(role.roleId?c)>
+        <#assign relevantRoles=relevantRoles + {role.roleId?c:role.roleName}>
+        <#assign relevantRoleIds=relevantRoleIds+[role.roleId?c]>
+    </#if>
+</#list>
+<#function is_printed role_id>
+    <#assign group={}>
+    <#assign found_prio=1>
+    <#list groups as key,members>
+        <#list members as roleshortcut,prio>
+            <#if role_id=mapping[roleshortcut]>
+                <#assign group=members>
+                <#assign found_prio=prio>
+            </#if>
+        </#list>
+    </#list>
+    <#assign print=true>
+    <#list group as shortcut,prio>
+        <#if relevantRoleIds?seq_contains(mapping[shortcut])>
+            <#if prio < found_prio>
+                <#assign print=false>
+            </#if>
+        </#if>
+    </#list>
+    <#return print>
+</#function>
+<#macro get_title key>
+    <#assign role_id=mapping[key]><#rt>
+    <#if is_printed(role_id) && relevantRoleIds?seq_contains(role_id)><#rt>
+        ${relevantRoles[role_id]}<#rt>
+    </#if>
+</#macro>
+<#include "user_detail">
+<#assign userText><@get_title 'bp'/><@get_title 'np'/><@get_title 'bk'/><@get_title 'mi'/><@get_title 'na'/><@get_title 'br'/><@get_title 'lo'/><@get_title 'lr'/><@get_title 'lm'/><@get_title 'bo'/><@get_title 'bm'/><@get_title 'gm'/><@get_title 'up'/><@get_title 'ap'/><@get_title 'dd'/><@get_title 'dr'/><@get_title 'di'/> ${user.name} <@get_title 'ms'/><@get_title 'bs'/><@get_title 'in'/> (${user.id})</#assign>
+    "additionalMessage": "<@safe_include "user_left_text"/>"
+}
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/image-generation-customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/image-generation-customization-templates/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>customization-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>

    <artifactId>image-generation-customization-templates</artifactId>
--- a/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>customization-templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/debra-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/debra-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/meetup-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/meetup-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_display_embed.ftl
+++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_display_embed.ftl
@@ -17,20 +17,24 @@
        {
            <#assign time><@format_instant_long_date_time instant=meetupTime/></#assign>
            <#assign timeRelative><@format_instant_relative instant=meetupTime/></#assign>
+
+            <#if location?? && location != "%22%22">
            "type": "section",
            "components": [
                {
                    "type": "textDisplay",
                    "content": "<@safe_include "meetup_display_time_component"/>"
                }
-            ]
-            <#if location?? && location != "%22%22">
-            ,"accessory": {
+            ],
+            "accessory": {
                "type": "button",
                "label": "<@safe_include "meetup_message_location_button_label"/>",
                "url": "https://www.google.com/maps?q=${location?json_string}",
                "buttonStyle": "link"
            }
+            <#else>
+                "type": "textDisplay",
+                "content": "<@safe_include "meetup_display_time_component"/>"
            </#if>
        }
        <#macro decision_component button_id button_style label_template content_template user>
--- a/templates/sissi-templates/module-templates/miepscord-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/miepscord-templates/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>module-templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>

    <artifactId>miepscord-templates</artifactId>
--- a/templates/sissi-templates/module-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>sissi-templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/quotes-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/quotes-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>module-templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/rss-news-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/rss-news-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/pom.xml
+++ b/templates/sissi-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl
@@ -1,5 +1,5 @@
 {
    <#include "user_detail">
-    <#assign user><@user_detail user=user/></#assign>
+    <#assign userText>${user.name} (${user.userMention}: ${user.id})</#assign>
    "additionalMessage": "<@safe_include "user_left_text"/>"
 }
--- a/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/starboard-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/starboard-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/self_mute_reason_en_US.ftl
+++ b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/selfmute/self_mute_reason_en_US.ftl
--- a/templates/sissi-translations/customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/debra-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/debra-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/meetup-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/meetup-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/miepscord-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/miepscord-translations/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>

    <artifactId>miepscord-translations</artifactId>
--- a/templates/sissi-translations/module-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/quote-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/quote-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/rss-news-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/rss-news-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/pom.xml
+++ b/templates/sissi-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_left/user_left_text_de_DE.ftl
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_left/user_left_text_de_DE.ftl
@@ -1 +1 @@
-Dere, pfiatdi und baba, ${user}!
+Dere, pfiatdi und baba, ${userText}!
--- a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.5.9</version>
+        <version>1.5.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Sheldan	5b6160b0d2	[SIS-xxx] upgrading abstracto version adding custom template for leave message updating template to fit new leave model	2025-11-13 00:11:01 +01:00
release-bot	453b2214cd	Commit from GitHub Actions (Publishes a new version of Sissi)	2025-10-12 18:42:28 +00:00
release-bot	071c603e54	[maven-release-plugin] prepare for next development iteration	2025-10-12 18:37:06 +00:00
release-bot	31538747f5	[maven-release-plugin] prepare release sissi-1.5.14	2025-10-12 18:37:05 +00:00
Sheldan	afb11dc74a	[SIS-xxx] upgrading abstracto version	2025-10-12 20:19:40 +02:00
Sheldan	dd5bb63962	[SIS-xxx] fixing meetup display without location	2025-10-03 18:13:58 +02:00
release-bot	28da63db37	Commit from GitHub Actions (Publishes a new version of Sissi)	2025-09-10 23:23:31 +00:00
release-bot	18755afb57	[maven-release-plugin] prepare for next development iteration	2025-09-10 23:16:17 +00:00
release-bot	ccfb64324e	[maven-release-plugin] prepare release sissi-1.5.13	2025-09-10 23:16:15 +00:00
Sheldan	d33ce3da6c	[SIS-xxx] upgrading abstracto version	2025-09-11 01:11:14 +02:00
release-bot	16553e0299	Commit from GitHub Actions (Publishes a new version of Sissi)	2025-09-10 22:25:34 +00:00
release-bot	dd02b07ff6	[maven-release-plugin] prepare for next development iteration	2025-09-10 22:18:03 +00:00
release-bot	43e372e07a	[maven-release-plugin] prepare release sissi-1.5.12	2025-09-10 22:18:01 +00:00
Sheldan	ba42a10122	[SIS-xxx] upgrading abstracto version	2025-09-11 00:12:49 +02:00
Sheldan	28d68b13c7	[SIS-xxx] adding logging to see which quote is sent in the case of random quotes	2025-08-07 19:32:44 +02:00
release-bot	ea0f1fde15	Commit from GitHub Actions (Publishes a new version of Sissi)	2025-08-05 22:16:39 +00:00
release-bot	4904980935	[maven-release-plugin] prepare for next development iteration	2025-08-05 22:11:04 +00:00
release-bot	222e48021f	[maven-release-plugin] prepare release sissi-1.5.11	2025-08-05 22:11:02 +00:00
Sheldan	c39996f117	[SIS-xxx] adding docker and helm build to build file	2025-08-06 00:03:56 +02:00
Sheldan	f90defbc64	[SIS-xxx] updating the not properly released version	2025-08-06 00:01:15 +02:00
Sheldan	48c06cf370	[SIS-xxx] fixing dependencies for docker packaging build	2025-08-06 00:00:56 +02:00
release-bot	14d90722b7	[maven-release-plugin] prepare for next development iteration	2025-08-04 19:18:51 +00:00
release-bot	6c48dd790f	[maven-release-plugin] prepare release sissi-1.5.10	2025-08-04 19:18:49 +00:00
Sheldan	9e1f7f0263	[SIS-xxx] updating abstracto version to 1.6.12	2025-08-04 21:13:45 +02:00
Sheldan	15ec88c03f	[SIS-xxx] fixing name of reason template	2025-07-21 17:42:25 +02:00
release-bot	aeb89533e2	Commit from GitHub Actions (Publishes a new version of Sissi)	2025-07-21 15:33:32 +00:00
release-bot	483d6fde66	[maven-release-plugin] prepare for next development iteration	2025-07-21 15:26:57 +00:00