From 0bd1e7d120dfde9a5ccbb68c0a3756f765150594 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:19:28 +0100
Subject: [PATCH] [SIS-xxx] updating abstracto version adding moderation
 actions to reaction report embed fixing syntax in reaction report embed
 removing deprecated flag vom tilt file

---
 .env                                                 |  2 +-
 Tiltfile                                             |  2 +-
 deployment/helm/sissi/values.yaml                    |  4 ++--
 pom.xml                                              |  4 ++--
 .../reactionReport_notification_embed_en_US.ftl      | 12 +++++++++++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index e02533c8..b292b69e 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
 VERSION=1.4.45
-ABSTRACTO_VERSION=1.5.26
\ No newline at end of file
+ABSTRACTO_VERSION=1.5.27
\ No newline at end of file
diff --git a/Tiltfile b/Tiltfile
index 6986b2c1..ad950779 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -18,7 +18,7 @@ local_resource(
 docker_build_with_restart(
   registry + 'sissi-bot',
   './application/executable/target/jar',
-  entrypoint=['java', '-noverify', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
+  entrypoint=['java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
   dockerfile='./application/executable/Dockerfile',
   live_update=[
     sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml
index a394438f..379383c4 100644
--- a/deployment/helm/sissi/values.yaml
+++ b/deployment/helm/sissi/values.yaml
@@ -90,7 +90,7 @@ templateDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.26
+  tag: 1.5.27
 templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
@@ -101,7 +101,7 @@ dbConfigDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.26
+  tag: 1.5.27
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
diff --git a/pom.xml b/pom.xml
index 02063b92..7a4d0b99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.27-SNAPSHOT</abstracto.version>
-        <abstracto.templates.version>1.4.34</abstracto.templates.version>
+        <abstracto.version>1.5.27</abstracto.version>
+        <abstracto.templates.version>1.4.35</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>
     </properties>
diff --git 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
index 3f964c57..b9ae2f3a 100644
--- 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>
     ]
 }
\ No newline at end of file