Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-04-07 01:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-338] fixing messages without content not properly handled by modmail

Browse Source 
fixing mutes and warnings paginator template
This commit is contained in:
Sheldan
2021-12-02 00:03:22 +01:00
parent 02d5d7cc1c
commit c52dbbb1f3
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl
View File

@@ -4,7 +4,7 @@
<#assign chunks=innerModel.mutes?chunk(5)>
<#-- we have to separate the chunk, so we can re-use it to disable the last buttons, and also we have to assign the for loop value, -->
<#-- so it available in sub templates, also the counter needs to be defined, else it doesnt the detect its a loop variable it seems -->
<#list chunks as row><#assign row=row><#include "mutes_response_entry"><#sep>,</#list>
<#list chunks as row><#assign counter=row?index><#assign row=row><#include "mutes_response_entry"><#sep>,</#list>
],
"timeoutSeconds": 120,
"restrictUser": true

2
abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
View File

@@ -2,7 +2,7 @@
<#assign exitOnly=innerModel.warnings?size lt 6/>
"embedConfigs": [
<#assign chunks=innerModel.warnings?chunk(5)>
<#list chunks as row><#assign counter=row?counter><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
<#list chunks as row><#assign counter=row?index><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
],
"timeoutSeconds": 120,
"restrictUser": true

12
abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
View File

@@ -5,15 +5,15 @@
"title": "<@safe_include "modmail_thread_user_message_title"/>"
},
<#include "modmail_color">,
<#if subscribers?size gt 0>
"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>",
</#if>
<#if postedMessage.contentRaw?has_content>
"description": "${postedMessage.contentRaw?json_string}"
<#else>
"description": "<@safe_include "modmail_no_message_provided"/>"
</#if>
<#if postedMessage.attachments?size gt 0>
<#if postedMessage.contentRaw?has_content>,</#if>
"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
</#if>
<#if subscribers?size gt 0>
<#if postedMessage.contentRaw?has_content || postedMessage.attachments?size gt 0>,</#if>
"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"
,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
</#if>
}

1
translations/modmail/src/main/resources/en_US/threadContent/modmail_no_message_provided_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
No message provided.