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 022738fc..cd12c3b1 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,20 +1,12 @@ { "embeds": [ { - <#include "member_author"> - <@member_author member=memberInfo/>, <#include "abstracto_color">, - "imageUrl": "${memberInfo.user.effectiveAvatarUrl}", + "imageUrl": "${avatarUrl}", "fields": [ - { - <#include "member_user_name"> - "name": "<@safe_include "showAvatar_response_embed_user_field_title"/>", - "value": "<@member_member_name member=memberInfo/>", - "inline": "true" - }, { "name": "<@safe_include "showAvatar_response_embed_image_field_title"/>", - "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${memberInfo.user.effectiveAvatarUrl})", + "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${avatarUrl})", "inline": "true" } ] 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 21666892..fe57b132 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 @@ -8,6 +8,18 @@ <#include "member_avatar"> "thumbnail": "<@member_display_avatar member=memberDisplay/>", "fields": [ + { + "name": "<@safe_include "userInfo_response_embed_user_name_field_title"/>", + "value": "${memberDisplay.userName}", + "inline": "true" + }, + <#if memberDisplay.displayName?has_content> + { + "name": "<@safe_include "userInfo_response_embed_global_name_field_title"/>", + "value": "${memberDisplay.displayName}", + "inline": "true" + }, + { "name": "<@safe_include "userInfo_response_embed_id_field_title"/>", "value": "${id?c}", @@ -27,11 +39,13 @@ "inline": "true" }, + <#if joinDate?has_content> { "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>", "value": "<@format_instant_date_time instant=joinDate/>", "inline": "true" }, + { "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>", "value": "<@format_instant_date_time instant=creationDate/>", diff --git a/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_global_name_field_title_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_global_name_field_title_en_US.ftl new file mode 100644 index 00000000..b93d8902 --- /dev/null +++ b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_global_name_field_title_en_US.ftl @@ -0,0 +1 @@ +Display name \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_user_name_field_title_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_user_name_field_title_en_US.ftl new file mode 100644 index 00000000..c36eee99 --- /dev/null +++ b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_user_name_field_title_en_US.ftl @@ -0,0 +1 @@ +User name \ No newline at end of file