[SIS-xxx] upgrading to new abstracto version

[SIS-xxx] changing text for ban notification to contain translation
[SIS-xxx] changing text for ban notification to contain the new invite link
2026-01-02 07:44:19 +00:00 · 2024-06-13 18:23:36 +02:00 · 2024-06-02 23:11:07 +02:00 · 2024-05-31 09:32:48 +02:00 · 2024-05-31 07:18:27 +00:00 · 2024-05-31 07:14:21 +00:00
59 changed files with 126 additions and 84 deletions
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.4.43
-ABSTRACTO_VERSION=1.5.25
+VERSION=1.4.54
+ABSTRACTO_VERSION=1.5.38
--- a/2
+++ b/2
@@ -18,7 +18,7 @@ local_resource(
 docker_build_with_restart(
  registry + 'sissi-bot',
  './application/executable/target/jar',
-  entrypoint=['java', '-noverify', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
+  entrypoint=['java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
  dockerfile='./application/executable/Dockerfile',
  live_update=[
    sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
--- 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
@@ -55,12 +55,13 @@
            <artifactId>metrics-impl</artifactId>
        </dependency>

-        <!-- modules containing commands -->
        <dependency>
            <groupId>dev.sheldan.abstracto.scheduling</groupId>
            <artifactId>scheduling-impl</artifactId>
        </dependency>

+        <!-- modules containing commands -->
+
        <dependency>
            <groupId>dev.sheldan.abstracto.modules</groupId>
            <artifactId>link-embed-impl</artifactId>
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/collection.xml
+++ b/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>
--- a/application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/seedData/data.xml
+++ b/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>
--- a/application/sissi-customizations/moderation-custom/src/main/resources/migrations/1.4.45/seedData/default_emote.xml
+++ b/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>
--- a/application/sissi-customizations/moderation-custom/src/main/resources/migrations/moderation-custom-changeLog.xml
+++ b/application/sissi-customizations/moderation-custom/src/main/resources/migrations/moderation-custom-changeLog.xml
@@ -1,7 +1,8 @@
 <?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"  >
+                   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"/>
 </databaseChangeLog>
--- a/application/sissi-customizations/moderation-custom/src/main/resources/moderation-custom.properties
+++ b/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
--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-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.4.43
+version: 1.4.54
--- a/deployment/helm/sissi/templates/deployment.yaml
+++ b/deployment/helm/sissi/templates/deployment.yaml
@@ -90,6 +90,8 @@ spec:
              value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
            - name: PRIVATE_REST_API_PORT
              value: "{{ .Values.privateRestApi.service.targetPort }}"
+            - name: FRONTEND_BASE
+              value: "https://{{ .Values.bot.host }}"
            {{- range $key, $value := .Values.bot.propertyConfig }}
            - name: {{ $key | quote }}
              value: {{ $value | quote}}
--- a/deployment/helm/sissi/templates/private-rest-api-deployment.yaml
+++ b/deployment/helm/sissi/templates/private-rest-api-deployment.yaml
@@ -31,9 +31,9 @@ spec:
          image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}"
          imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }}
          env:
-            - name: SISSI_HOST
+            - name: BACKEND_HOST
              value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
-            - name: SISSI_PORT
+            - name: BACKEND_PORT
              value: "{{ .Values.service.port }}"
          ports:
            - name: {{ .Values.privateRestApi.service.name }}
--- a/deployment/helm/sissi/templates/rest-api-deployment.yaml
+++ b/deployment/helm/sissi/templates/rest-api-deployment.yaml
@@ -31,9 +31,9 @@ spec:
          image: "{{ .Values.restApi.repository }}/{{ .Values.restApi.image }}:{{ .Values.restApi.tag | default .Chart.AppVersion }}"
          imagePullPolicy: {{ .Values.restApi.pullPolicy }}
          env:
-            - name: SISSI_HOST
+            - name: BACKEND_HOST
              value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
-            - name: SISSI_PORT
+            - name: BACKEND_PORT
              value: "{{ .Values.service.port }}"
          ports:
            - name: {{ .Values.restApi.service.name }}
--- 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.4.43
+  tag: 1.4.54
  livenessProbe:
    initialDelaySeconds: 60
    periodSeconds: 5
@@ -14,12 +14,13 @@ bot:
    failureThreshold: 3
  propertyConfig:
    hikariPoolSize: 10
+  host: null
 restApi:
  enabled: true
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-rest-api
-  tag: 1.4.43
+  tag: 1.4.54
  podAnnotations: {}
  podSecurityContext: {}
  securityContext: {}
@@ -59,7 +60,7 @@ privateRestApi:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-private-rest-api
-  tag: 1.4.43
+  tag: 1.4.54
  podAnnotations: {}
  podSecurityContext: {}
  securityContext: {}
@@ -90,23 +91,23 @@ templateDeployment:
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-template-deployment
-  tag: 1.5.25
+  tag: 1.5.38
 templateDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-template-data
-  tag: 1.4.43
+  tag: 1.4.54
 dbConfigDeployment:
  enabled: true
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-db-deployment
-  tag: 1.5.25
+  tag: 1.5.38
 dbConfigDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-db-data
-  tag: 1.4.43
+  tag: 1.4.54
 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -631,17 +631,6 @@
                                    <destFileName>assignable-roles.zip</destFileName>
                                </artifactItem>

-                                <artifactItem>
-                                    <groupId>dev.sheldan.abstracto.modules</groupId>
-                                    <artifactId>utility-impl</artifactId>
-                                    <version>${abstracto.version}</version>
-                                    <classifier>liquibase</classifier>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
-                                    <destFileName>utility.zip</destFileName>
-                                </artifactItem>
-
                                <artifactItem>
                                    <groupId>dev.sheldan.abstracto.modules</groupId>
                                    <artifactId>modmail-impl</artifactId>
--- a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
@@ -3,7 +3,11 @@ ARG SISSI_REGISTRY_PREFIX
 ARG VERSION
 ARG ABSTRACTO_VERSION
 FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} 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


 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest}
