Sheldan/Sissi
1
0
Fork 0
mirror of https://github.com/Sheldan/Sissi.git synced 2026-01-01 07:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SIS-xxx] updating abstracto version

Browse Source 
adding moderation actions to reaction report embed
fixing syntax in reaction report embed
removing deprecated flag vom tilt file
This commit is contained in:
Sheldan
2024-03-17 13:19:28 +01:00
parent 927f0f8ab2
commit 0bd1e7d120
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -1,4 +1,4 @@
REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/ ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
VERSION=1.4.45 VERSION=1.4.45
ABSTRACTO_VERSION=1.5.26 ABSTRACTO_VERSION=1.5.27

2
Tiltfile
View File

@@ -18,7 +18,7 @@ local_resource(
docker_build_with_restart( docker_build_with_restart(
registry + 'sissi-bot', registry + 'sissi-bot',
'./application/executable/target/jar', './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', dockerfile='./application/executable/Dockerfile',
live_update=[ live_update=[
sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'), sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),

4
deployment/helm/sissi/values.yaml
View File

@@ -90,7 +90,7 @@ templateDeployment:
repository: harbor.sheldan.dev/abstracto repository: harbor.sheldan.dev/abstracto
pullPolicy: Always pullPolicy: Always
image: abstracto-template-deployment image: abstracto-template-deployment
tag: 1.5.26 tag: 1.5.27
templateDeploymentData: templateDeploymentData:
repository: harbor.sheldan.dev/sissi repository: harbor.sheldan.dev/sissi
pullPolicy: Always pullPolicy: Always
@@ -101,7 +101,7 @@ dbConfigDeployment:
repository: harbor.sheldan.dev/abstracto repository: harbor.sheldan.dev/abstracto
pullPolicy: Always pullPolicy: Always
image: abstracto-db-deployment image: abstracto-db-deployment
tag: 1.5.26 tag: 1.5.27
dbConfigDeploymentData: dbConfigDeploymentData:
repository: harbor.sheldan.dev/sissi repository: harbor.sheldan.dev/sissi
pullPolicy: Always pullPolicy: Always

4
pom.xml
View File

@@ -18,8 +18,8 @@
<properties> <properties>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<abstracto.version>1.5.27-SNAPSHOT</abstracto.version> <abstracto.version>1.5.27</abstracto.version>
<abstracto.templates.version>1.4.34</abstracto.templates.version> <abstracto.templates.version>1.4.35</abstracto.templates.version>
<apache-jena.version>4.9.0</apache-jena.version> <apache-jena.version>4.9.0</apache-jena.version>
<rssreader.version>3.5.0</rssreader.version> <rssreader.version>3.5.0</rssreader.version>
</properties> </properties>

12
templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl
View File

@@ -17,7 +17,7 @@
<#elseif reportedMessage.attachments?size = 0 && reportedMessage.embeds?size gt 0 && reportedMessage.embeds[0].cachedImageInfo??> <#elseif reportedMessage.attachments?size = 0 && reportedMessage.embeds?size gt 0 && reportedMessage.embeds[0].cachedImageInfo??>
,"imageUrl": "${reportedMessage.embeds[0].cachedImageInfo.proxyUrl}" ,"imageUrl": "${reportedMessage.embeds[0].cachedImageInfo.proxyUrl}"
</#if> </#if>
<#if singularMessage>, <#if singularMessage>
,"fields": [ ,"fields": [
{ {
"name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>", "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
@@ -36,5 +36,15 @@
"persistCallback": false "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>
] ]
} }