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 index 72682fd0..809ac636 100644 --- 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 @@ -1 +1,2 @@ <#macro member_author member> "author": { "name": "<@member_user_name member=member/>", "avatar": "${member.user.effectiveAvatarUrl}" } +<#macro member_display_author member> "author": { "name": "<@member_display_user_name member=member/>", "avatar": "<@member_display_avatar member=member/>" } diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/member_avatar_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/member_avatar_en_US.ftl new file mode 100644 index 00000000..eaaba396 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/member_avatar_en_US.ftl @@ -0,0 +1 @@ +<#macro member_display_avatar member><#if member.memberAvatarUrl?has_content>${member.memberAvatarUrl?json_string}<#else>${member.userAvatarUrl?json_string} 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 index 6f0c6fac..71f8605f 100644 --- 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 @@ -1 +1,2 @@ <#macro member_user_name member>${member.effectiveName?json_string}#${member.user.discriminator} +<#macro member_display_user_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}#${member.discriminator} 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 cf69a621..26e51e04 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 @@ -3,25 +3,26 @@ "embeds": [ { <#include "member_author"> - <@member_author member=memberInfo/>, + <#include "member_avatar"> + <@member_display_author member=memberDisplay/>, <#include "abstracto_color">, - "thumbnail": "${memberInfo.user.effectiveAvatarUrl}", + "thumbnail": "<@member_display_avatar member=memberDisplay/>", "fields": [ { "name": "<@safe_include "userInfo_response_embed_id_field_title"/>", - "value": "${memberInfo.user.id}", + "value": "${id?c}", "inline": "true" }, - <#if memberInfo.nickname?has_content> + <#if memberDisplay.nickname?has_content> { "name": "<@safe_include "userInfo_response_embed_nickname_field_title"/>", - "value": "${memberInfo.nickname?json_string}", + "value": "${memberDisplay.nickname?json_string}", "inline": "true" }, { "name": "<@safe_include "userInfo_response_embed_status_field_title"/>", - "value": "${memberInfo.onlineStatus.key}", + "value": "${onlineStatus?json_string}", "inline": "true" }, { @@ -34,11 +35,27 @@ "value": "<@format_instant_date_time instant=creationDate/>", "inline": "true" } - <#if memberInfo.activities?size gt 0> + <#if roles?size gt 0> + , + { + "name": "<@safe_include "userInfo_response_embed_roles_field_title"/>", + "value": "<#list roles as role>${role.roleMention?json_string}<#sep>, ", + "inline": "true" + } + + <#if activities?size gt 0> , { "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>", - "value": "<#list memberInfo.activities as activity>${activity.type?json_string}<#sep>, ", + "value": "<#list activities as activity>${activity?json_string}<#sep>, ", + "inline": "true" + } + + <#if customStatus?has_content || customEmoji?has_content> + , + { + "name": "<@safe_include "userInfo_response_embed_custom_status_field_title"/>", + "value": "<#if customEmoji?has_content>${customEmoji?json_string} <#if customStatus?has_content>${customStatus?json_string}", "inline": "true" } diff --git a/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_custom_status_field_title_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_custom_status_field_title_en_US.ftl new file mode 100644 index 00000000..1109a63b --- /dev/null +++ b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_custom_status_field_title_en_US.ftl @@ -0,0 +1 @@ +Custom status \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_roles_field_title_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_roles_field_title_en_US.ftl new file mode 100644 index 00000000..dc3e924d --- /dev/null +++ b/translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_roles_field_title_en_US.ftl @@ -0,0 +1 @@ +Roles \ No newline at end of file