-COPY --from=debra-api /python /python
+COPY --from=debra-api /python /python
+COPY --from=core-api /python /python
+COPY --from=experience-api /python /python
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,8 @@ services:
        VERSION: ${VERSION}
        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
    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
@@ -33,6 +35,8 @@ services:
        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
        VERSION: ${VERSION}
    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
@@ -40,4 +44,4 @@ services:
  template-data:
    build:
      context: deployment/image-packaging/src/main/docker/template-data
-    image:  ${REGISTRY_PREFIX}sissi-template-data:${VERSION:-latest}
+    image: ${REGISTRY_PREFIX}sissi-template-data:${VERSION:-latest}
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
    <groupId>dev.sheldan.sissi</groupId>
    <artifactId>sissi</artifactId>
    <name>Sissi</name>
-    <version>1.4.44</version>
+    <version>1.4.55-SNAPSHOT</version>

    <properties>
        <maven.compiler.target>17</maven.compiler.target>
        <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.25</abstracto.version>
-        <abstracto.templates.version>1.4.33</abstracto.templates.version>
+        <abstracto.version>1.5.38</abstracto.version>
+        <abstracto.templates.version>1.4.38</abstracto.templates.version>
        <apache-jena.version>4.9.0</apache-jena.version>
        <rssreader.version>3.5.0</rssreader.version>
    </properties>
@@ -72,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.4.44</tag>
+        <tag>HEAD</tag>
    </scm>

 </project>
--- a/python/modules/debra-rest-api/python/endpoints/debra.py
+++ b/python/modules/debra-rest-api/python/endpoints/debra.py
@@ -11,12 +11,12 @@ from datetime import timezone, datetime
 import pytz


-sissi_host = os.getenv('SISSI_HOST')
-sissi_port = os.getenv('SISSI_PORT')
-latest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/latestDonations'
-highest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/highestDonations'
-campaign_info_url = f'http://{sissi_host}:{sissi_port}/debra/campaignInfo'
-endless_stream_info_url = f'http://{sissi_host}:{sissi_port}/stream/endlessStream'
+backend_host = os.getenv('BACKEND_HOST')
+backend_port = os.getenv('BACKEND_PORT')
+latest_donations_url = f'http://{backend_host}:{backend_port}/debra/latestDonations'
+highest_donations_url = f'http://{backend_host}:{backend_port}/debra/highestDonations'
+campaign_info_url = f'http://{backend_host}:{backend_port}/debra/campaignInfo'
+endless_stream_info_url = f'http://{backend_host}:{backend_port}/stream/endlessStream'


 class DonationImageGenerationParameters:
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/orf/job/orf_news_post_embed_en_US.ftl
+++ b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/orf/job/orf_news_post_embed_en_US.ftl
@@ -6,7 +6,7 @@
                "name": "<@safe_include "orf_news_post_author"/>"
            },
            "title": {
-                "title": "${title}",
+                "title": "${title?json_string}",
                "url": "${url}"
            },
            "description": "${url?json_string}<#if description?has_content>\n${description?json_string}</#if>",
