[AB-xxx] updating remind templates for user installable support

adding more info and reducing some information from userInfo command

abstracto-modules/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/core/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <build>
         <plugins>

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}</#if><#else>${member.memberMention}</#if> (${member.userId?c})</#macro>

abstracto-modules/core/src/main/resources/en_US/builtins/user_author_en_US.ftl

@@ -1 +1,2 @@
 <#macro user_author user> "author": { "name": <#include "user_user_name"> "<@user_user_name user=user/>", "avatar":  "${user.effectiveAvatarUrl}" }</#macro>
+<#macro user_detail_author user> "author": { "name": <#include "user_user_name"> "<@user_user_name user=userDisplay/>"<#if user.avatarUrl?has_content>, "avatar":  "${user.avatarUrl}"</#if>}</#macro>

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

@@ -1 +1 @@
-<#macro user_detail user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if> (${user.idLong?c})</#macro>
+<#macro user_detail user><#if user.name?has_content>${user.name?json_string}<#if user.discriminator?has_content && user.discriminator != '0000'>#${user.discriminator}</#if><#else>${user.userMention}</#if> (${user.id?c})</#macro>

abstracto-modules/core/src/main/resources/en_US/exceptions/generic_interaction_exception_embed_en_US.ftl

@@ -1,8 +1,6 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
             <#include "exception_color">,
             "metaConfig" : {
                 "preventEmptyEmbed": "true"

abstracto-modules/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/experience-tracking/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl

@@ -21,4 +21,14 @@
             }
         }
     ]
+    <#if leaderboardUrl?has_content>
+    ,"buttons": [
+        {
+            "label": "<@safe_include "leaderboard_leaderboard_button_label"/>",
+            <#assign leaderboardUrl=leaderboardUrl>
+            "url": "${leaderboardUrl}",
+            "buttonStyle": "link"
+        }
+    ]
+    </#if>
 }

abstracto-modules/experience-tracking/src/main/resources/en_US/exception/level_action_already_exists_exception_en_US.ftl

@@ -0,0 +1 @@
+<#include "level_action_already_exists_exception_text">

abstracto-modules/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

abstracto-modules/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

abstracto-modules/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/moderation/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl

@@ -1,31 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "ban_log_title"/>"
-            },
-            <#include "moderation_action_color">,
-            "fields": [
-                {
-                    "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-                    "value": "${bannedUser.userMention}"
-                },
-                {
-                    "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-                    "value": "${banningMember.memberMention}"
-                },
-                {
-                    "name": "<@safe_include "ban_log_reason_field_title"/>",
-                    "value": "${reason?json_string}"
-                }
-                <#if deletionDuration?has_content>
-                ,
-                {
-                    "name": "<@safe_include "ban_log_deletion_duration_field_title"/>",
-                    "value": "${fmtDuration(deletionDuration)}"
-                }
-                </#if>
-            ]
-        }
-    ]
-}

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}"
                 }
+                </#if>
             ]
         }
     ]

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>
+                    <#if muted || durationChanged>
                         "name": "<@safe_include "mute_log_muting_user_field_title"/>",
                     <#elseif muteEnded>
                         "name": "<@safe_include "mute_log_unmuting_user_field_title"/>",
                     </#if>
-                    "value": "${mutingUser.memberMention}"
+                    "value": "<@member_detail member=mutingMember/>"
                 }
                 </#if>
                 <#if reason?has_content>,

abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl

@@ -1,20 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "unBan_log_title"/>"
-            },
-            <#include "moderation_action_color">,
-            "fields": [
-                {
-                    "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
-                    "value": "${bannedUser.userMention}"
-                },
-                {
-                    "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
-                    "value": "${unBanningMember.memberMention}"
-                }
-            ]
-        }
-    ]
-}

abstracto-modules/moderation/src/main/resources/en_US/general/infractions/infraction_level_notification_embed_en_US.ftl

