[maven-release-plugin] prepare for next development iteration

adding avatar to starboard post
adding possibility to define a color for the starboard container
fixing attachment logic for starboard post
fixing streamer went offline message not using components v2

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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/assignable-roles/src/main/resources/default/command/activateAssignableRolePlace/activateAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/addAssignableRoleCondition/addAssignableRoleCondition_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/addRoleToAssignableRolePlace/addRoleToAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/changeAssignableRolePlaceConfig/changeAssignableRolePlaceConfig_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/createAssignableRolePlace/createAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/deactivateAssignableRolePlace/deactivateAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/deleteAssignableRolePlace/deleteAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/moveAssignableRolePlace/moveAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/removeAssignableRoleCondition/removeAssignableRoleCondition_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/removeRoleFromAssignableRolePlace/removeRoleFromAssignableRolePlace_response_embed.ftl

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

abstracto-modules/assignable-roles/src/main/resources/default/command/setupAssignableRolePlace/setupAssignableRolePlace_response_embed.ftl

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

abstracto-modules/core/pom.xml

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

abstracto-modules/core/src/main/resources/default/command/slash_command_suggestion_embed.ftl

@@ -0,0 +1,9 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign slashCommandPath=slashCommandPath>
+            "description": "<@safe_include "slash_command_suggestion_text"/>"
+        }
+    ]
+}

abstracto-modules/core/src/main/resources/default/condition/is_bot_owner_condition.ftl

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

abstracto-modules/core/src/main/resources/default/exceptions/generic_interaction_exception_embed.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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/entertainment/src/main/resources/default/commands/8Ball/eight_ball_response_embed.ftl

@@ -1,3 +1,3 @@
 {
-  "additionalMessage": "<@safe_include "eightBall_response_${chosenKey}"/>"
+  "additionalMessage": "<@safe_include "eightball_response_prefix"/> <@safe_include "eightBall_response_${chosenKey}"/>"
 }

abstracto-modules/entertainment/src/main/resources/default/commands/choose/choose_response_embed.ftl

@@ -1,9 +1,4 @@
 {
-    "embeds": [
-        {
-            <#include "abstracto_color">,
-            <#assign choice=chosenValue>
-            "description": "<@safe_include "choose_response_description"/>"
-        }
-    ]
+    <#assign choice=chosenValue>
+    "additionalMessage": "<@safe_include "choose_response_description"/>"
 }

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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.47</version>
+    <version>1.4.63-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/giveaway/pom.xml

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

abstracto-modules/giveaway/src/main/resources/default/commands/addGiveawayKey/addGiveawayKey_response_embed.ftl

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

abstracto-modules/giveaway/src/main/resources/default/commands/createKeyGiveaway/createKeyGiveaway_response_embed.ftl

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

abstracto-modules/giveaway/src/main/resources/default/commands/removeGiveawayKey/removeGiveawayKey_response_embed.ftl

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

abstracto-modules/giveaway/src/main/resources/default/commands/showGiveawayKeys/showGiveawayKeys_no_keys_found_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "showGiveawayKeys_no_keys_found_text"/>"
+        }
+    ]
+}

abstracto-modules/giveaway/src/main/resources/default/commands/showGiveawayKeys/showGiveawayKeys_response_entry.ftl