--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl
+++ b/templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl
@@ -17,7 +17,7 @@
            <#elseif reportedMessage.attachments?size = 0 && reportedMessage.embeds?size gt 0 && reportedMessage.embeds[0].cachedImageInfo??>
                ,"imageUrl": "${reportedMessage.embeds[0].cachedImageInfo.proxyUrl}"
            </#if>
-<#if singularMessage>,
+<#if singularMessage>
            ,"fields": [
                {
                    "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
@@ -36,5 +36,15 @@
                "persistCallback": false
            }
        }
+        <#if moderationActionComponents?size gt 0>,</#if>
+        <#list moderationActionComponents as moderactionAction>
+        {
+            "label": "<@safe_include "moderation_action_${moderactionAction.action}_button_label"/>",
+            "id": "${moderactionAction.componentId}",
+            "buttonStyle": "danger",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }<#sep>,</#list>
    ]
 }
--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/ban/commands/ban_notification_text_en_US.ftl
+++ b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/ban/commands/ban_notification_text_en_US.ftl
@@ -1,2 +1,9 @@
+Du wurdest vom Server ${serverName} wegen `${reason}` gebannt.
+When du das beeinspruchen willst, folge bitte dieser Einladung: https://discord.gg/rXpBHEGXpE und ANTWORTE AUF DIESE NACHRICHT MIT EINER TEXT NACHRICHT. Die Mods werden dir dann antworten.
+Du musst dich in 'Austria Appeal Server' befinden, damit du dem Bot schreiben kannst.
+Wenn der Einspruch abgelehnt wird, wirst du vom Server entfernt.
+
 You were banned from the server ${serverName} for `${reason}`.
-If you want to appeal, visit https://docs.google.com/forms/d/e/1FAIpQLSegsjW3OaHGZH_VZL6susvVPksLQ2jDWd3vzze6x9LyF4zdfg/viewform.
+If you want to appeal, join the server https://discord.gg/rXpBHEGXpE and then message this bot, this opens up a modmail.
+Joining the server is necessary in order to make communication to the bot possible.
+If the appeal is denied, you will be banned from the above-mentioned server.
--- a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/listener/reactionReport/reaction_report_custom_text_en_US.ftl
+++ b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/listener/reactionReport/reaction_report_custom_text_en_US.ftl
@@ -1 +1 @@
-🤷 Approved / Is ok, 📣 Mention it to user, 🤫 User mute,⚠️ User warn ,🔨 User ban
+🤷 Approved / Is ok, 📣 Mention it to user, 🤫 User mute, ⚠️ User warn , 🔨 User ban, ❓ Unsure
--- 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.4.44</version>
+        <version>1.4.55-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/tilt/sissi-dev/Chart.yaml
+++ b/tilt/sissi-dev/Chart.yaml
@@ -8,4 +8,4 @@ dependencies:
    version: ">= 0.0.1"
  - name: postgresql
    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 12.12.10 # 13.x.x uses postgresql 16.x
