diff --git a/.env b/.env index c6912091..3cc8309d 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/ VERSION=1.5.14 -ABSTRACTO_VERSION=1.6.15 \ No newline at end of file +ABSTRACTO_VERSION=1.6.16 \ No newline at end of file diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml index 28ce7063..362ab6c1 100644 --- a/deployment/helm/sissi/values.yaml +++ b/deployment/helm/sissi/values.yaml @@ -93,7 +93,7 @@ templateDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-template-deployment - tag: 1.6.15 + tag: 1.6.16 templateDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always @@ -104,7 +104,7 @@ dbConfigDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-db-deployment - tag: 1.6.15 + tag: 1.6.16 dbConfigDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always diff --git a/pom.xml b/pom.xml index c0bd14f7..2621aa58 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 17 17 - 1.6.15 - 1.4.61 + 1.6.16 + 1.4.62 4.9.0 3.5.0 diff --git a/templates/custom/user_leave_embed.ftl b/templates/custom/user_leave_embed.ftl new file mode 100644 index 00000000..994b5e92 --- /dev/null +++ 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}> + +<#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]> + + +<#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> + + + + <#assign print=true> + <#list group as shortcut,prio> + <#if relevantRoleIds?seq_contains(mapping[shortcut])> + <#if prio < found_prio> + <#assign print=false> + + + + <#return print> + +<#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> + + +<#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}) + "additionalMessage": "<@safe_include "user_left_text"/>" +} \ No newline at end of file diff --git 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 index 9dbdfd8a..879101bf 100644 --- 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 userText>${user.name} (${user.userMention}: ${user.id}) "additionalMessage": "<@safe_include "user_left_text"/>" } \ No newline at end of file diff --git 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 index 0ecad4a1..7c405754 100644 --- 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}! \ No newline at end of file +Dere, pfiatdi und baba, ${userText}! \ No newline at end of file