@@ -0,0 +1,10 @@
+{
+    "embeds": [
+        {
+            "description": "<#list row as key><#assign key=key><@safe_include "showGiveawayKeys_key_entry"/>\n</#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/giveaway/src/main/resources/default/commands/showGiveawayKeys/showGiveawayKeys_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.keys?size lt 6/>
+    "embedConfigs": [
+    <#assign chunks=innerModel.keys?chunk(5)>
+    <#list chunks as row><#assign counter=row?index><#assign row=row><#include "showGiveawayKeys_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/giveaway/src/main/resources/default/exception/giveaway_key_not_found_exception.ftl

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

abstracto-modules/giveaway/src/main/resources/default/exception/giveaway_not_possible_exception.ftl

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

abstracto-modules/giveaway/src/main/resources/default/general/giveaway_winner_modmail_notification_embed.ftl

@@ -0,0 +1,15 @@
+{
+    "embeds": [
+        {
+            "title": {
+                <#assign title=title?json_string>
+                "title": "<@safe_include "giveaway_winner_modmail_notification_title"/>"
+            },
+            <#include "abstracto_color">,
+            <#if description?has_content><#assign description=description?json_string></#if>
+            <#if benefactor?has_content><#assign benefactor=benefactor.memberMention/></#if>
+            <#assign key=key/>
+            "description": "<@safe_include "giveaway_winner_modmail_notification_description"/>"
+        }
+    ]
+}

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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/link-embed/src/main/resources/default/job/message_embed_cleanup_replacement_embed.ftl

@@ -0,0 +1,12 @@
+{
+    <#assign messageLink=message.jumpUrl>
+    "components": [
+        {
+            "type": "textDisplay",
+            "content": "<@safe_include "message_embed_cleanup_replacement_text"/>"
+        }
+    ],
+    "messageConfig": {
+        "useComponentsV2": true
+    }
+}

abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl

@@ -1,70 +1,137 @@
 {
-    "embeds": [
+    "components": [
         {
-            <#if author??>
-            <#include "user_author">
-            <@user_author user=author/>
-            <#else>
-            <#include "deleted_user_author"/>
-            </#if>,
-            <#include "abstracto_color">,
-            <#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0>
-            "description": "${embeddedMessage.content?json_string}
-            <#list embeddedMessage.embeds>
-                <@safe_include "message_embed_embed_embeds_name"/>:
-                <#items as embed><#assign embed=embed/>
-                    <@safe_include "message_embed_embed_description"/>: <#if embed.description?has_content >${embed.description?json_string}</#if> <#if embed.imageUrl?has_content> <@safe_include "message_embed_embed_image_url"/>: ${embed.imageUrl} </#if>
-                </#items>
-            </#list>
-            ",
-            </#if>
-            <#if embeddedMessage.attachments?size gt 0 && !embeddedMessage.attachments[0].spoiler>
-            "imageUrl": "${embeddedMessage.attachments[0].proxyUrl}",
-            <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedThumbnail??>
-            "imageUrl": "${embeddedMessage.embeds[0].cachedThumbnail.proxyUrl}",
-            <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedImageInfo??>
-            "imageUrl": "${embeddedMessage.embeds[0].cachedImageInfo.proxyUrl}",
-            </#if>
-            "fields": [
-                {
-                  "name": "<@safe_include "message_embed_embed_quoted_by_field_title"/>",
-                  <#assign user>${embeddingUser.asMention?json_string}</#assign>
-                  <#assign channelName>${sourceChannel.name?json_string}</#assign>
-                  <#assign messageLink>${embeddedMessage.messageUrl}</#assign>
-                  "value": "<@safe_include "message_embed_embed_quoted_by_field_value"/>"
+            <#assign userFound=author??>
+            <#include "user_user_name">
+            <#assign userText><#if author??><@user_user_name user=author/><#else><@safe_include "delete_user_name"/></#if></#assign>
+            <#include "member_user_name">
+            <#assign embeddingUserText><@member_user_name member=embeddingUser/></#assign>
+            <#assign userAvatar><#if author??>${author.effectiveAvatarUrl}</#if></#assign>
+            <#if userFound>
+                "type": "section",
+                "components": [
+                    {
+                        "type": "textDisplay",
+                        "content": "<@safe_include "message_embed_meta_info"/>"
+                    }
+                ],
+                "accessory": {
+                    "type": "thumbnail",
+                    "url": "${userAvatar}"
                 }
-                <#if embeddedMessage.referencedMessage??>
-                ,
+            <#else>
+                "type": "textDisplay",
+                "content": "<@safe_include "message_embed_meta_info"/>"
+            </#if>
+        },
+        {
+            "type": "container",
+            "components": [
+            <#assign hasContent=false>
+            <#if embeddedMessage.content?has_content>
+                <#assign hasContent=true>
                 {
-                    <#assign referencedMessageLink=embeddedMessage.referencedMessage.messageUrl/>
-                    <#assign repliedToAuthorMention>${r"<@"}${embeddedMessage.referencedMessage.author.authorId?c}${r">"}</#assign>
-                    "name": "<@safe_include "message_embed_embed_referenced_message_field_title"/>",
-                    "value": "<@safe_include "message_embed_embed_referenced_message_field_value"/>"
+                    "type": "textDisplay",
+                    "content": "${embeddedMessage.content?json_string}"
+                }
+            </#if>
+            <#list embeddedMessage.embeds as embed>
+                <#if embed.description?has_content>
+                ,{
+                    <#assign hasContent=true>
+                    "type": "section",
+                    "components": [
+                        {
+                            "type": "textDisplay",
+                            "content": "${embed.description?json_string}"
+                        }
+                    ]
+                    <#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
+                    ,"accessory": {
+                        "type": "thumbnail",
+                        "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
+                    }
+                    </#if>
+                }
+                <#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
+                || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                    <#assign hasContent=true>
+                {
+                    "type": "mediaGallery",
+                    "images": [
+                        {
+                            "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
+                        }
+                    ]
                 }
                 </#if>
-            ],
-            "timeStamp": "${embeddedMessage.timeCreated}"
-        }
-    ]
-     <#if useButton>
-    ,"buttons": [
-        {
-            "label": "<@safe_include "message_embed_button_delete"/>",
-            "id": "${buttonConfigModel.buttonId}",
-            "buttonStyle": "danger",
-            "metaConfig": {
-                "persistCallback": false
+            </#list>
+            <#if embeddedMessage.attachments?size gt 0>
+            <#list embeddedMessage.attachments?filter(x -> x.width gt 0)>
+            ,{
+                <#assign hasContent=true>
+                "type": "mediaGallery",
+                "images": [
+                    <#items as attachment>
+                    {
+                        "url": "${attachment.proxyUrl}"
+                    }</#items>
+                ]
+            }<#sep>,</#list>
+        </#if>
+        <#if hasContent==false>
+            {
+            "type": "textDisplay",
+            "content": "<@safe_include "message_embed_no_content"/>"
             }
+        </#if>
+            ]
+        }
+        ,{
+            "type": "actionRow",
+            "actionRowItems": [
+                    {
+                        <#assign channelName>${sourceChannel.name?json_string}</#assign>
+                        <#assign messageLink>${embeddedMessage.messageUrl}</#assign>
+                        "type": "button",
+                        "label": "<#include "message_embed_original_button_label">",
+                        "url": "${messageLink}",
+                        "buttonStyle": "link"
+                    }
+                <#if useButton>
+                    ,{
+                        "label": "<@safe_include "message_embed_button_delete"/>",
+                        "id": "${buttonConfigModel.buttonId}",
+                        "buttonStyle": "danger",
+                        "type": "button",
+                        "metaConfig": {
+                            "persistCallback": false
+                        }
+                    }
+                </#if>
+                <#if embeddedMessage.referencedMessage??>
+                    ,
+                    {
+                        "type": "button",
+                        <#assign referencedMessageLink=embeddedMessage.referencedMessage.messageUrl/>
+                        "label": "<#include "message_embed_referenced_button_label">",
+                        "url": "${referencedMessageLink}",
+                        "buttonStyle": "link"
+                    }
+                </#if>
+            ]
         }
     ]
-    </#if>
-    <#if embeddedMessage.attachments?size gt 0 && embeddedMessage.attachments[0].spoiler>
-    ,"additionalMessage": "||${embeddedMessage.attachments[0].proxyUrl?json_string}||"
-    </#if>
 <#if referencedMessageId?has_content && mentionsReferencedMessage?has_content>
-    ,"referencedMessageId": "${referencedMessageId?c}",
-    "messageConfig": {
-        "mentionsReferencedMessage": ${mentionsReferencedMessage?string('true', 'false')}
-    }
+    ,"referencedMessageId": "${referencedMessageId?c}"
 </#if>
+    ,"messageConfig": {
+        "allowsUserMention": false,
+        "allowsRoleMention": false,
+        "allowsEveryoneMention": false,
+        "useComponentsV2": true
+        <#if referencedMessageId?has_content && mentionsReferencedMessage?has_content>
+        ,"mentionsReferencedMessage": ${mentionsReferencedMessage?string('true', 'false')}
+        </#if>
+    }
 }

abstracto-modules/logging/pom.xml

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

abstracto-modules/logging/src/main/resources/default/listener/user_joined/user_join_embed.ftl

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

abstracto-modules/moderation/pom.xml

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

abstracto-modules/moderation/src/main/resources/default/listener/userBanned/userBanned_listener_notification_embed.ftl

@@ -25,7 +25,7 @@
                 ,
                 {
                     "name": "<@safe_include "userBanned_field_title_reason"/>",
-                    "value": "${reason}"
+                    "value": "${reason?json_string}"
                 }
                 </#if>
             ]

abstracto-modules/moderation/src/main/resources/default/listener/userUnBanned/userUnBanned_listener_notification_embed.ftl

@@ -20,7 +20,7 @@
                 ,
                 {
                 "name": "<@safe_include "userUnBanned_field_title_reason"/>",
-                "value": "${reason}"
+                "value": "${reason?json_string}"
                 }
                 </#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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.47</version>
+    <version>1.4.63-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/modmail/src/main/resources/default/modmail/modmail_thread_header_embed.ftl

@@ -4,7 +4,7 @@
     "embeds": [
         {
             <#include "modmail_color">,
-            <#assign user><@user_detail user=userDisplay/> (${userDisplay.id?c})</#assign>
+            <#assign user><@user_detail user=userDisplay/></#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.47</version>
+        <version>1.4.63-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.47</version>
+    <version>1.4.63-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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/remind/src/main/resources/default/commands/remind/remind_reminder_embed.ftl

@@ -1,32 +1,36 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <#include "member_avatar">
-            <@member_display_author member=memberNameDisplay/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
+            <#assign reminderId=reminderDisplay.id>
             "description": "<@safe_include "remind_reminder_description"/>",
             "fields": [
                 {
                     "name": "<@safe_include "remind_reminder_duration_field_title"/>",
                     "value": "${fmtDuration(duration)}"
-                },
-                <#if reminder.text?has_content>
-                {
+                }
+                <#if reminderDisplay.text?has_content>
+                ,{
                     "name": "<@safe_include "remind_reminder_note_field_title"/>",
-                    "value": "${reminder.text?json_string}"
-                },
+                    "value": "${reminderDisplay.text?json_string}"
+                }
                 </#if>
-                {
+                <#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>
-    "additionalMessage": "${memberNameDisplay.memberMention?json_string} 🔔
+    ]
+<#if !reminderDisplay.userCommand>,
+<#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/default/commands/remind/remind_response_embed.ftl

@@ -3,9 +3,8 @@
     "embeds": [
         {
             <#assign id>${reminder.id}</#assign>
-            <#include "member_author">
-            <#include "member_avatar">
-            <@member_display_author member=memberDisplay/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             <#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign>
             <#if message?has_content>
@@ -21,8 +20,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"/>",
@@ -33,4 +35,5 @@
             }
         }
     ]
+</#if>
 }

abstracto-modules/remind/src/main/resources/default/commands/reminders/reminders_response_embed.ftl

@@ -2,8 +2,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             "title": {
                 "title": "<@safe_include "reminders_reminders_embed_title"/>"
@@ -16,7 +16,7 @@
                 {
                     <#assign id>${reminderDisplay.id}</#assign>
                     <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
-                    <#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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl

@@ -1,51 +1,120 @@
 {
-    "embeds": [
+    "components": [
         {
-            <#if author??>
-            <#include "user_author">
-            <@user_author user=author/>
-            <#else>
-            <@safe_include "deleted_user_author"/>
-            </#if>,
-            <#include "abstracto_color">,
-            <#if message.content?has_content || message.embeds?size gt 0>
-            "description": "${message.content?json_string}
-<#list message.embeds>
-<@safe_include "starboard_post_embed_embeds_name"/>:
-<#items as embed>
-<#if embed.description??> <@safe_include "starboard_post_embed_description"/>: ${embed.description?json_string} </#if> <#if embed.imageUrl?has_content> <@safe_include "starboard_post_embed_image_url"/>: ${embed.imageUrl} </#if>
-</#items>
-</#list>
-",
-            </#if>
-            <#if message.attachments?size gt 0>
-            "imageUrl": "${message.attachments[0].proxyUrl}",
-            <#elseif message.attachments?size = 0 && message.embeds?size gt 0 && message.embeds[0].cachedThumbnail??>
-            "imageUrl": "${message.embeds[0].cachedThumbnail.proxyUrl}",
-            <#elseif message.attachments?size = 0 && message.embeds?size gt 0 && message.embeds[0].cachedImageInfo??>
-            "imageUrl": "${message.embeds[0].cachedImageInfo.proxyUrl}",
-            </#if>
-            "fields": [
-                {
-                    "name": "<@safe_include "starboard_post_embed_original_field_title"/>"
-                    <#if channel?has_content>
-                    ,"value": "[${channel.name?json_string}](${message.messageUrl})"
-                    <#else>
-                    ,"value": "[${sourceChannelId?c}](${message.messageUrl})"
-                    </#if>
+            <#assign userFound=author??>
+            <#assign emote>${starLevelEmote}</#assign>
+            <#assign count>${starCount}</#assign>
+            <#assign messageId>${message.messageId?c}</#assign>
+            <#assign userText><#if author??><#include "user_user_name"><@user_user_name user=author/><#else><@safe_include "delete_user_name"/></#if></#assign>
+            <#assign userAvatar><#if author??>${author.effectiveAvatarUrl}</#if></#assign>
+            <#assign userComponent>
+                "type": "textDisplay",
+                <#if channel?has_content>
+                    <#assign channelMention>${channel.asMention?json_string}</#assign>
+                    "content": "<@safe_include "starboard_post_embed_additional_message"/>"
+                <#else>
+                    <#assign channelMention>${sourceChannelId?c}</#assign>
+                    "content": "<@safe_include "starboard_post_embed_additional_message"/>"
+                </#if>
+            </#assign>
+            <#if userFound>
+                "type": "section",
+                "components": [
+                    {
+                        ${userComponent}
+                    }
+                ],
+                "accessory": {
+                    "type": "thumbnail",
+                    "url": "${userAvatar}"
                 }
-            ],
-            "timeStamp": "${message.timeCreated}"
+            <#else>
+                ${userComponent}
+            </#if>
+        }
+        ,{
+            "type": "container",
+            <#include "starboard_post_container_color">
+            "components": [
+                <#assign hasContent=false>
+                <#if message.content?has_content>
+                    <#assign hasContent=true>
+                {
+                    "type": "textDisplay",
+                    "content": "${message.content?json_string}"
+                }
+                </#if>
+            <#list message.embeds as embed>
+                <#if embed.description?has_content && !((embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content))>
+                    <#assign hasContent=true>
+                    {
+                        "type": "textDisplay",
+                        "content": "${embed.description?json_string}"
+                    }
+                <#elseif embed.description?has_content && (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
+                || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                <#assign hasContent=true>
+                ,{
+                    "type": "section",
+                    "components": [
+                        {
+                            "type": "textDisplay",
+                            "content": "${embed.description?json_string}"
+                        }
+                    ]
+                    ,"accessory": {
+                        "type": "thumbnail",
+                        "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
+                    }
+                }
+                <#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
+                || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                    <#assign hasContent=true>
+                {
+                    "type": "mediaGallery",
+                    "images": [
+                        {
+                            "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
+                        }
+                    ]
+                }
+                </#if>
+            </#list>
+            <#if message.attachments?size gt 0>
+            <#list message.attachments?filter(x -> x.width gt 0)>
+                <#assign hasContent=true>
+                ,{
+                    "type": "mediaGallery",
+                    "images": [
+                    <#items as attachment>
+                        {
+                            "url": "${attachment.proxyUrl}"
+                        }</#items>
+                    ]
+                }<#sep>,</#list>
+            </#if>
+            <#if hasContent==false>
+                {
+                "type": "textDisplay",
+                "content": "<@safe_include "starboard_post_embed_no_content"/>"
+                }
+            </#if>
+            ]
+        },
+        {
+            "type": "actionRow",
+            "actionRowItems": [
+                {
+                    "type": "button",
+                    "label": "<#include "starboard_post_embed_go_to_post_title">",
+                    "url": "${message.messageUrl}",
+                    "buttonStyle": "link"
+                }
+            ]
         }
     ],
-    <#assign emote>${starLevelEmote}</#assign>
-    <#assign count>${starCount}</#assign>
-    <#assign messageId>${message.messageId?c}</#assign>
-    <#if channel?has_content>
-    <#assign channelMention>${channel.asMention?json_string}</#assign>
-    "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
-    <#else>
-    <#assign channelMention>${sourceChannelId?c}</#assign>
-    "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
-    </#if>
+    "messageConfig": {
+        "allowsUserMention": false,
+        "useComponentsV2": true
+    }
 }

abstracto-modules/statistic/pom.xml

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

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deleteTrackedEmote/deleteTrackedEmote_response_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "deleteTrackedEmote_response_embed_text"/>"
+        }
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_emote_entry.ftl

@@ -0,0 +1 @@
+`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "deletedEmoteStats_animated_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "deletedEmoteStats_animated_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "deletedEmoteStats_animated_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.animatedEmotes?size lt 1/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.animatedEmotes?chunk(2)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "deletedEmoteStats_animated_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_emote_entry.ftl

@@ -0,0 +1 @@
+`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "deletedEmoteStats_static_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "deletedEmoteStats_static_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "deletedEmoteStats_static_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.staticEmotes?size lt 21/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.staticEmotes?chunk(20)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "deletedEmoteStats_static_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/disableEmoteTracking/disableEmoteTracking_response_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "disableEmoteTracking_response_embed_text"/>"
+        }
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_animated_emote_entry.ftl

@@ -0,0 +1 @@
+${emote.emote.asMention}x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_animated_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "emoteStats_animated_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep>, </#if></#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_animated_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "emoteStats_animated_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "emoteStats_animated_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_animated_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.animatedEmotes?size lt 41/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.animatedEmotes?chunk(40)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "emoteStats_animated_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_static_emote_entry.ftl

@@ -0,0 +1 @@
+${emote.emote.asMention}x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_static_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-            "title": "<@safe_include "emoteStats_static_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep>, </#if></#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_static_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "emoteStats_static_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "emoteStats_static_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/emoteStats/emoteStats_static_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.staticEmotes?size lt 41/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.staticEmotes?chunk(40)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "emoteStats_static_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_animated_emote_entry.ftl

@@ -0,0 +1 @@
+`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "externalEmoteStats_animated_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list animatedEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "externalEmoteStats_animated_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "externalEmoteStats_animated_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.animatedEmotes?size lt 21/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.animatedEmotes?chunk(20)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "externalEmoteStats_animated_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_static_emote_entry.ftl

@@ -0,0 +1 @@
+`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed.ftl

@@ -1,11 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "externalEmoteStats_static_emotes_title"/>"
-            },
-            <#include "statistic_color">,
-            "description": "<#list staticEmotes as emote>`${emote.trackedEmote.emoteName}:${emote.trackedEmote.trackedEmoteId.id?c}`x${emote.result.amount?c}<#sep>, </#list>"
-        }
-    ]
-}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_entry.ftl

@@ -0,0 +1,13 @@
+{
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "externalEmoteStats_static_emotes_title"/>"
+            },
+            "description": "<#list row as emote><#assign emote=emote><@safe_include "externalEmoteStats_static_emote_entry"/><#sep>, </#list>"
+        }
+    ],
+    "buttons": [
+        <#include "paginator_buttons">
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_paginator.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign exitOnly=innerModel.staticEmotes?size lt 21/>
+    "embedConfigs": [
+        <#assign chunks=innerModel.staticEmotes?chunk(20)>
+        <#list chunks as row><#assign counter=row?index><#assign row=row><#include "externalEmoteStats_static_response_entry"><#sep>,</#list>
+    ],
+    "timeoutSeconds": 120,
+    "restrictUser": true
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/purgeEmoteStats/purgeEmoteStats_response_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "purgeEmoteStats_response_embed_text"/>"
+        }
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/resetEmoteStats/resetEmoteStats_response_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "resetEmoteStats_response_embed_text"/>"
+        }
+    ]
+}

