Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-11-09 16:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduced color templates to manage the colors in a central way

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl
+6 -11
View File
@@ -1,24 +1,19 @@
{
"author": {
"name": "${bannedUser.effectiveName?js_string}",
"avatar": "${bannedUser.user.effectiveAvatarUrl}"
},
<#include "full_member_info">
<#include "member_author">
<@member_author member=bannedUser/>,
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
"value": "${bannedUser.effectiveName?js_string} ${bannedUser.asMention?js_string} (${bannedUser.idLong?c})"
"value": "<@full_member_info member=bannedUser/>"
},
{
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})"
"value": "<@full_member_info member=banningUser/>"
},
{
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl → abstracto-modules/moderation/src/main/resources/en_US/command/banId/banId_log_embed_en_US.ftl
+3 -6
View File
@@ -1,12 +1,9 @@
{
<#include "full_member_info">
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
@@ -14,7 +11,7 @@
},
{
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})"
"value": "<@full_member_info member=banningUser/>"
},
{
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl
+6 -11
View File
@@ -1,24 +1,19 @@
{
"author": {
"name": "${kickedUser.effectiveName?js_string}",
"avatar": "${kickedUser.user.effectiveAvatarUrl}"
},
<#include "full_member_info">
<#include "member_author">
<@member_author member=kickedUser/>,
"title": {
"title": "<@safe_include "kick_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "kick_log_kicked_user_field_title"/>",
"value": "${kickedUser.effectiveName?js_string} ${kickedUser.asMention?js_string} (${kickedUser.idLong?c})"
"value": "<@full_member_info member=kickedUser/>"
},
{
"name": "<@safe_include "kick_log_kicking_user_field_title"/>",
"value": "${kickingUser.effectiveName?js_string} ${kickingUser.asMention?js_string} (${kickingUser.idLong?c})"
"value": "<@full_member_info member=kickingUser/>"
},
{
"name": "<@safe_include "kick_log_jump_link_field_title"/>",
abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl
+4 -8
View File
@@ -1,26 +1,22 @@
{
"author": {
<#if specifiedUser??>
"name": "${specifiedUser.member.effectiveName?js_string}",
"name": "<@member_user_name member=specifiedUser/>",
"avatar": "${specifiedUser.member.user.effectiveAvatarUrl}"
<#else>
"name": "${member.effectiveName?js_string}",
"name": "<@member_user_name member=member/>",
"avatar": "${member.user.effectiveAvatarUrl}"
</#if>
},
"title": {
<#if specifiedUser??>
<#assign user>${specifiedUser.member.effectiveName?js_string}</#assign>
<#assign user><@member_user_name member=specifiedUser/></#assign>
"title": "<@safe_include "user_notes_embed_user_title"/>"
<#else>
"title": "<@safe_include "user_notes_embed_title"/>"
</#if>
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "success_color">,
"description": "<#list userNotes as note><#assign note=note/>
<#assign user>${note.fullUser.member.asMention?js_string}</#assign>
<#assign noteText>${note.note.note?js_string}</#assign>
abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl
+8 -12
View File
@@ -1,24 +1,19 @@
{
"author": {
"name": "${mutedUser.effectiveName?js_string}",
"avatar": "${mutedUser.user.effectiveAvatarUrl}"
},
<#include "full_member_info">
<#include "member_author">
<@member_author member=mutedUser/>,
"title": {
"title": "<@safe_include "mute_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "mute_log_muted_user_field_title"/>",
"value": "${mutedUser.effectiveName?js_string} ${mutedUser.asMention?js_string} (${mutedUser.idLong?c})"
"value": "<@full_member_info member=mutedUser/>"
},
{
"name": "<@safe_include "mute_log_muting_user_field_title"/>",
"value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})"
"value": "<@full_member_info member=mutingUser/>"
},
{
"name": "<@safe_include "mute_log_mute_location_field_title"/>",
@@ -38,7 +33,8 @@
}
],
"footer": {
"text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}"
<#assign muteId=mute.id/>
"text": "<@safe_include "mute_log_mute_id_footer"/>"
},
"timeStamp": "${mute.muteDate}"
}
abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl
+8 -12
View File
@@ -1,23 +1,18 @@
{
<#include "full_member_info">
<#if unMutedUser?has_content>
"author": {
"name": "${unMutedUser.effectiveName?js_string}",
"avatar": "${unMutedUser.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=unMutedUser/>,
</#if>
"title": {
"title": "<@safe_include "unMute_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
<#if unMutedUser?has_content>
"value": "${unMutedUser.effectiveName?js_string} ${unMutedUser.asMention?js_string} (${unMutedUser.idLong?c})"
"value": "<@full_member_info member=mutingUser/>"
<#else>
"value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
</#if>
@@ -26,7 +21,7 @@
{
"name": "<@safe_include "mute_log_muting_user_field_title"/>",
<#if mutingUser?has_content>
"value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})"
"value": "<@full_member_info member=mutingUser/>"
<#else>
"value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
</#if>
@@ -49,7 +44,8 @@
}
],
"footer": {
"text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}"
<#assign muteId=mute.id/>
"text": "<@safe_include "mute_log_mute_id_footer"/>"
},
"timeStamp": "${unmuteDate}"
}
abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl
+4 -10
View File
@@ -1,14 +1,8 @@
{
"author": {
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
}
<#assign userMention>${member.effectiveName?js_string}</#assign>
<#include "member_author">
<@member_author member=member/>,
<#include "success_color">,
<#assign userMention><@member_user_name member=member/></#assign>
,"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
</#if>
}
abstracto-modules/moderation/src/main/resources/en_US/command/slowMode/slowmode_log_en_US.ftl
-1
View File
@@ -1 +0,0 @@
The slowmode in channel ${channel.name} has been set to ${channel.slowMode} seconds.
abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl
+6 -11
View File
@@ -1,25 +1,20 @@
{
"author": {
"name": "${warnedUser.effectiveName?js_string}",
"avatar": "${warnedUser.user.effectiveAvatarUrl}"
},
<#include "full_member_info">
<#include "member_author">
<@member_author member=warnedUser/>,
"title": {
"title": "<@safe_include "warn_log_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"fields": [
{
"name": "<@safe_include "warn_log_warned_user_field_title"/>",
"value": "${warnedUser.effectiveName?js_string} ${warnedUser.asMention?js_string} (${warnedUser.idLong?c})"
"value": "<@full_member_info member=warnedUser/>"
},
<#if warningUser?has_content>
{
"name": "<@safe_include "warn_log_warning_user_field_title"/>",
"value": "${warningUser.effectiveName?js_string} ${warningUser.asMention?js_string} (${warningUser.idLong?c})"
"value": "<@full_member_info member=warningUser/>"
},
</#if>
<#if warning?has_content>
abstracto-modules/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl
+5
View File
@@ -0,0 +1,5 @@
"color" : {
"r": 201,
"g": 126,
"b": 26
}
abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl
+3 -9
View File
@@ -1,14 +1,8 @@
{
"author": {
"name": "${member.effectiveName?js_string}#${member.user.discriminator}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=member/>,
"description": "<@safe_include "messageDeleted_description_text"/>",
"color" : {
"r": 200,
"g": 0,
"b": 0
},
<@safe_include "abstracto_color"/>,
"fields": [
{
"name": "<@safe_include "messageDeleted_original_message_field_title"/>",
abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl
+3 -9
View File
@@ -1,14 +1,8 @@
{
"author": {
"name": "${member.effectiveName?js_string}#${member.user.discriminator}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
<#include "member_author">
<@member_author member=member/>,
"description": "<@safe_include "messageEdited_description_text"/>",
"color" : {
"r": 200,
"g": 0,
"b": 0
},
<@safe_include "abstracto_color"/>,
"fields": [
{
"name": "<@safe_include "messageEdited_original_message_field_title"/>",
abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl
+2 -6
View File
@@ -2,13 +2,9 @@
"title": {
"title": "<@safe_include "warnDecay_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#include "moderation_action_color">,
"description": "<#list warnings as warning><#assign warning=warning/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id})</#assign><#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c}</#assign></#if> <@safe_include "warnDecay_log_warn_entry"/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id})</#assign><#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#else>
<@safe_include "warnDecay_log_no_warnings"/>
</#list>"