+    version: 15.3.2
Author	SHA1	Message	Date
Sheldan	554d197ca4	[SIS-xxx] upgrading to new abstracto version	2024-06-13 18:23:36 +02:00
Sheldan	8826796fcb	[SIS-xxx] changing text for ban notification to contain translation	2024-06-02 23:11:07 +02:00
Sheldan	c8ed0e2195	[SIS-xxx] changing text for ban notification to contain the new invite link	2024-05-31 09:32:48 +02:00
release-bot	25d19bfa26	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-05-31 07:18:27 +00:00
release-bot	f7e19b580e	[maven-release-plugin] prepare for next development iteration	2024-05-31 07:14:21 +00:00
release-bot	5f6bd0d88e	[maven-release-plugin] prepare release sissi-1.4.54	2024-05-31 07:14:20 +00:00
Sheldan	a110c54411	[SIS-xxx] upgrading abstracto version	2024-05-31 09:11:12 +02:00
release-bot	a4a729dfc2	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-05-05 22:32:21 +00:00
release-bot	85eee4835f	[maven-release-plugin] prepare for next development iteration	2024-05-05 22:28:20 +00:00
release-bot	cab11140fa	[maven-release-plugin] prepare release sissi-1.4.53	2024-05-05 22:28:19 +00:00
Sheldan	5854ca2ba7	[SIS-xxx] upgrading abstracto version	2024-05-06 00:23:34 +02:00
release-bot	3f613eeddf	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-04-05 13:34:58 +00:00
release-bot	5fda777a62	[maven-release-plugin] prepare for next development iteration	2024-04-05 13:30:23 +00:00
release-bot	e447eca9dd	[maven-release-plugin] prepare release sissi-1.4.52	2024-04-05 13:30:20 +00:00
Sheldan	17e2e09541	[SIS-xxx] upgrading abstracto version	2024-04-05 15:24:39 +02:00
Sheldan	1ea2cc02c8	[SIS-xxx] renaming frontend environment variable	2024-04-05 01:59:12 +02:00
Sheldan	3a1071b65e	[SIS-xxx] adding variable to make frontend host available	2024-04-05 01:48:47 +02:00
release-bot	32274561e9	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-27 21:46:01 +00:00
release-bot	b3550549de	[maven-release-plugin] prepare for next development iteration	2024-03-27 21:41:57 +00:00
release-bot	eef245ede0	[maven-release-plugin] prepare release sissi-1.4.51	2024-03-27 21:41:55 +00:00
Sheldan	6ac950358f	[SIS-xxx] upgrading abstracto version	2024-03-27 22:26:42 +01:00
release-bot	01c59f5059	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-26 23:19:10 +00:00
release-bot	be0325deb9	[maven-release-plugin] prepare for next development iteration	2024-03-26 23:13:55 +00:00
release-bot	f8d84ff943	[maven-release-plugin] prepare release sissi-1.4.50	2024-03-26 23:13:53 +00:00
Sheldan	5ec3b3a1f4	[SIS-xxx] upgrading abstracto version	2024-03-27 00:10:17 +01:00
release-bot	fef1a5f0ae	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-26 21:59:12 +00:00
release-bot	db89b59600	[maven-release-plugin] prepare for next development iteration	2024-03-26 21:54:04 +00:00
release-bot	3ca37c448d	[maven-release-plugin] prepare release sissi-1.4.49	2024-03-26 21:54:01 +00:00
Sheldan	b6a416135a	[SIS-xxx] upgrading abstracto version	2024-03-26 22:49:11 +01:00
release-bot	ed181a2bc3	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-26 01:29:46 +00:00
release-bot	2ee2cb18f5	[maven-release-plugin] prepare for next development iteration	2024-03-26 01:23:50 +00:00
release-bot	d0908e7315	[maven-release-plugin] prepare release sissi-1.4.48	2024-03-26 01:23:48 +00:00
Sheldan	7c6809500a	[SIS-xxx] upgrading abstracto version	2024-03-26 02:09:17 +01:00
release-bot	a6e3f2df17	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-26 00:56:10 +00:00
release-bot	6b35a75539	[maven-release-plugin] prepare for next development iteration	2024-03-26 00:52:03 +00:00
release-bot	32ed3bff5d	[maven-release-plugin] prepare release sissi-1.4.47	2024-03-26 00:52:01 +00:00
Sheldan	30765ee80a	[SIS-xxx] upgrading abstracto version adapting to new python rest api structure	2024-03-26 01:33:40 +01:00
release-bot	91a1807abe	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-03-17 12:29:30 +00:00
release-bot	2567c139ae	[maven-release-plugin] prepare for next development iteration	2024-03-17 12:25:26 +00:00
release-bot	1f141d53de	[maven-release-plugin] prepare release sissi-1.4.46	2024-03-17 12:25:24 +00:00
Sheldan	0bd1e7d120	[SIS-xxx] updating abstracto version adding moderation actions to reaction report embed fixing syntax in reaction report embed removing deprecated flag vom tilt file	2024-03-17 13:19:28 +01:00
Sheldan	927f0f8ab2	[SIS-xxx] adding additional reaction report emote	2024-03-11 22:33:14 +01:00
release-bot	c2df483301	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-02-28 20:54:02 +00:00
release-bot	90c36cc506	[maven-release-plugin] prepare for next development iteration	2024-02-28 20:49:55 +00:00
release-bot	376a34fc2e	[maven-release-plugin] prepare release sissi-1.4.45	2024-02-28 20:49:53 +00:00
Sheldan	5ed0c89014	[SIS-xxx] updating abstracto version	2024-02-28 21:46:46 +01:00
Sheldan	2351787221	[SIS-xxx] fixing not handling quotes in titles for orf news post	2024-02-22 19:22:03 +01:00
release-bot	ca6e64832a	Commit from GitHub Actions (Publishes a new version of Sissi)	2024-02-19 00:03:00 +00:00
release-bot	8334562e2b	[maven-release-plugin] prepare for next development iteration	2024-02-18 23:58:43 +00:00