abstracto-modules/statistic/src/main/resources/default/emotes/commands/trackEmote/trackEmote_response_embed.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<@safe_include "trackEmote_response_embed_text"/>"
+        }
+    ]
+}

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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/twitch/src/main/resources/default/general/twitch_streamer_go_live_notification_embed.ftl

@@ -6,29 +6,49 @@
     <#assign title=currentSection.title>
     <#assign thumbnail=currentSection.thumbnailURL>
     <#assign viewerCount=currentSection.viewerCount>
-    "additionalMessage": "<@safe_include "twitch_streamer_go_live_notification_text"/>",
-    "embeds": [
+    "components": [
+        <#assign additionalText><@safe_include "twitch_streamer_go_live_notification_text"/></#assign>
         {
-            <#include "twitch_color">,
-            "author": { "name": "${channelName}", "avatar":  "${streamerAvatarURL}", "url": "${streamURL}"},
-            "title": {
-                "title": "${title?json_string}"
-            },
-            "description": "<@safe_include "twitch_streamer_go_live_notification_current_section"/> <#if pastSections?? && pastSections?size gt 0><@safe_include "twitch_streamer_go_live_notification_past_sections"/></#if>",
-            "imageUrl": "${thumbnail}?${randomString}"
+            "type": "section",
+            "components": [
+                {
+                    "type": "textDisplay",
+                    "content": "${(additionalText)!''}\n# ${title?json_string} \n <@safe_include "twitch_streamer_go_live_notification_current_section"/>"
+                }
+                <#if pastSections?? && pastSections?size gt 0>,
+                {
+                    "type": "textDisplay",
+                    "content": "<@safe_include "twitch_streamer_go_live_notification_past_sections"/>"
+                }
+                </#if>
+            ]
+            ,"accessory": {
+                "type": "thumbnail",
+                "url": "${streamerAvatarURL}"
+            }
+        },
+        {
+            "type": "mediaGallery",
+            "images": [
+                {
+                    "url": "${thumbnail}?${randomString}"
+                }
+            ]
+        },
+        {
+            "type": "actionRow",
+            "actionRowItems": [
+                {
+                    "type": "button",
+                    "label": "<@safe_include "twitch_streamer_go_live_notification_watch_button"/>",
+                    "url": "${streamURL?json_string}",
+                    "buttonStyle": "link"
+                }
+            ]
         }
     ],
     "messageConfig": {
-        "allowsRoleMention": true
-    },
-    "buttons": [
-        {
-            "label": "<@safe_include "twitch_streamer_go_live_notification_watch_button"/>",
-            "url": "${streamURL?json_string}",
-            "buttonStyle": "link",
-            "metaConfig": {
-                "persistCallback": false
-            }
-        }
-    ]
+        "allowsRoleMention": true,
+        "useComponentsV2": true
+    }
 }

