From 1b8717a5aa15cac6d031417e910e5560c58b7327 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 5 Mar 2023 13:49:46 +0100
Subject: [PATCH] [AB-xxx] changing logic for author names and avatars to be
 more considerate between user and member avatar limiting roles for userinfo
 and features for server info to lower values

---
 .../resources/en_US/builtins/member_author_en_US.ftl     | 4 +++-
 .../resources/en_US/builtins/member_avatar_en_US.ftl     | 1 +
 .../resources/en_US/builtins/member_user_name_en_US.ftl  | 3 ++-
 .../serverInfo/serverinfo_response_embed_en_US.ftl       | 5 +++--
 .../commands/userInfo/userInfo_response_embed_en_US.ftl  | 9 +++++----
 5 files changed, 14 insertions(+), 8 deletions(-)

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 809ac636..ac1ce17c 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,2 +1,4 @@
+<#include "member_avatar">
 <#macro member_author member> "author": { "name": "<@member_user_name member=member/>", "avatar":  "${member.user.effectiveAvatarUrl}" }</#macro>
-<#macro member_display_author member> "author": { "name": "<@member_display_user_name member=member/>", "avatar":  "<@member_display_avatar member=member/>" }</#macro>
+<#macro member_display_author member> "author": { "name": "<@member_display_member_name member=member/>", "avatar":  "<@member_display_avatar member=member/>" }</#macro>
+<#macro member_display_user_author member> "author": { "name": "<@member_display_user_name member=member/>", "avatar":  "<@member_display_user_avatar member=member/>" }</#macro>
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
index eaaba396..756e19c5 100644
--- 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
@@ -1 +1,2 @@
 <#macro member_display_avatar member><#if member.memberAvatarUrl?has_content>${member.memberAvatarUrl?json_string}<#else>${member.userAvatarUrl?json_string}</#if></#macro>
+<#macro member_display_user_avatar member>${member.userAvatarUrl?json_string}</#macro>
\ No newline at end of file
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 71f8605f..9dfdc03d 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,2 +1,3 @@
 <#macro member_user_name member>${member.effectiveName?json_string}#${member.user.discriminator}</#macro>
-<#macro member_display_user_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if>#${member.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>
diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl
index cafcd18f..b70c061a 100644
--- a/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl
+++ b/abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl
@@ -59,8 +59,9 @@
                 },
                 {
                     "name": "<@safe_include "serverinfo_embed_features_field_title"/>",
-                    "value": "<#list guild.features as feature>${feature}<#sep>, <#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
-                    "inline": "true"
+                    "value": "<#list guild.features as feature>${feature}<#sep> <#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
+                    "inline": "true",
+                    "valueSplitLength": 250
                 }
             ]
         }
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 26e51e04..2227a6a5 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,9 +3,9 @@
     "embeds": [
         {
             <#include "member_author">
-            <#include "member_avatar">
-            <@member_display_author member=memberDisplay/>,
+            <@member_display_user_author member=memberDisplay/>,
             <#include "abstracto_color">,
+            <#include "member_avatar">
             "thumbnail":  "<@member_display_avatar member=memberDisplay/>",
             "fields": [
                 {
@@ -39,8 +39,9 @@
                 ,
                 {
                     "name": "<@safe_include "userInfo_response_embed_roles_field_title"/>",
-                    "value": "<#list roles as role>${role.roleMention?json_string}<#sep>, </#list>",
-                    "inline": "true"
+                    "value": "<#list roles as role>${role.roleMention?json_string}<#sep> </#list>",
+                    "inline": "true",
+                    "valueSplitLength": 250
                 }
                 </#if>
                 <#if activities?size gt 0>