introduced color templates to manage the colors in a central way

created member author macro
created full member info macro
created member name macro
replaced some missed places with translation templates
made some templates for translation easier
This commit is contained in:
Sheldan
2020-08-16 12:38:32 +02:00
parent 8a33ff6099
commit a78bc99933
87 changed files with 202 additions and 388 deletions

View File

@@ -1,13 +1,7 @@
{
"author": {
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "member_author">
<@member_author member=member/>,
<#include "modmail_color">,
"description": "<@safe_include "modmail_thread_already_exists"/>",
"fields": [
{

View File

@@ -0,0 +1,5 @@
"color" : {
"r": 26,
"g": 201,
"b": 61
}

View File

@@ -3,10 +3,6 @@
"name": "${user.member.effectiveName?js_string}",
"avatar": "${user.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "exception_color">,
"description": "<@safe_include "reply_exception_cannot_send_message_to_use"/>"
}

View File

@@ -3,10 +3,6 @@
"name": "${user.member.effectiveName?js_string}",
"avatar": "${user.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "exception_color">,
"description": "<@safe_include "modmail_failed_to_create_mod_mail_thread"/>"
}

View File

@@ -3,10 +3,6 @@
"name": "${user.member.effectiveName?js_string}",
"avatar": "${user.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "exception_color">,
"description": "<@safe_include "modmail_generic_error"/>"
}

View File

@@ -3,10 +3,6 @@
"name": "${user.member.effectiveName?js_string}",
"avatar": "${user.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "exception_color">,
"description": "<@safe_include "modmail_post_target_error"/>"
}

View File

@@ -1,8 +1,4 @@
{
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "warning_color">,
"description": "<@safe_include "modmail_no_server_available"/>"
}

View File

@@ -1,17 +1,11 @@
{
"author": {
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=threadUser.member/>,
"title": {
"title": "<@safe_include "modmail_notification_message_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator}(${threadUser.member.user.id})</#assign>
<#include "modmail_color">,
<#assign user><@member_user_name member=threadUser.member/>(${threadUser.member.user.id})</#assign>
"description": "<@safe_include "modmail_notification_message_description"/>"
<#if roles?size gt 0>
,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>,</#list>"

View File

@@ -1,16 +1,10 @@
{
"author": {
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=threadUser.member/>,
"title": {
"title": "<@safe_include "modmail_thread_user_message_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "modmail_color">,
<#if postedMessage.contentRaw?has_content>
"description": "${postedMessage.contentRaw?js_string}"
</#if>

View File

@@ -2,11 +2,7 @@
"title": {
"title": "<@safe_include "modmail_closing_notification_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "modmail_color">,
<#assign messageCount>${closedThread.messages?size}</#assign>
<#assign user>user</#assign>
<#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss")}</#assign>

View File

@@ -1,13 +1,7 @@
{
"author": {
"name": "${author.member.effectiveName?js_string}",
"avatar": "${author.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
}
<#include "member_author">
<@member_author member=author.member/>,
<#include "modmail_color">,
<#if message.embeds[0].description?has_content>
,"description": "${message.embeds[0].description?js_string}"
</#if>

View File

@@ -1,8 +1,4 @@
{
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "modmail_color">,
"description": "${closingMessage?js_string}"
}

View File

@@ -1,16 +1,10 @@
{
"author": {
"name": "${moderator.effectiveName?js_string}",
"avatar": "${moderator.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=moderator/>,
"title": {
"title": "<@safe_include "modmail_thread_staff_message_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
}
<#include "modmail_color">,
<#if text?has_content>
, "description": "${text?js_string}"
</#if>

View File

@@ -1,14 +1,8 @@
{
"author": {
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator} (${threadUser.member.user.id})</#assign>
<#include "member_author">
<@member_author member=threadUser.member/>,
<#include "modmail_color">,
<#assign user><@member_user_name member=threadUser.member/> (${threadUser.member.user.id})</#assign>
<#assign joinDate>${threadUser.member.timeJoined}</#assign>
<#assign roles><#list threadUser.member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign>
"description": "<@safe_include "modmail_thread_header_embed_description"/>"