abstracto-modules/twitch/src/main/resources/default/general/twitch_streamer_went_offline_message_embed.ftl

@@ -1,18 +1,37 @@
 <#include "format_instant">
 {
-    "embeds": [
+    "components": [
         {
-            <#include "twitch_color">,
             <#assign channelName=channelName>
             <#assign avatarURL=avatarURL>
-            "title": {
-                "title": "<@safe_include "twitch_streamer_went_offline_notification_title"/>"
-            },
-            "author": { "name": "${channelName}", "avatar":  "${avatarURL}"},
-            "description": "<@safe_include "twitch_streamer_went_offline_notification_past_sections"/>"
-            <#if offlineImageURL??>,
-            <#assign offlineImageURL=offlineImageURL>
-            "imageUrl": "${offlineImageURL}"</#if>
+            "type": "section",
+            "components": [
+                {
+                    "type": "textDisplay",
+                    "content": "<@safe_include "twitch_streamer_went_offline_notification_title"/>"
+                },
+                {
+                    "type": "textDisplay",
+                    "content": "<@safe_include "twitch_streamer_went_offline_notification_past_sections"/>"
+                }
+            ]
+            ,"accessory": {
+                "type": "thumbnail",
+                "url": "${avatarURL}"
+            }
         }
-    ]
+        <#if offlineImageURL??>,
+        {
+            "type": "mediaGallery",
+            "images": [
+                {
+                    "url": "${offlineImageURL}"
+                }
+            ]
+        }
+        </#if>
+    ],
+    "messageConfig": {
+        "useComponentsV2": true
+    }
 }

abstracto-modules/utility/pom.xml

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

abstracto-modules/utility/src/main/resources/default/commands/showAvatar/showAvatar_response_embed.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/default/commands/userInfo/userInfo_response_embed.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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/webservices/src/main/resources/default/currencyconversion/commands/convertCurrency/convertCurrency_response_embed.ftl

@@ -0,0 +1,11 @@
+{
+    "embeds": [
+        {
+            <#assign sourceValue=sourceValue>
+            <#assign sourceCurrency=sourceCurrency.code>
+            <#assign targetValue=targetValue>
+            <#assign targetCurrency=targetCurrency.code>
+            "description": "<@safe_include "convertCurrency_response_text"/>"
+        }
+    ]
+}

abstracto-modules/webservices/src/main/resources/default/currencyconversion/exception/currency_conversion_currency_not_found_exception.ftl

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

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>dev.sheldan.abstracto-templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.4.47</version>
+    <version>1.4.63-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.47</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.47</version>
+        <version>1.4.63-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.47</version>
+        <version>1.4.63-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/assignable-roles/src/main/resources/default/commands/activateAssignableRolePlace/activateAssignableRolePlace_response_text.ftl

@@ -0,0 +1 @@
+Assignable role place has been activated.