From a78bc999334f5489dcc6aeff08115c8e513d5ccf Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sun, 16 Aug 2020 12:38:32 +0200 Subject: [PATCH] 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 --- ...signable_roles_config_post_embed_en_US.ftl | 8 ++------ ...nable_role_places_overview_embed_en_US.ftl | 8 ++------ .../colors/assignable_place_color_en_US.ftl | 5 +++++ ...ssigned_user_not_found_exception_en_US.ftl | 2 +- ...channel_does_not_exist_exception_en_US.ftl | 2 +- ..._emote_already_defined_exception_en_US.ftl | 2 +- ...able_role_place_exists_exception_en_US.ftl | 2 +- ...e_place_post_not_found_exception_en_US.ftl | 2 +- ..._place_role_not_usable_exception_en_US.ftl | 2 +- ..._assignable_role_place_exception_en_US.ftl | 2 +- .../assignable_roles_post_embed_en_US.ftl | 6 +----- .../en_US/builtins/full_member_info_en_US.ftl | 1 + .../en_US/builtins/member_author_en_US.ftl | 1 + .../en_US/builtins/member_user_name_en_US.ftl | 1 + ...{macros_en_US.ftl => safe_macro_en_US.ftl} | 0 .../en_US/colors/abstracto_color_en_US.ftl | 5 +++++ .../en_US/colors/exception_color_en_US.ftl | 5 +++++ .../en_US/colors/success_color_en_US.ftl | 5 +++++ .../en_US/colors/warning_color_en_US.ftl | 5 +++++ .../features_response_embed_en_US.ftl | 6 +----- ...p_command_details_response_embed_en_US.ftl | 6 +----- ...lp_module_details_response_embed_en_US.ftl | 10 +++------- ...p_module_overview_response_embed_en_US.ftl | 6 +----- ...listChannelGroups_response_embed_en_US.ftl | 6 +----- .../posttarget_invalid_target_en_US.ftl | 2 +- .../posttarget_show_targets_embed_en_US.ftl | 6 +----- .../generic_command_exception_embed_en_US.ftl | 12 +++-------- .../leaderboard_post_embed_en_US.ftl | 14 ++++--------- ..._disabled_experience_roles_embed_en_US.ftl | 12 +++-------- .../commands/rank/rank_post_embed_en_US.ftl | 12 +++-------- .../en_US/command/ban/ban_log_embed_en_US.ftl | 17 ++++++---------- .../{ => banId}/banId_log_embed_en_US.ftl | 9 +++------ .../command/kick/kick_log_embed_en_US.ftl | 17 ++++++---------- .../user_notes_response_embed_en_US.ftl | 12 ++++------- .../command/mute/mute_log_embed_en_US.ftl | 20 ++++++++----------- .../command/mute/unmute_log_embed_en_US.ftl | 20 ++++++++----------- .../myWarnings_response_embed_en_US.ftl | 14 ++++--------- .../command/slowMode/slowmode_log_en_US.ftl | 1 - .../command/warn/warn_log_embed_en_US.ftl | 17 ++++++---------- .../colors/moderation_action_color_en_US.ftl | 5 +++++ .../message_deleted_embed_en_US.ftl | 12 +++-------- .../message_edited_embed_en_US.ftl | 12 +++-------- .../warnDecay/warn_decay_log_embed_en_US.ftl | 8 ++------ ...mail_thread_already_exists_embed_en_US.ftl | 12 +++-------- .../config/colors/modmail_color_en_US.ftl | 5 +++++ ...eption_cannot_message_user_embed_en_US.ftl | 6 +----- ..._to_create_mod_mail_thread_embed_en_US.ftl | 6 +----- .../modmail_exception_generic_embed_en_US.ftl | 6 +----- ...on_post_target_not_defined_embed_en_US.ftl | 6 +----- ...odmail_no_server_available_embed_en_US.ftl | 6 +----- ...dmail_notification_message_embed_en_US.ftl | 14 ++++--------- .../modmail_user_message_embed_en_US.ftl | 12 +++-------- .../modmail_close_header_embed_en_US.ftl | 6 +----- ...dmail_close_logged_message_embed_en_US.ftl | 12 +++-------- ...dmail_closing_user_message_embed_en_US.ftl | 6 +----- .../modmail_staff_message_embed_en_US.ftl | 12 +++-------- .../modmail_thread_header_embed_en_US.ftl | 14 ++++--------- .../remind/remind_reminder_embed_en_US.ftl | 12 +++-------- .../remind/remind_response_embed_en_US.ftl | 12 +++-------- .../reminders_response_embed_en_US.ftl | 14 +++++-------- .../serverinfo_response_embed_en_US.ftl | 12 ++++------- .../showAvatar_response_embed_en_US.ftl | 12 +++-------- .../starStats_response_embed_en_US.ftl | 6 +----- .../suggest/suggest_log_embed_en_US.ftl | 10 +++------- .../userInfo_response_embed_en_US.ftl | 12 +++-------- .../embed/message_embed_embed_en_US.ftl | 12 +++-------- .../starboard/starboard_post_embed_en_US.ftl | 8 ++------ ..._roles_config_embed_deleted_role_en_US.ftl | 1 + ...s_config_embed_emote_description_en_US.ftl | 2 +- ...nable_role_places_overview_place_en_US.ftl | 2 +- ...ed_user_not_found_exception_text_en_US.ftl | 2 +- ...el_does_not_exist_exception_text_en_US.ftl | 2 +- ...e_already_defined_exception_text_en_US.ftl | 2 +- ...role_place_exists_exception_text_en_US.ftl | 2 +- ...ce_post_not_found_exception_text_en_US.ftl | 2 +- ...e_role_not_usable_exception_text_en_US.ftl | 2 +- ...gnable_role_place_exception_text_en_US.ftl | 2 +- .../mute/mute_log_mute_id_footer_en_US.ftl | 2 +- ...ngs_with_decay_embed_description_en_US.ftl | 2 +- .../job/warnDecay_log_warn_entry_en_US.ftl | 2 +- .../messageDeleted_description_text_en_US.ftl | 2 +- .../messageEdited_description_text_en_US.ftl | 2 +- .../message_embed_embed_image_url_en_US.ftl | 2 +- .../modmail_no_server_available_en_US.ftl | 2 +- .../reminders/reminders_due_on_en_US.ftl | 2 +- ...rinfo_embed_features_no_features_en_US.ftl | 1 + .../suggest_link_display_value_en_US.ftl | 1 + 87 files changed, 202 insertions(+), 388 deletions(-) create mode 100644 abstracto-modules/assignable-roles/src/main/resources/en_US/config/colors/assignable_place_color_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/builtins/full_member_info_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/builtins/member_author_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl rename abstracto-modules/core/src/main/resources/en_US/builtins/{macros_en_US.ftl => safe_macro_en_US.ftl} (100%) create mode 100644 abstracto-modules/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/colors/exception_color_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/colors/success_color_en_US.ftl create mode 100644 abstracto-modules/core/src/main/resources/en_US/colors/warning_color_en_US.ftl rename abstracto-modules/moderation/src/main/resources/en_US/command/{ => banId}/banId_log_embed_en_US.ftl (75%) delete mode 100644 abstracto-modules/moderation/src/main/resources/en_US/command/slowMode/slowmode_log_en_US.ftl create mode 100644 abstracto-modules/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl create mode 100644 abstracto-modules/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl create mode 100644 translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_deleted_role_en_US.ftl create mode 100644 translations/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_embed_features_no_features_en_US.ftl diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl index 2518d422..ad7baee7 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl @@ -1,12 +1,8 @@ { - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "assignable_place_color">, "description": "<@safe_include "assignable_roles_config_embed_place_description"/> <@safe_include "assignable_roles_config_embed_role_header"/>: - <#list roles as role><#assign role=role/> + <#list roles as role><#assign role=role/><#assign rolePosition=role.position/><#assign emoteMention=role.emote.emoteRepr/><#assign roleMention><#if role.awardedRole?has_content>${role.awardedRole.asMention}<#else><#include "assignable_roles_config_embed_deleted_role"><#assign roleDescription=role.description/> <@safe_include "assignable_roles_config_embed_emote_description"/> diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl index 7b8aceb8..b3e32f6a 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl @@ -1,10 +1,6 @@ { - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "assignable_place_color">, "description": "<@safe_include "assignable_role_places_overview_description"/>: - <#list places as place>`<#assign place=place/><@safe_include "assignable_role_places_overview_place"/>`<#sep>, <#else> <@safe_include "assignable_role_places_overview_no_places"/> + <#list places as place>`<#assign place=place/><#assign placeKey=place.key/><@safe_include "assignable_role_places_overview_place"/>`<#sep>, <#else> <@safe_include "assignable_role_places_overview_no_places"/> " } \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/config/colors/assignable_place_color_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/config/colors/assignable_place_color_en_US.ftl new file mode 100644 index 00000000..aba5de55 --- /dev/null +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/config/colors/assignable_place_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 220, + "g": 20, + "b": 60 +} \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl index c9c56cbc..1d134af9 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "assignable_role_place_assigned_user_not_found_exception_text"/>" \ No newline at end of file +"description": "<#assign userId=model.aUserInAServer.userReference.id/><@safe_include "assignable_role_place_assigned_user_not_found_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl index 3177843a..e352130e 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "assignable_role_place_channel_does_not_exist_exception_text"/>" \ No newline at end of file +"description": "<#assign channelId=model.channelId/><@safe_include "assignable_role_place_channel_does_not_exist_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl index 3344824f..380177e0 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "assignable_role_place_emote_already_defined_exception_text"/>" \ No newline at end of file +"description": "<#assign emoteMention=model.emote.emoteRepr/><#assign placeName=model.placeName/><@safe_include "assignable_role_place_emote_already_defined_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl index 2ce32daf..b39986ae 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_en_US.ftl @@ -1 +1 @@ -"additionalMessage": "<@safe_include "assignable_role_place_exists_exception_text"/>" \ No newline at end of file +"additionalMessage": "<#assign roleName=model.name/><@safe_include "assignable_role_place_exists_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl index 743ab47a..41b2d52c 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "assignable_role_place_post_not_found_exception_text"/>" \ No newline at end of file +"description": "<#assign messageId=model.messageId/><@safe_include "assignable_role_place_post_not_found_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl index 67385e61..c912989e 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "assignable_role_place_role_not_usable_exception_text"/>" \ No newline at end of file +"description": "<#assign roleMention=model.role.roleRepr/><@safe_include "assignable_role_place_role_not_usable_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl index 5ed10ab7..6a20c027 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_en_US.ftl @@ -1 +1 @@ -"description": "<@safe_include "emote_not_in_assignable_role_place_exception_text"/>" \ No newline at end of file +"description": "<#assign emoteMention=model.emote.emoteRepr/><#assign placeName=model.placeName/><@safe_include "emote_not_in_assignable_role_place_exception_text"/>" \ No newline at end of file diff --git a/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl b/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl index 3453cc9b..b49fe6ef 100644 --- a/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl +++ b/abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl @@ -1,9 +1,5 @@ { - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "assignable_place_color">, "description": "${place.text?js_string}", "fields": [ <#list roles as role> diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/full_member_info_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/full_member_info_en_US.ftl new file mode 100644 index 00000000..6dcd60df --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/full_member_info_en_US.ftl @@ -0,0 +1 @@ +<#macro full_member_info member><@member_user_name member=member/> ${member.asMention?js_string} (${member.idLong?c}) \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/member_author_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/member_author_en_US.ftl new file mode 100644 index 00000000..72682fd0 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/member_author_en_US.ftl @@ -0,0 +1 @@ +<#macro member_author member> "author": { "name": "<@member_user_name member=member/>", "avatar": "${member.user.effectiveAvatarUrl}" } diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl new file mode 100644 index 00000000..514116db --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl @@ -0,0 +1 @@ +<#macro member_user_name member>${member.effectiveName?js_string}#${member.user.discriminator} diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/macros_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/safe_macro_en_US.ftl similarity index 100% rename from abstracto-modules/core/src/main/resources/en_US/builtins/macros_en_US.ftl rename to abstracto-modules/core/src/main/resources/en_US/builtins/safe_macro_en_US.ftl diff --git a/abstracto-modules/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl new file mode 100644 index 00000000..aa7d1106 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 31, + "g": 35, + "b": 122 +} \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/colors/exception_color_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/colors/exception_color_en_US.ftl new file mode 100644 index 00000000..aba5de55 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/colors/exception_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 220, + "g": 20, + "b": 60 +} \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/colors/success_color_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/colors/success_color_en_US.ftl new file mode 100644 index 00000000..9a0bdf3e --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/colors/success_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 6, + "g": 145, + "b": 34 +} \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/colors/warning_color_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/colors/warning_color_en_US.ftl new file mode 100644 index 00000000..715f84df --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/colors/warning_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 217, + "g": 143, + "b": 50 +} \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl index b36da2c3..28e5c975 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl @@ -2,11 +2,7 @@ "title": { "title": "<@safe_include "features_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "abstracto_color">, "description": " <#list features as feature> ${feature.featureFlag.enabled?string('āœ…', 'āŒ')} **<@safe_include "${feature.featureConfig.feature.key}_feature"/>** <@safe_include "feature_embed_key"/>: `${feature.featureConfig.feature.key}` diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl index d8656c8c..61a7c2d2 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl @@ -2,11 +2,7 @@ "title": { "title": "<@safe_include "help_command_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "abstracto_color">, "description": "<@safe_include "help_command_embed_command_name"/>: **${command.name?js_string}** <@safe_include "help_command_embed_command_description"/>: <#if command.templated> <@safe_include "${command.name}_description"/> <#else> ${command.description?js_string} diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl index b5e407d0..589077f0 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl @@ -1,15 +1,11 @@ { -<#assign name>${module.moduleInterface.info.name} "title": { + <#assign name=module.moduleInterface.info.name/> "title": "<@safe_include "help_module_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "abstracto_color">, "description": " - <@safe_include "help_module_embed_module_name"/>: **${module.moduleInterface.info.name?js_string}** + <@safe_include "help_module_embed_module_name"/>: **${name?js_string}** <@safe_include "help_module_embed_module_description"/>: ${module.moduleInterface.info.description?js_string} <@safe_include "help_module_embed_commands"/>: <#list module.commands as command>`${command.configuration.name?js_string}`<#sep>, diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl index 6bfa1273..e0cc86fc 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl @@ -2,11 +2,7 @@ "title": { "title": "<@safe_include "help_modules_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "abstracto_color">, "description": " <#list modules as module><#assign module=module/> <@safe_include "help_module_embed_module_name"/>: **${module.info.name?js_string}** diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl index 95b8792a..45f2c69d 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl @@ -2,11 +2,7 @@ "title": { "title": "<@safe_include "listChannelGroups_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "success_color">, <#if groups?size = 0> "description": "<@safe_include "listChannelGroups_no_channel_group"/>", diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_invalid_target_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_invalid_target_en_US.ftl index 91a406b1..61c6fbe7 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_invalid_target_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_invalid_target_en_US.ftl @@ -1 +1 @@ -<#include "posttarget_invalid_post_target_response"> <#include "posttarget_no_target"> \ No newline at end of file +<#include "posttarget_invalid_post_target_response"> <#include "posttarget_invalid_target"> \ No newline at end of file diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl index 1a4bc7cf..89f8e38e 100644 --- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl @@ -2,11 +2,7 @@ "title": { "title": "<@safe_include "posttarget_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "success_color">, "description": " <#list postTargets as postTarget><#assign postTarget=postTarget/> <#assign postTargetName>${postTarget.postTarget.name?js_string} diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl index a2b970ed..3f293527 100644 --- a/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl @@ -1,13 +1,7 @@ { - "author": { - "name": "${user.member.effectiveName?js_string}", - "avatar": "${user.member.user.effectiveAvatarUrl?js_string}" - }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "member_author"> + <@member_author member=user.member/>, + <#include "exception_color">, "preventEmptyEmbed": "true", <#if template?has_content> <#if template.templateModel?has_content> diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl index 26547627..a03dc4f6 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl @@ -1,16 +1,10 @@ { <#macro userDisplay user> - ${user.rank} ${user.member.effectiveName?js_string} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount} + ${user.rank} <@member_user_name member=user.member/> ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount} - "author": { - "name": "${member.effectiveName?js_string}", - "avatar": "${member.user.effectiveAvatarUrl?js_string}" - }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "member_author"> + <@member_author member=member/>, + <#include "success_color">, "description": " <@safe_include "leaderboard_rank_column"/> | <@safe_include "leaderboard_name_column"/> | <@safe_include "leaderboard_experience_column"/> | <@safe_include "leaderboard_level_column"/> | <@safe_include "leaderboard_messages_column"/> <#list userExperiences as user> diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl index 937e9126..4b30deb8 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl @@ -1,16 +1,10 @@ { - "author": { - "name": "${member.effectiveName?js_string}", - "avatar": "${member.user.effectiveAvatarUrl}" - }, + <#include "member_author"> + <@member_author member=member/>, "title": { "title": "<@safe_include "list_disabled_experience_roles_embed_title"/>" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "success_color">, "description": " <#list roles as role> ${role.role.asMention?js_string} diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl index e81fb664..9793a026 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl @@ -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 "success_color">, "fields": [ { "name": "<@safe_include "rank_xp_field_title"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl index bcd47ab4..52936e72 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl @@ -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"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/banId/banId_log_embed_en_US.ftl similarity index 75% rename from abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl rename to abstracto-modules/moderation/src/main/resources/en_US/command/banId/banId_log_embed_en_US.ftl index f48c568e..7e14fe42 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/banId_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/banId/banId_log_embed_en_US.ftl @@ -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"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl index ea88ddff..06a12655 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl @@ -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"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl index 6000029e..bc7b11ec 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl @@ -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}" }, "title": { <#if specifiedUser??> - <#assign user>${specifiedUser.member.effectiveName?js_string} + <#assign user><@member_user_name member=specifiedUser/> "title": "<@safe_include "user_notes_embed_user_title"/>" <#else> "title": "<@safe_include "user_notes_embed_title"/>" }, - "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 noteText>${note.note.note?js_string} diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl index 79c9a808..03b8e886 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl @@ -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}" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl index 0cee054e..50b5b835 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl @@ -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/>, "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})" @@ -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})" @@ -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}" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl index 03fcb7ed..9e6669cb 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl @@ -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} + <#include "member_author"> + <@member_author member=member/>, + <#include "success_color">, + <#assign userMention><@member_user_name member=member/> ,"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>" } \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/slowMode/slowmode_log_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/slowMode/slowmode_log_en_US.ftl deleted file mode 100644 index b0bb4e57..00000000 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/slowMode/slowmode_log_en_US.ftl +++ /dev/null @@ -1 +0,0 @@ -The slowmode in channel ${channel.name} has been set to ${channel.slowMode} seconds. \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl index a523f7d0..feb76cb9 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl @@ -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 warning?has_content> diff --git a/abstracto-modules/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl new file mode 100644 index 00000000..117deab4 --- /dev/null +++ b/abstracto-modules/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 201, + "g": 126, + "b": 26 +} \ No newline at end of file diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl index b269bbef..0e346e89 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl @@ -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"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl index b5a30656..5ede2d9f 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl @@ -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"/>", diff --git a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl index 59b83634..1c178c7b 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl @@ -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})<#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c} <@safe_include "warnDecay_log_warn_entry"/> + <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id})<#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}<#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/> <#else> <@safe_include "warnDecay_log_no_warnings"/> " diff --git a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl index 5f26dd53..bcbba7ad 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_already_exists_embed_en_US.ftl @@ -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": [ { diff --git a/abstracto-modules/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl new file mode 100644 index 00000000..a9782ada --- /dev/null +++ b/abstracto-modules/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl @@ -0,0 +1,5 @@ +"color" : { + "r": 26, + "g": 201, + "b": 61 +} \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl index a3ca5294..659c8fe0 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_cannot_message_user_embed_en_US.ftl @@ -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"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl index 2bd5b58c..33d2857b 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_failed_to_create_mod_mail_thread_embed_en_US.ftl @@ -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"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl index a121da4f..f50015be 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_generic_embed_en_US.ftl @@ -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"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl index 3caa996d..287cce89 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_exception_post_target_not_defined_embed_en_US.ftl @@ -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"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl index 6c501889..561fc041 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl @@ -1,8 +1,4 @@ { - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "warning_color">, "description": "<@safe_include "modmail_no_server_available"/>" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl index 28659079..7c198c4a 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl @@ -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}) + <#include "modmail_color">, + <#assign user><@member_user_name member=threadUser.member/>(${threadUser.member.user.id}) "description": "<@safe_include "modmail_notification_message_description"/>" <#if roles?size gt 0> ,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>," diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl index 5c464e3a..af5c32ad 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl @@ -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}" diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl index ce1b6acb..59dd630b 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl @@ -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 user>user <#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss")} diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl index 7f1495a3..af6ef8e3 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl @@ -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}" diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl index 1e96be91..1e033f13 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl @@ -1,8 +1,4 @@ { - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, + <#include "modmail_color">, "description": "${closingMessage?js_string}" } \ No newline at end of file diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl index 54454835..99251167 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl @@ -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}" diff --git a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl index d2632575..9b196665 100644 --- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl +++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl @@ -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}) + <#include "member_author"> + <@member_author member=threadUser.member/>, + <#include "modmail_color">, + <#assign user><@member_user_name member=threadUser.member/> (${threadUser.member.user.id}) <#assign joinDate>${threadUser.member.timeJoined} <#assign roles><#list threadUser.member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/> "description": "<@safe_include "modmail_thread_header_embed_description"/>" diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl index 2e5c20a9..2d4ee342 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl @@ -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": [ { diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl index 7c7551ce..19c182e3 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl @@ -1,15 +1,9 @@ { <#assign id>${reminder.id} <#assign messageUrl>${message.jumpUrl} - "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}" } \ No newline at end of file diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl index 8c9480c1..1783db90 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl @@ -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 reminderTargetDate>${formatDate(reminder.targetDate,"yyyy-MM-dd HH:mm:ss")} + <#assign reminderText=reminder.text/> "name": "<@safe_include "reminders_reminder_field_title"/>", "value": "<@safe_include "reminders_due_on"/>" } diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl index d961f37f..09fb333d 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl @@ -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", + "value": "<#list guild.features as feature>${feature}<#else><@safe_include "serverinfo_embed_features_no_features"/>", "inline": "true" } ] diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl index 1bb070d2..82c35c27 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl @@ -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": [ { diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl index b3f11ef2..9454b7f2 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl @@ -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": [ { diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl index 5594740c..9c14a37a 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl @@ -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}" }, - "color" : { - "r": 200, - "g": 0, - "b": 255 - }, - <#assign user>${member.effectiveName?js_string} + <#include "abstracto_color">, + <#assign user><@member_user_name member=member/> <#assign id>${suggestion.id} <#if suggestion.state = "ACCEPTED"> "description": "~~${text?js_string}~~ \nāœ… ${reason} - <@safe_include "suggest_accepted_by"/>", diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl index 98499ccd..69285161 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl @@ -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": [ { diff --git a/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl index 8a04bbcc..2e1baefb 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl @@ -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> diff --git a/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl index 92ac5867..3e488e2c 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl @@ -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"/>)" }, - "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> diff --git a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_deleted_role_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_deleted_role_en_US.ftl new file mode 100644 index 00000000..d0872e01 --- /dev/null +++ b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_deleted_role_en_US.ftl @@ -0,0 +1 @@ +Deleted role \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_emote_description_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_emote_description_en_US.ftl index 6ab2a630..f0b193f0 100644 --- a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_emote_description_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignablePlaceConfig/assignable_roles_config_embed_emote_description_en_US.ftl @@ -1 +1 @@ -#${role.position}: ${role.emote.asMention} with <#if role.awardedRole?has_content>${role.awardedRole.asMention}<#else>Deleted role: `${role.description}`. \ No newline at end of file +#${rolePosition}: ${emoteMention} with ${roleMention}: `${roleDescription}`. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl index b987e7bc..83aa6cce 100644 --- a/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/commands/showAssignableRolePlaces/assignable_role_places_overview_place_en_US.ftl @@ -1 +1 @@ -${place.key}${place?size} \ No newline at end of file +${placeKey} \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_text_en_US.ftl index 0804136c..2937f94d 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_assigned_user_not_found_exception_text_en_US.ftl @@ -1 +1 @@ -User ${model.aUserInAServer.userReference.id} was not found in the assigned users. \ No newline at end of file +User ${userId} was not found in the assigned users. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_text_en_US.ftl index 21824ee0..e257938a 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_channel_does_not_exist_exception_text_en_US.ftl @@ -1 +1 @@ -Unable to create assignable place, channel ${model.channelId?c} does not exist. \ No newline at end of file +Unable to create assignable place, channel ${channelId?c} does not exist. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_text_en_US.ftl index 3a65967f..15d0d09f 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_emote_already_defined_exception_text_en_US.ftl @@ -1 +1 @@ -Emote ${model.emote.emoteRepr} is already defined for place ${model.placeName}. \ No newline at end of file +Emote ${emoteMention} is already defined for place ${placeName}. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_text_en_US.ftl index c1157b08..60ecd706 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_exists_exception_text_en_US.ftl @@ -1 +1 @@ -Assignable roles place ${model.name} already exists. \ No newline at end of file +Assignable roles place ${roleName} already exists. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_text_en_US.ftl index 9d715363..0319f2c4 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_post_not_found_exception_text_en_US.ftl @@ -1 +1 @@ -Assignable role place post with id ${model.messageId} could not be found. \ No newline at end of file +Assignable role place post with id ${messageId} could not be found. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_text_en_US.ftl index b18e8a56..d574a49f 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/assignable_role_place_role_not_usable_exception_text_en_US.ftl @@ -1 +1 @@ -Role ${model.role.roleRepr} is not usable to be used in the assignable role place. It may be higher in the role hierarchy than the bot. \ No newline at end of file +Role ${roleMention} is not usable to be used in the assignable role place. It may be higher in the role hierarchy than the bot. \ No newline at end of file diff --git a/translations/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_text_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_text_en_US.ftl index 57e8da4e..0c7024ac 100644 --- a/translations/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_text_en_US.ftl +++ b/translations/assignable-roles/src/main/resources/en_US/exception/emote_not_in_assignable_role_place_exception_text_en_US.ftl @@ -1 +1 @@ -Emote ${model.emote.emoteRepr} was not found in the assignable place ${model.placeName}. \ No newline at end of file +Emote ${emoteMention} was not found in the assignable place ${placeName}. \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_mute_id_footer_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_mute_id_footer_en_US.ftl index 2e89f5c1..a38d2d48 100644 --- a/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_mute_id_footer_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_mute_id_footer_en_US.ftl @@ -1 +1 @@ -Mute \ No newline at end of file +Mute #{muteId} \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/myWarnings/myWarnings_with_decay_embed_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/myWarnings/myWarnings_with_decay_embed_description_en_US.ftl index 2ac1f01f..ddfe0e0f 100644 --- a/translations/moderation/src/main/resources/en_US/commands/myWarnings/myWarnings_with_decay_embed_description_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/commands/myWarnings/myWarnings_with_decay_embed_description_en_US.ftl @@ -1 +1 @@ -${userMention} has current ${currentWarnCount} Warnings and ${totalWarnCount} warnings in total. \ No newline at end of file +${userMention} has currently ${currentWarnCount} warnings and ${totalWarnCount} warnings in total. \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/job/warnDecay_log_warn_entry_en_US.ftl b/translations/moderation/src/main/resources/en_US/job/warnDecay_log_warn_entry_en_US.ftl index 78bcafeb..a6a9ba3a 100644 --- a/translations/moderation/src/main/resources/en_US/job/warnDecay_log_warn_entry_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/job/warnDecay_log_warn_entry_en_US.ftl @@ -1 +1 @@ -${warnedUser} was warned on ${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")} with reason `${warning.warning.reason}` by ${warningUser} \ No newline at end of file +${warnedUser} was warned on ${warnDate} with reason `${warnReason}` by ${warningUser} \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl index 533ae868..aadb73ed 100644 --- a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl @@ -1 +1 @@ -Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) removed in ${messageChannel.asMention} \ No newline at end of file +Message from <@member_user_name member=member/> (${member.idLong?c}) removed in ${messageChannel.asMention} \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl index 21813643..4d7134dc 100644 --- a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl @@ -1 +1 @@ -Message from ${member.effectiveName}#${member.user.discriminator} (${member.idLong?c}) edited in ${messageChannel.asMention} \ No newline at end of file +Message from <@member_user_name member=member/> (${member.idLong?c}) edited in ${messageChannel.asMention} \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/listener/message_embed/message_embed_embed_image_url_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/message_embed/message_embed_embed_image_url_en_US.ftl index 22deafc4..2b7a8e09 100644 --- a/translations/moderation/src/main/resources/en_US/listener/message_embed/message_embed_embed_image_url_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/listener/message_embed/message_embed_embed_image_url_en_US.ftl @@ -1 +1 @@ -ImageURL \ No newline at end of file +Image URL \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/exception/modmail_no_server_available_en_US.ftl b/translations/modmail/src/main/resources/en_US/exception/modmail_no_server_available_en_US.ftl index 3e7ce99a..93965bb5 100644 --- a/translations/modmail/src/main/resources/en_US/exception/modmail_no_server_available_en_US.ftl +++ b/translations/modmail/src/main/resources/en_US/exception/modmail_no_server_available_en_US.ftl @@ -1 +1 @@ -No server for mod mail available. \ No newline at end of file +No server for modmail available. \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl index e849edfe..8f0e0d98 100644 --- a/translations/utility/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl +++ b/translations/utility/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl @@ -1 +1 @@ -Due on ${reminder.targetDate} with text ${reminder.text} \ No newline at end of file +Due on ${reminderTargetDate} with text ${reminderText} \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_embed_features_no_features_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_embed_features_no_features_en_US.ftl new file mode 100644 index 00000000..45d0c918 --- /dev/null +++ b/translations/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_embed_features_no_features_en_US.ftl @@ -0,0 +1 @@ +No features \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/suggest/suggest_link_display_value_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/suggest/suggest_link_display_value_en_US.ftl index e69de29b..341c2ffd 100644 --- a/translations/utility/src/main/resources/en_US/commands/suggest/suggest_link_display_value_en_US.ftl +++ b/translations/utility/src/main/resources/en_US/commands/suggest/suggest_link_display_value_en_US.ftl @@ -0,0 +1 @@ +Jump \ No newline at end of file