diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/user_author_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/user_author_en_US.ftl index 9da4bb6e..b11c40cc 100644 --- a/abstracto-modules/core/src/main/resources/en_US/builtins/user_author_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/user_author_en_US.ftl @@ -1 +1,2 @@ <#macro user_author user> "author": { "name": <#include "user_user_name"> "<@user_user_name user=user/>", "avatar": "${user.effectiveAvatarUrl}" } +<#macro user_detail_author user> "author": { "name": <#include "user_user_name"> "<@user_user_name user=userDisplay/>"<#if user.avatarUrl?has_content>, "avatar": "${user.avatarUrl}"} diff --git a/abstracto-modules/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_embed_en_US.ftl new file mode 100644 index 00000000..9a1684bb --- /dev/null +++ b/abstracto-modules/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_embed_en_US.ftl @@ -0,0 +1,6 @@ +{ + "additionalMessage": "<@safe_include "denyModmailAppeal_response_text"/>", + "messageConfig": { + "ephemeral": true + } +} \ 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 99256ac3..2a4f3d36 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,13 +1,12 @@ +<#include "user_detail"> { "embeds": [ { - <#include "member_author"> - <@member_author member=member/>, "title": { "title": "<@safe_include "modmail_notification_message_title"/>" }, <#include "modmail_color">, - <#assign user><@member_user_name member=member/>(${member.user.id}) + <#assign user><@user_detail user=userDisplay/> "description": "<@safe_include "modmail_notification_message_description"/>" <#if channel?has_content>, "fields": [ 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 4133dfe1..3650b657 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,8 +1,8 @@ { "embeds": [ { - <#include "member_author"> - <@member_author member=member/>, + <#include "user_author"> + <@user_detail_author user=userDisplay/>, "title": { "title": "<@safe_include "modmail_thread_user_message_title"/>" }, 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 ea820d36..e2abf01a 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,13 +1,10 @@ <#include "format_instant"> +<#include "user_detail"> { "embeds": [ { - <#include "member_author"> - <@member_author member=member/>, <#include "modmail_color">, - <#assign user><@member_user_name member=member/> (${member.user.id}) - <#assign joinDate><@format_instant_date_time instant=memberJoinDate/> - <#assign roles><#list member.roles as role>${role.asMention?json_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/> + <#assign user><@user_detail user=userDisplay/> (${userDisplay.id?c}) "description": "<@safe_include "modmail_thread_header_embed_description"/>" } ] diff --git a/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_text_en_US.ftl b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_text_en_US.ftl new file mode 100644 index 00000000..e57eee55 --- /dev/null +++ b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_text_en_US.ftl @@ -0,0 +1 @@ +User has been banned from the appeal server. \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_description_en_US.ftl b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_description_en_US.ftl new file mode 100644 index 00000000..fa0c73d2 --- /dev/null +++ b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_description_en_US.ftl @@ -0,0 +1 @@ +Reject an modmail appeal \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_long_help_en_US.ftl b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_long_help_en_US.ftl new file mode 100644 index 00000000..4eaf342c --- /dev/null +++ b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_long_help_en_US.ftl @@ -0,0 +1 @@ +Rejects the appeal, closes the modmail thread and bans the user from the appeal server. \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_parameter_reason_en_US.ftl b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_parameter_reason_en_US.ftl new file mode 100644 index 00000000..ea36a272 --- /dev/null +++ b/translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_parameter_reason_en_US.ftl @@ -0,0 +1 @@ +The reason to reject this appeal. Will not be forwarded to the user. \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/config/feature_setup_config_modMailAppealServer_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/feature_setup_config_modMailAppealServer_en_US.ftl new file mode 100644 index 00000000..52c39223 --- /dev/null +++ b/translations/modmail/src/main/resources/en_US/config/feature_setup_config_modMailAppealServer_en_US.ftl @@ -0,0 +1 @@ +The server to use as an appeal server. Default: ${defaultValue} \ No newline at end of file diff --git a/translations/modmail/src/main/resources/en_US/notification/modmail_thread_header_embed_description_en_US.ftl b/translations/modmail/src/main/resources/en_US/notification/modmail_thread_header_embed_description_en_US.ftl index 268a57e8..7817c9cf 100644 --- a/translations/modmail/src/main/resources/en_US/notification/modmail_thread_header_embed_description_en_US.ftl +++ b/translations/modmail/src/main/resources/en_US/notification/modmail_thread_header_embed_description_en_US.ftl @@ -1,3 +1,2 @@ This is a modmail thread concerning ${user}. -The user has the roles ${roles} and joined on ${joinDate} There were ${pastModMailThreadCount} threads in the past. \ No newline at end of file