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 "abstracto_color">,
"description": "<@safe_include "remind_reminder_description"/>",
"fields": [
{

View File

@@ -1,15 +1,9 @@
{
<#assign id>${reminder.id}</#assign>
<#assign messageUrl>${message.jumpUrl}</#assign>
"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 "abstracto_color">,
"description": "<@safe_include "remind_reminding_description_text"/>",
"additionalMessage": "${member.asMention?js_string}"
}

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 "abstracto_color">,
"title": {
"title": "<@safe_include "reminders_reminders_embed_title"/>"
},
@@ -15,6 +9,8 @@
<#list reminders as reminder><#assign reminder=reminder/>
{
<#assign id>${reminder.id}</#assign>
<#assign reminderTargetDate>${formatDate(reminder.targetDate,"yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign reminderText=reminder.text/>
"name": "<@safe_include "reminders_reminder_field_title"/>",
"value": "<@safe_include "reminders_due_on"/>"
}

View File

@@ -2,11 +2,7 @@
"title": {
"title": "<#assign name=guild.name><@safe_include "serverinfo_embed_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "abstracto_color">,
"fields": [
{
"name": "<@safe_include "serverinfo_embed_id_field_title"/>",
@@ -15,7 +11,7 @@
},
{
"name": "<@safe_include "serverinfo_embed_owner_field_title"/>",
"value": "${guild.owner.effectiveName?js_string}#${guild.owner.user.discriminator}",
"value": "<@member_user_name member=guild.owner/>",
"inline": "true"
},
{
@@ -29,14 +25,14 @@
"inline": "true"
},
{
"name": "<@safe_include "serverinfo_embed_created_field_title">",
"name": "<@safe_include "serverinfo_embed_created_field_title"/>",
"value": "${guild.timeCreated}",
"inline": "true"
},
${safeFieldLength(guild.emotes, 'emote_mention', 'serverinfo_embed_emotes_field_title', 'false')},
{
"name": "<@safe_include "serverinfo_embed_features_field_title"/>",
"value": "<#list guild.features as feature>${feature}<#else>No features</#list>",
"value": "<#list guild.features as feature>${feature}<#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
"inline": "true"
}
]

View File

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

View File

@@ -2,11 +2,7 @@
"title": {
"title": "<@safe_include "starStats_response_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "abstracto_color">,
"description": "<@safe_include "startStats_description"/>",
"fields": [
{

View File

@@ -1,18 +1,14 @@
{
"author": {
<#if suggester?has_content>
"name": "${suggester.effectiveName?js_string}",
"name": "<@member_user_name member=suggester/>",
"avatar": "${suggester.user.effectiveAvatarUrl}"
<#else>
"name": "${suggesterUser.userReference.id}"
</#if>
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#assign user>${member.effectiveName?js_string}</#assign>
<#include "abstracto_color">,
<#assign user><@member_user_name member=member/></#assign>
<#assign id>${suggestion.id}</#assign>
<#if suggestion.state = "ACCEPTED">
"description": "~~${text?js_string}~~ \n✅ ${reason} - <@safe_include "suggest_accepted_by"/>",

View File

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

View File

@@ -1,13 +1,7 @@
{
"author": {
"name": "${author.effectiveName?js_string}",
"avatar": "${author.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "member_author">
<@member_author member=author/>,
<#include "abstracto_color">,
<#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0>
"description": "${embeddedMessage.content?js_string}
<#list embeddedMessage.embeds>

View File

@@ -1,17 +1,13 @@
{
"author": {
<#if author?has_content>
"name": "${author.effectiveName}",
"name": "<@member_user_name member=author/>",
"avatar": "${author.user.effectiveAvatarUrl}"
<#else>
"name": "${user.id?c} (<@safe_include "user_left_server"/>)"
</#if>
},
"color" : {
"r": 200,
"g": 0,
"b": 255
}
<#include "abstracto_color">,
<#if message.content?has_content || message.embeds?size gt 0>
,"description": "${message.content?js_string}
<#list message.embeds>