[OPB-xxx] changing ban notification text

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.6.26
-ABSTRACTO_VERSION=1.5.35
+VERSION=1.6.28
+ABSTRACTO_VERSION=1.5.37

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>

application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-customizations</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/starboard-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/news/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/seasonal/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/setup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.27</version>
+    <version>1.6.29-SNAPSHOT</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>

deployment/helm/oneplus-bot/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: oneplus-bot
 description: A Helm chart for Kubernetes
 type: application
-version: 1.6.26
+version: 1.6.28

deployment/helm/oneplus-bot/values.yaml

@@ -3,7 +3,7 @@ bot:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: IfNotPresent
   image: oneplus-bot-image
-  tag: 1.6.26
+  tag: 1.6.28
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -16,29 +16,29 @@ bot:
     newsForumPostNotificationServerId: null
   propertyConfig:
     hikariPoolSize: 10
-  host:
+  host: null
 templateDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.35
+  tag: 1.5.37
 templateDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-template-data
-  tag: 1.6.26
+  tag: 1.6.28
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.35
+  tag: 1.5.37
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-db-data
-  tag: 1.6.26
+  tag: 1.6.28
 dbCredentials:
   host: null
   port: null
@@ -51,7 +51,7 @@ privateRestApi:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-private-rest-api
-  tag: 1.6.26
+  tag: 1.6.28
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -82,7 +82,7 @@ restApi:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-rest-api
-  tag: 1.6.26
+  tag: 1.6.28
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplusbot</artifactId>
         <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -12,13 +12,13 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.6.27</version>
+    <version>1.6.29-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.35</abstracto.version>
-        <abstracto.templates.version>1.4.36</abstracto.templates.version>
+        <abstracto.version>1.5.37</abstracto.version>
+        <abstracto.templates.version>1.4.38</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -69,6 +69,6 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/OnePlusBot.git</url>
-        <tag>oneplusbot-1.6.27</tag>
+        <tag>HEAD</tag>
     </scm>
 </project>

templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
         <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/module-templates/news-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
         <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/module-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
         <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>oneplus-bot-templates</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.27</version>
+    <version>1.6.29-SNAPSHOT</version>
     <modules>
         <module>module-templates</module>
         <module>customization-templates</module>

templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl

@@ -1,4 +1,4 @@
 {
-<#assign user>${user.name} (${user.id})</#assign>
+<#assign user>${user.name} (${user.id?c})</#assign>
   "additionalMessage": "<@safe_include "user_left_text"/>"
 }

templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
 
     <modules>
@@ -14,7 +14,7 @@
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.6.27</version>
+    <version>1.6.29-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 </project>

templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/customization-translations/moderation-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/customization-translations/starboard-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/faq-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/news-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/referral-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/seasonal-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/setup-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/translation-overrides/moderation-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl

@@ -1 +1,4 @@
-You were banned from the server ${serverName} for `${reason}`. You can appeal at: oneplus.appeals@pm.me.
+You were banned from the server ${serverName} for `${reason}`.
+If you want to appeal, join the server https://discord.gg/JxCv73wh45 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.

templates/translations/translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.27</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tilt/oneplusbot-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