@@ -1,7 +1,6 @@
 {
     "embeds": [
         {
-            <#include "user_detail">
             <#include "full_member_info">
             <#include "moderation_action_color">,
             <#assign newLevel=newLevel>

abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl

@@ -3,8 +3,12 @@
         {
             <#include "user_detail">
             <#include "abstracto_color">,
-            <#assign bannedUserName=bannedUser.name>
+            <#if bannedUser.name?has_content>
-            "description" : "<@safe_include "userBanned_description"/>",
+                <#assign bannedUserName=bannedUser.name>
+                "description" : "<@safe_include "userBanned_description_with_name"/>",
+            <#else>
+                "description" : "<@safe_include "userBanned_description"/>",
+            </#if>
             "fields": [
                 {
                     "name": "<@safe_include "userBanned_field_title_banned_user"/>",

abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl

@@ -16,6 +16,13 @@
                     "value": "<@user_detail user=unBanningUser/>"
                 }
                 </#if>
+                <#if reason??>
+                ,
+                {
+                "name": "<@safe_include "userUnBanned_field_title_reason"/>",
+                "value": "${reason}"
+                }
+                </#if>
             ]
         }
     ]

abstracto-modules/modmail/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/modmail/src/main/resources/en_US/command/contact/modmail_thread_created_embed_en_US.ftl

@@ -1,8 +1,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <@member_author member=targetMember/>,
+            <@user_detail_author user=userDisplay/>,
             "description": "<@safe_include "modmail_thread_created_description"/>",
             <#include "modmail_color">,
             "fields": [

abstracto-modules/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_embed_en_US.ftl

@@ -0,0 +1,6 @@
+{
+    "additionalMessage": "<@safe_include "denyModmailAppeal_response_text"/>",
+    "messageConfig": {
+        "ephemeral": true
+    }
+}

abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl

@@ -1,13 +1,12 @@
+<#include "user_detail">
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
             "title": {
                 "title": "<@safe_include "modmail_notification_message_title"/>"
             },
             <#include "modmail_color">,
-            <#assign user><@member_user_name member=member/>(${member.user.id})</#assign>
+            <#assign user><@user_detail user=userDisplay/></#assign>
             "description": "<@safe_include "modmail_notification_message_description"/>"
             <#if channel?has_content>,
             "fields": [

abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl

@@ -1,8 +1,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <@member_author member=member/>,
+            <@user_detail_author user=userDisplay/>,
             "title": {
                 "title": "<@safe_include "modmail_thread_user_message_title"/>"
             },

abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl

@@ -1,13 +1,10 @@
 <#include "format_instant">
+<#include "user_detail">
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
             <#include "modmail_color">,
-            <#assign user><@member_user_name member=member/> (${member.user.id})</#assign>
+            <#assign user><@user_detail user=userDisplay/> (${userDisplay.id?c})</#assign>
-            <#assign joinDate><@format_instant_date_time instant=memberJoinDate/></#assign>
-            <#assign roles><#list member.roles as role>${role.asMention?json_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign>
             "description": "<@safe_include "modmail_thread_header_embed_description"/>"
         }
     ]

abstracto-modules/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>core</module>

abstracto-modules/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl

@@ -1,10 +1,10 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <#include "member_avatar">
+            <@user_detail_author user=userDisplay/>,
-            <@member_display_author member=memberNameDisplay/>,
             <#include "abstracto_color">,
+            <#assign reminderId=reminderDisplay.id>
             "description": "<@safe_include "remind_reminder_description"/>",
             "fields": [
                 {
@@ -13,18 +13,22 @@
                 },
                 {
                     "name": "<@safe_include "remind_reminder_note_field_title"/>",
-                    "value": "${reminder.text?json_string}"
+                    "value": "${reminderDisplay.text?json_string}"
-                },
+                }
+                <#if messageUrl?has_content>,
                 {
                     "name": "<@safe_include "remind_reminder_link_field_title"/>",
                     "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
                 }
+                </#if>
             ]
         }
-    ],
+    ]
-<#assign participantsMentions><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#assign>
+<#if !reminderDisplay.userCommand>,
-    "additionalMessage": "${memberNameDisplay.memberMention?json_string} 🔔
+<#assign participantsMentions><#if reminderParticipants?has_content><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#if></#assign>
+    "additionalMessage": "${userDisplay.userMention?json_string} 🔔
 
 ${participantsMentions}
 "
+</#if>
 }

abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl

@@ -3,9 +3,8 @@
     "embeds": [
         {
             <#assign id>${reminder.id}</#assign>
-            <#include "member_author">
+            <#include "user_author">
-            <#include "member_avatar">
+            <@user_detail_author user=userDisplay/>,
-            <@member_display_author member=memberDisplay/>,
             <#include "abstracto_color">,
             <#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign>
             <#if message?has_content>
@@ -17,8 +16,11 @@
             </#if>
 
         }
-    ],
+    ]
-    "additionalMessage": "${memberDisplay.memberMention?json_string}",
+    <#if !reminder.userCommand>,
+    "additionalMessage": "${userDisplay.userMention?json_string}"
+    </#if>
+    <#if joinButtonId?has_content>,
     "buttons": [
         {
             "label": "<@safe_include "remind_reminder_join_button_label"/>",
@@ -29,4 +31,5 @@
             }
         }
     ]
+    </#if>
 }

abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl

@@ -2,8 +2,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <@member_author member=member/>,
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             "title": {
                 "title": "<@safe_include "reminders_reminders_embed_title"/>"
@@ -17,7 +17,7 @@
                     <#assign id>${reminderDisplay.id}</#assign>
                     <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
                     <#assign reminderText=reminderDisplay.text/>
-                    <#assign messageLink=reminderDisplay.message.jumpUrl/>
+                    <#if !reminderDisplay.userCommand><#assign messageLink=reminderDisplay.message.jumpUrl/></#if>
                     <#assign joined=reminderDisplay.joined/>
                     <#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign>
                     "name": "<@safe_include "reminders_reminder_field_title"/>",

abstracto-modules/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/statistic/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>statistic</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/sticky-roles/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles</artifactId>

abstracto-modules/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/utility/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>utility</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

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"
                 }
             ]

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"
+                },
+                </#if>
                 {
                     "name": "<@safe_include "userInfo_response_embed_id_field_title"/>",
                     "value": "${id?c}",
@@ -20,22 +32,26 @@
                     "inline": "true"
                 },
                 </#if>
