diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/member_detail_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/member_detail_en_US.ftl new file mode 100644 index 00000000..b2b98a19 --- /dev/null +++ b/abstracto-modules/core/src/main/resources/en_US/builtins/member_detail_en_US.ftl @@ -0,0 +1 @@ +<#macro member_detail member><#if member.name?has_content>${member.name?json_string}<#if member.discriminator?has_content && member.discriminator != '0000'>#${member.discriminator}<#else>${member.memberMention} (${member.userId?c}) 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 0e299903..73fdd3e5 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,6 +1,7 @@ { "embeds": [ { + <#include "user_detail"> "title": { "title": "<@safe_include "kick_log_title"/>" }, @@ -8,16 +9,19 @@ "fields": [ { "name": "<@safe_include "kick_log_kicked_user_field_title"/>", - "value": "${kickedMember.memberMention}" + "value": "<@user_detail user=kickedUser/>" }, { "name": "<@safe_include "kick_log_kicking_user_field_title"/>", - "value": "${kickingMember.memberMention}" - }, + "value": "<@user_detail user=kickingUser/>" + } + <#if reason?has_content> + , { "name": "<@safe_include "kick_log_reason_field_title"/>", "value": "${reason?json_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 9e81c1f6..645d078e 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,4 +1,5 @@ <#include "format_instant"> +<#include "member_detail"> { "embeds": [ { @@ -15,16 +16,16 @@ "fields": [ { "name": "<@safe_include "mute_log_muted_user_field_title"/>", - "value": "${mutedUser.memberMention}" + "value": "<@member_detail member=mutedMember/>" }, - <#if mutingUser?has_content> + <#if mutingMember?has_content> { <#if muted || durationChanged> "name": "<@safe_include "mute_log_muting_user_field_title"/>", <#elseif muteEnded> "name": "<@safe_include "mute_log_unmuting_user_field_title"/>", - "value": "${mutingUser.memberMention}" + "value": "<@member_detail member=mutingMember/>" } <#if reason?has_content>, diff --git a/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_unmuting_user_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_unmuting_user_field_title_en_US.ftl index 3877b252..1f3b9d41 100644 --- a/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_unmuting_user_field_title_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/commands/mute/mute_log_unmuting_user_field_title_en_US.ftl @@ -1 +1 @@ -Unmuted by \ No newline at end of file +Muted by \ No newline at end of file