Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-04-13 19:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
abstracto-modules/core/src/main/resources/en_US/builtins/format_instant_en_US.ftl Normal file
View File

@@ -0,0 +1,8 @@
<#macro format_instant instant><t:${instant.epochSecond?c}></#macro>
<#macro format_instant_time instant><t:${instant.epochSecond?c}:t></#macro>
<#macro format_instant_long_time instant><t:${instant.epochSecond?c}:T></#macro>
<#macro format_instant_date instant><t:${instant.epochSecond?c}:d></#macro>
<#macro format_instant_long_date instant><t:${instant.epochSecond?c}:D></#macro>
<#macro format_instant_date_time instant><t:${instant.epochSecond?c}:f></#macro>
<#macro format_instant_long_date_time instant><t:${instant.epochSecond?c}:F></#macro>
<#macro format_instant_relative instant><t:${instant.epochSecond?c}:R></#macro>

3
abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#include "format_instant">
{ {
"author": { "author": {
<#if specifiedUser??> <#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 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 noteText>${note.note.note?json_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#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"/> <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>" </#list>"
} }

7
abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl
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/>, <@member_author member=mutedUser/>,
"title": { "title": {
"title": "<@safe_include "mute_log_title"/>" "title": "<@safe_include "mute_log_title"/>"
@@ -29,7 +30,7 @@
}, },
{ {
"name": "<@safe_include "mute_log_muted_until_field_title"/>", "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": { "footer": {

5
abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl
View File

@@ -1,5 +1,6 @@
<#include "full_member_info">
<#include "format_instant">
{ {
<#include "full_member_info">
<#if unMutedUser?has_content> <#if unMutedUser?has_content>
<#include "member_author"> <#include "member_author">
<@member_author member=unMutedUser/>, <@member_author member=unMutedUser/>,
@@ -34,7 +35,7 @@
</#if> </#if>
{ {
"name": "<@safe_include "unMute_log_muted_since_field_title"/>", "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"/>", "name": "<@safe_include "mute_log_mute_duration_field_title"/>",

5
abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl
View File

@@ -1,11 +1,12 @@
<#include "format_instant">
<#assign warnId>${warning.warning.warnId.id}</#assign> <#assign warnId>${warning.warning.warnId.id}</#assign>
<#assign reason>${warning.warning.reason}</#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 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 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"> <#include "warnings_warn_entry_text">
<#if warning.warning.decayed> <#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"> <#include "warnings_warn_is_decayed">
</#if> </#if>

3
abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl
View File

@@ -1,10 +1,11 @@
<#include "format_instant">
{ {
"title": { "title": {
"title": "<@safe_include "warnDecay_title"/>" "title": "<@safe_include "warnDecay_title"/>"
}, },
<#include "moderation_action_color">, <#include "moderation_action_color">,
"description": "<#list warnings as warning><#assign warning=warning/> "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> <#else>
<@safe_include "warnDecay_log_no_warnings"/> <@safe_include "warnDecay_log_no_warnings"/>
</#list>" </#list>"

3
abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_member_notification_embed_en_US.ftl
View File

@@ -1,6 +1,7 @@
<#include "format_instant">
{ {
<#assign reason=warnReason> <#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> <#assign remainingWarningsCount=remainingWarningsCount>
"additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>" "additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>"
} }

3
abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#include "format_instant">
{ {
<#include "user_detail"> <#include "user_detail">
"title": { "title": {
@@ -7,7 +8,7 @@
<#assign messageCount>${messageCount}</#assign> <#assign messageCount>${messageCount}</#assign>
<#assign user><#if user??><@user_detail user=user/><#else>${userId}</#if></#assign> <#assign user><#if user??><@user_detail user=user/><#else>${userId}</#if></#assign>
<#assign closingUserDescription><@member_user_name member=closingMember/> (${closingMember.idLong?c})</#assign> <#assign closingUserDescription><@member_user_name member=closingMember/> (${closingMember.idLong?c})</#assign>
<#assign startDate>${formatDate(startDate,"yyyy-MM-dd HH:mm:ss zz")}</#assign> <#assign startDate><@format_instant_date_time instant=startDate/></#assign>
<#assign duration>${fmtDuration(duration)}</#assign> <#assign duration>${fmtDuration(duration)}</#assign>
<#assign closedSilently=silently> <#assign closedSilently=silently>
"description": "<@safe_include "close_closing_description"/>" "description": "<@safe_include "close_closing_description"/>"

3
abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl
View File

@@ -1,9 +1,10 @@
<#include "format_instant">
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=member/>, <@member_author member=member/>,
<#include "modmail_color">, <#include "modmail_color">,
<#assign user><@member_user_name member=member/> (${member.user.id})</#assign> <#assign user><@member_user_name member=member/> (${member.user.id})</#assign>
<#assign joinDate>${member.timeJoined}</#assign> <#assign joinDate><@format_instant_date_time instant=memberJoinDate/></#assign>
<#assign roles><#list member.roles as role>${role.asMention?json_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign> <#assign roles><#list member.roles as role>${role.asMention?json_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign>
"description": "<@safe_include "modmail_thread_header_embed_description"/>" "description": "<@safe_include "modmail_thread_header_embed_description"/>"
} }

3
abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#include "format_instant">
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=member/>, <@member_author member=member/>,
@@ -12,7 +13,7 @@
<#list reminders as reminderDisplay><#assign reminderDisplay=reminderDisplay/> <#list reminders as reminderDisplay><#assign reminderDisplay=reminderDisplay/>
{ {
<#assign id>${reminderDisplay.reminder.id}</#assign> <#assign id>${reminderDisplay.reminder.id}</#assign>
<#assign reminderTargetDate>${formatDate(reminderDisplay.reminder.targetDate,"yyyy-MM-dd HH:mm:ss zz")}</#assign> <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.reminder.targetDate/></#assign>
<#assign reminderText=reminderDisplay.reminder.text/> <#assign reminderText=reminderDisplay.reminder.text/>
<#assign messageLink=reminderDisplay.message.jumpUrl/> <#assign messageLink=reminderDisplay.message.jumpUrl/>
"name": "<@safe_include "reminders_reminder_field_title"/>", "name": "<@safe_include "reminders_reminder_field_title"/>",

3
abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl
View File

@@ -1,7 +1,8 @@
<#include "format_instant">
{ {
<#assign guildName=guild.name> <#assign guildName=guild.name>
<#if statsSince?has_content> <#if statsSince?has_content>
<#assign sinceDate>${formatDate(statsSince, "yyyy-MM-dd")}</#assign> <#assign sinceDate><@format_instant_long_date instant=statsSince/></#assign>
</#if> </#if>
"additionalMessage": "<@safe_include "downloadEmoteStats_response_embed_text"/>" "additionalMessage": "<@safe_include "downloadEmoteStats_response_embed_text"/>"
} }

3
abstracto-modules/suggestion/src/main/resources/en_US/commands/suggest/suggest_suggestion_reminder_embed_en_US.ftl
View File

@@ -1,6 +1,7 @@
<#include "format_instant">
{ {
<#assign suggestionId=suggestionId> <#assign suggestionId=suggestionId>
<#assign suggestionDate>${formatDate(suggestionCreationDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign> <#assign suggestionDate><@format_instant_date_time instant=suggestionCreationDate/></#assign>
<#assign suggestionLink=suggestionMessage.jumpUrl> <#assign suggestionLink=suggestionMessage.jumpUrl>
<#assign agreements=suggestionInfo.agreements> <#assign agreements=suggestionInfo.agreements>
<#assign disagreements=suggestionInfo.disagreements> <#assign disagreements=suggestionInfo.disagreements>

5
abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#include "format_instant">
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=memberInfo/>, <@member_author member=memberInfo/>,
@@ -23,12 +24,12 @@
}, },
{ {
"name": "<@safe_include "userInfo_response_embed_joined_field_title"/>", "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
"value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss zz")}", "value": "<@format_instant_date_time instant=joinDate/>",
"inline": "true" "inline": "true"
}, },
{ {
"name": "<@safe_include "userInfo_response_embed_registered_field_title"/>", "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
"value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss zz")}", "value": "<@format_instant_date_time instant=creationDate/>",
"inline": "true" "inline": "true"
} }
<#if memberInfo.activities?size gt 0> <#if memberInfo.activities?size gt 0>

2
translations/moderation/src/main/resources/en_US/commands/warnings/warnings_warn_entry_text_en_US.ftl
View File

@@ -1 +1 @@
Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on `${warnDate}`. Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}.