[AB-333] refactoring templates to use Discord time stamp formatting

This commit is contained in:
Sheldan
2021-10-14 01:33:29 +02:00
parent ecb8824614
commit cc584d711c
14 changed files with 38 additions and 18 deletions

View File

@@ -1,3 +1,4 @@
<#include "format_instant">
{
"author": {
<#if specifiedUser??>
@@ -21,7 +22,7 @@
<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign>
<#assign noteText>${note.note.note?json_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#assign>
<#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign date><@format_instant_date_time instant=note.note.created/></#assign>
<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>"
}

View File

@@ -1,6 +1,7 @@
<#include "full_member_info">
<#include "format_instant">
<#include "member_author">
{
<#include "full_member_info">
<#include "member_author">
<@member_author member=mutedUser/>,
"title": {
"title": "<@safe_include "mute_log_title"/>"
@@ -29,7 +30,7 @@
},
{
"name": "<@safe_include "mute_log_muted_until_field_title"/>",
"value": "${formatDate(muteTargetDate, "yyyy-MM-dd HH:mm:ss zz")}"
"value": "<@format_instant_date_time instant=muteTargetDate/>"
}
],
"footer": {

View File

@@ -1,5 +1,6 @@
<#include "full_member_info">
<#include "format_instant">
{
<#include "full_member_info">
<#if unMutedUser?has_content>
<#include "member_author">
<@member_author member=unMutedUser/>,
@@ -34,7 +35,7 @@
</#if>
{
"name": "<@safe_include "unMute_log_muted_since_field_title"/>",
"value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss zz")}"
"value": "<@format_instant_date_time instant=mute.muteDate/>"
},
{
"name": "<@safe_include "mute_log_mute_duration_field_title"/>",

View File

@@ -1,11 +1,12 @@
<#include "format_instant">
<#assign warnId>${warning.warning.warnId.id}</#assign>
<#assign reason>${warning.warning.reason}</#assign>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#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 warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign>
<#include "warnings_warn_entry_text">
<#if warning.warning.decayed>
<#assign decayDate>${formatDate(warning.warning.decayDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign decayDate><@format_instant_date_time instant=warning.warning.decayDate/></#assign>
<#include "warnings_warn_is_decayed">
</#if>

View File

@@ -1,10 +1,11 @@
<#include "format_instant">
{
"title": {
"title": "<@safe_include "warnDecay_title"/>"
},
<#include "moderation_action_color">,
"description": "<#list warnings as warning><#assign warning=warning/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#else>
<@safe_include "warnDecay_log_no_warnings"/>
</#list>"

View File

@@ -1,6 +1,7 @@
<#include "format_instant">
{
<#assign reason=warnReason>
<#assign warningDate>${formatDate(warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#assign warningDate><@format_instant_date_time instant=warnDate/></#assign>
<#assign remainingWarningsCount=remainingWarningsCount>
"additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>"
}