+                <#if onlineStatus?has_content>
                 {
                     "name": "<@safe_include "userInfo_response_embed_status_field_title"/>",
                     "value": "${onlineStatus?json_string}",
                     "inline": "true"
                 },
+                </#if>
+                <#if joinDate?has_content>
                 {
                     "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
                     "value": "<@format_instant_date_time instant=joinDate/>",
                     "inline": "true"
                 },
+                </#if>
                 {
                     "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
                     "value": "<@format_instant_date_time instant=creationDate/>",
                     "inline": "true"
                 }
-                <#if roles?size gt 0>
+                <#if roles?has_content && roles?size gt 0>
                 ,
                 {
                     "name": "<@safe_include "userInfo_response_embed_roles_field_title"/>",
@@ -44,7 +60,7 @@
                     "valueSplitLength": 250
                 }
                 </#if>
-                <#if activities?size gt 0>
+                <#if activities?has_content && activities?size gt 0>
                 ,
                 {
                     "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>",

abstracto-modules/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>dev.sheldan.abstracto-templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>abstracto-modules</module>
@@ -24,7 +24,7 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/abstracto-templates.git</url>
-        <tag>templates-1.4.35</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <repositories>

translations/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/core/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/experience-tracking/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_leaderboard_button_label_en_US.ftl

@@ -0,0 +1 @@
+Leaderboard

translations/experience-tracking/src/main/resources/en_US/exception/level_action_already_exists_exception_text_en_US.ftl

@@ -0,0 +1 @@
+Level action already exists.

translations/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

translations/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

translations/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/moderation/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banned_user_field_title_en_US.ftl

@@ -1 +0,0 @@
-Banned user

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banning_user_field_title_en_US.ftl

@@ -1 +0,0 @@
-Banned by

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_duration_field_title_en_US.ftl

@@ -1 +0,0 @@
-Deletion duration

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_jump_link_field_title_en_US.ftl

@@ -1 +0,0 @@
-Link

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_title_en_US.ftl

@@ -1 +0,0 @@
-User has been banned.

translations/moderation/src/main/resources/en_US/commands/mute/mute_log_unmuting_user_field_title_en_US.ftl

@@ -1 +1 @@
-Unmuted by
+Muted by

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_title_en_US.ftl

@@ -1 +0,0 @@
-User has been unbanned

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banned_user_field_title_en_US.ftl

@@ -1 +0,0 @@
-Unbanned user

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banning_user_field_title_en_US.ftl

@@ -1 +0,0 @@
-Unbanning user

translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_en_US.ftl

@@ -1 +1 @@
-User ${bannedUserName} was banned.
+User was banned.

translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_with_name_en_US.ftl

@@ -0,0 +1 @@
+User ${bannedUserName} was banned.

translations/modmail/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/denyModmailAppeal_response_text_en_US.ftl

@@ -0,0 +1 @@
+User has been banned from the appeal server.

translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_description_en_US.ftl

@@ -0,0 +1 @@
+Reject an modmail appeal

translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_long_help_en_US.ftl

@@ -0,0 +1 @@
+Rejects the appeal, closes the modmail thread and bans the user from the appeal server.

translations/modmail/src/main/resources/en_US/command/denyModmailAppeal/help/denyModmailAppeal_parameter_reason_en_US.ftl

@@ -0,0 +1 @@
+The reason to reject this appeal. Will not be forwarded to the user.

translations/modmail/src/main/resources/en_US/config/feature_setup_config_modMailAppealServer_en_US.ftl

@@ -0,0 +1 @@
+The server to use as an appeal server. Default: ${defaultValue}

translations/modmail/src/main/resources/en_US/notification/modmail_thread_header_embed_description_en_US.ftl

@@ -1,3 +1,2 @@
 This is a modmail thread concerning ${user}.
-The user has the roles ${roles} and joined on ${joinDate}
 There were ${pastModMailThreadCount} threads in the past.

translations/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.translations</groupId>
     <artifactId>translations</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>core</module>

translations/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl

@@ -1 +1 @@
-Reminder ID ${reminder.id?c}
+Reminder ID ${reminderId?c}

translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl

@@ -1 +1 @@
-Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink}) ${joinedText}
+Due on ${reminderTargetDate} with text `${reminderText}`<#if messageLink?has_content> started [here](${messageLink})</#if> ${joinedText}

translations/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/statistic/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>statistic</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/sticky-roles/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles</artifactId>

translations/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/utility/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>utility</artifactId>
-    <version>1.4.35</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_global_name_field_title_en_US.ftl

@@ -0,0 +1 @@
+Display name

translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_user_name_field_title_en_US.ftl

@@ -0,0 +1 @@
+User name

translations/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.35</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>