[AB-352] changed templates for mutes/user notes/warns after models changed

reduced warnings displayed at once
placed reason for warnings at different position
This commit is contained in:
Sheldan
2021-12-24 23:42:31 +01:00
parent 60e37b4ef2
commit 6ea28f2424
7 changed files with 24 additions and 23 deletions

View File

@@ -21,10 +21,10 @@
}, },
<#include "success_color">, <#include "success_color">,
"description": "<#list userNotes as note><#assign note=note/> "description": "<#list userNotes as note><#assign note=note/>
<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign> <#assign user><#if note.member.memberMention?has_content>${note.member.memberMention}<#else>${note.member.userId?c}</#if></#assign>
<#assign noteText>${note.note.note?json_string}</#assign> <#assign noteText>${note.note?json_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#assign> <#assign noteId>${note.noteId}</#assign>
<#assign date><@format_instant_date_time instant=note.note.created/></#assign> <#assign date><@format_instant_date_time instant=note.created/></#assign>
<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/> <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>" </#list>"
} }

View File

@@ -1,10 +1,10 @@
<#include "format_instant"> <#include "format_instant">
<#assign muteId>${mute.mute.muteId.id}</#assign> <#assign muteId>${mute.muteId}</#assign>
<#assign reason>${mute.mute.reason}</#assign> <#assign reason>${mute.reason}</#assign>
<#assign mutedUserText><#if mute.mutedUser.member??>${mute.mutedUser.member.asMention}(${mute.mutedUser.member.user.id})<#else>${mute.mutedUser.userId?c}</#if></#assign> <#assign mutedUserText><#if mute.mutedUser.memberMention??>${mute.mutedUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutedUser.userId?c}</#if></#assign>
<#assign mutingUserText><#if mute.mutingUser.member??>${mute.mutingUser.member.asMention}(${mute.mutingUser.member.user.id})<#else>${mute.mutingUser.userId?c}</#if></#assign> <#assign mutingUserText><#if mute.mutingUser.memberMention??>${mute.mutingUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutingUser.userId?c}</#if></#assign>
<#assign muteDate><@format_instant_date_time instant=mute.mute.muteDate/></#assign> <#assign muteDate><@format_instant_date_time instant=mute.muteDate/></#assign>
<#assign muteEnded>${mute.mute.muteEnded?string('✅', '❌')}</#assign> <#assign muteEnded>${mute.muteEnded?string('✅', '❌')}</#assign>
<#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign> <#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign>
<#include "mutes_mute_entry_text"> <#include "mutes_mute_entry_text">

View File

@@ -1,7 +1,7 @@
{ {
<#assign exitOnly=innerModel.warnings?size lt 6/> <#assign exitOnly=innerModel.warnings?size lt 5/>
"embedConfigs": [ "embedConfigs": [
<#assign chunks=innerModel.warnings?chunk(5)> <#assign chunks=innerModel.warnings?chunk(4)>
<#list chunks as row><#assign counter=row?index><#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, "timeoutSeconds": 120,

View File

@@ -1,7 +1,7 @@
{ {
"embeds": [ "embeds": [
{ {
"description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/></#list>" "description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/>\n</#list>"
} }
], ],
"buttons": [ "buttons": [

View File

@@ -1,13 +1,14 @@
<#include "format_instant"> <#include "format_instant">
<#assign decayed=warning.warning.decayed/> <#assign decayed=warning.decayed/>
<#assign warnId>${warning.warning.warnId.id}</#assign> <#assign warnId=warning.warnId/>
<#assign reason>${warning.warning.reason}</#assign> <#assign reason=warning.reason/>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.userId?c}</#if></#assign> <#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warnedUser.userId?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.userId?c}</#if></#assign> <#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warningUser.userId?c}</#if></#assign>
<#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign> <#assign warnDate><@format_instant_date_time instant=warning.warnDate/></#assign>
<#include "warnings_warn_entry_text"> <#include "warnings_warn_entry_text">
<#if warning.warning.decayed>
<#assign decayDate><@format_instant_date_time instant=warning.warning.decayDate/></#assign> <#if decayed>
<#assign decayDate><@format_instant_date_time instant=warning.decayDate/></#assign>
<#include "warnings_warn_is_decayed"> <#include "warnings_warn_is_decayed">
</#if> </#if>

View File

@@ -1 +1 @@
${user} has note ${noteId} with text ${noteText} on ${date} ${user} has note ${noteId} on ${date} with text `${noteText}`.

View File

@@ -1 +1 @@
Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. The warning is **${decayed?then('decayed', 'active')}** Warning #${warnId} towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. It is **${decayed?then('decayed', 'active')}**. The reason was: `${reason}`.