Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-01-02 23:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-105] migrating to discord usernames

Browse Source
This commit is contained in:
Sheldan
2023-09-19 23:45:00 +02:00
parent c230455678
commit 2d92a15bf0
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#macro member_user_name member>${member.effectiveName?json_string}#${member.user.discriminator}</#macro>
<#macro member_display_member_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if>#${member.discriminator}</#macro>
<#macro member_display_user_name member>${member.userName?json_string}#${member.discriminator}</#macro>
<#macro member_user_name member>${member.effectiveName?json_string}<#if member.user.discriminator?number gt 0>#${member.user.discriminator}</#if></#macro>
<#macro member_member_name member><#if member.effectiveName?has_content>${member.effectiveName?json_string}<#else>${member.user.name?json_string}</#if><#if member.user.discriminator?number gt 0>#${member.user.discriminator}</#if></#macro>
<#macro member_display_member_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if></#macro>
<#macro member_display_user_name member>${member.userName?json_string}<#if member.discriminator?number gt 0>#${member.discriminator}</#if></#macro>

2
abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl
View File

@@ -1 +1 @@
<#macro user_detail user>${user.name?json_string}#${user.discriminator} (${user.idLong?c})</#macro>
<#macro user_detail user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if> (${user.idLong?c})</#macro>

2
abstracto-modules/core/src/main/resources/en_US/builtins/user_user_name_en_US.ftl
View File

@@ -1 +1 @@
<#macro user_user_name user>${user.name?json_string}#${user.discriminator}</#macro>
<#macro user_user_name user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if></#macro>

3
abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl
View File

@@ -1,3 +1,4 @@
<#include "user_user_name">
{
"embeds": [
{
@@ -7,7 +8,7 @@
<#else>
"author":
{
"name": "${fullUser.user.name?json_string}#${fullUser.user.discriminator}",
"name": "<@user_user_name user=fullUser.user/>",
"avatar": "${fullUser.user.effectiveAvatarUrl}"
},
</#if>

2
abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
View File

@@ -1,7 +1,7 @@
{
"embeds": [
{
<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})</#assign>
<#assign user>${member.user.name} (${member.asMention}: ${member.id})</#assign>
"description": "<@safe_include "user_joined_text"/>",
<#include "abstracto_color"/>
}

3
abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
View File

@@ -1,7 +1,8 @@
{
"embeds": [
{
<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
<#include "user_detail">
<#assign user><@user_detail user=user/></#assign>
"description": "<@safe_include "user_left_text"/>",
<#include "abstracto_color"/>
}

3
abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl
View File

@@ -7,8 +7,9 @@
"imageUrl": "${memberInfo.user.effectiveAvatarUrl}",
"fields": [
{
<#include "member_user_name">
"name": "<@safe_include "showAvatar_response_embed_user_field_title"/>",
"value": "${memberInfo.user.name?json_string}#${memberInfo.user.discriminator}",
"value": "<@member_member_name member=memberInfo/>",
"inline": "true"
},
{