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

fixing modmail notification template

abstracto-modules/anti-raid/pom.xml

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

abstracto-modules/anti-raid/src/main/resources/en_US/listener/massPingListener/massPing_mute_notification_embed_en_US.ftl

@@ -1,16 +1,18 @@
 {
-  <#include "moderation_action_color">,
-  <#assign mentionCount=mentionCount/>
-  <#assign memberMention=memberDisplay.memberMention/>
-  "description": "<@safe_include "massPing_mute_notification_embed_description"/>",
-  "fields": [
-    {
-          "name": "<@safe_include "massPing_mute_notification_embed_message_content_field_title"/>",
-          "value": "${messageContent?json_string}"
-    },
-    {
-          "name": "<@safe_include "massPing_mute_notification_embed_message_link_field_title"/>",
-          "value": "[<@safe_include "massPing_mute_notification_embed_message_link_field_value"/>](${messageLink})"
-    }
-  ]
+    "embeds": [
+        <#include "moderation_action_color">,
+        <#assign mentionCount=mentionCount/>
+        <#assign memberMention=memberDisplay.memberMention/>
+        "description": "<@safe_include "massPing_mute_notification_embed_description"/>",
+        "fields": [
+            {
+                  "name": "<@safe_include "massPing_mute_notification_embed_message_content_field_title"/>",
+                  "value": "${messageContent?json_string}"
+            },
+            {
+                  "name": "<@safe_include "massPing_mute_notification_embed_message_link_field_title"/>",
+                  "value": "[<@safe_include "massPing_mute_notification_embed_message_link_field_value"/>](${messageLink})"
+            }
+        ]
+    ]
 }

abstracto-modules/assignable-roles/pom.xml

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

abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaceConfig/assignable_roles_config_post_embed_en_US.ftl

@@ -1,17 +1,21 @@
 {
-  <#include "assignable_place_color">,
-  "description": "<#assign channelMention><#if channelDisplay??>${channelDisplay.channelMention}<#else><@safe_include "assignable_roles_config_embed_no_channel_found"/></#if></#assign>
-  <#assign typeDescription><@safe_include "assignable_role_place_type_description_${type}"/></#assign>
-  <@safe_include "assignable_roles_config_embed_place_description"/>
+    "embeds": [
+        {
+            <#include "assignable_place_color">,
+            "description": "<#assign channelMention><#if channelDisplay??>${channelDisplay.channelMention}<#else><@safe_include "assignable_roles_config_embed_no_channel_found"/></#if></#assign>
+<#assign typeDescription><@safe_include "assignable_role_place_type_description_${type}"/></#assign>
+<@safe_include "assignable_roles_config_embed_place_description"/>
 
-    <@safe_include "assignable_roles_config_embed_role_header"/>:
-    <#list roles as role><#assign role=role/>
-    <#assign emoteMention><#if role.emoteMarkDown??>${role.emoteMarkDown}<#else>No emote</#if></#assign>
-    <#assign roleMention=role.roleDisplay.roleMention/>
-    <#assign roleDescription=role.description/>
-    <#assign conditionText><#list role.conditions as condition><#assign model=condition.templateModel><@safe_include "${condition.templateName}"/><#sep>, <#else><#include "assignable_role_condition_no_conditions"></#list></#assign>
-    <@safe_include "assignable_roles_config_embed_role_description"/>
+<@safe_include "assignable_roles_config_embed_role_header"/>:
+<#list roles as role><#assign role=role/>
+<#assign emoteMention><#if role.emoteMarkDown??>${role.emoteMarkDown}<#else>No emote</#if></#assign>
+<#assign roleMention=role.roleDisplay.roleMention/>
+<#assign roleDescription=role.description/>
+<#assign conditionText><#list role.conditions as condition><#assign model=condition.templateModel><@safe_include "${condition.templateName}"/><#sep>, <#else><#include "assignable_role_condition_no_conditions"></#list></#assign>
+<@safe_include "assignable_roles_config_embed_role_description"/>
 
 <#else><@safe_include "assignable_role_config_embed_no_roles"/></#list>
-  "
+"
+        }
+    ]
 }

abstracto-modules/assignable-roles/src/main/resources/en_US/command/showAssignableRolePlaces/assignable_role_places_overview_embed_en_US.ftl

@@ -1,6 +1,10 @@
 {
-  <#include "assignable_place_color">,
-  "description": "<@safe_include "assignable_role_places_overview_description"/>:
-  <#list places as place>`<#assign place=place/><#assign placeKey=place.placeName/><@safe_include "assignable_role_places_overview_place"/>`<#sep>, <#else> <@safe_include "assignable_role_places_overview_no_places"/></#list>
-  "
+    "embeds": [
+        {
+            <#include "assignable_place_color">,
+            "description": "<@safe_include "assignable_role_places_overview_description"/>:
+<#list places as place>`<#assign place=place/><#assign placeKey=place.placeName/><@safe_include "assignable_role_places_overview_place"/>`<#sep>, <#else> <@safe_include "assignable_role_places_overview_no_places"/></#list>
+"
+        }
+    ]
 }

abstracto-modules/assignable-roles/src/main/resources/en_US/condition/assignable_role_condition_notification_embed_en_US.ftl

@@ -1,9 +1,15 @@
 {
-  <#include "abstracto_color">,
-  "metaConfig" : {
-    "preventEmptyEmbed": "true",
-    "ephemeral": true
-  },
-  <#assign model=templateModel/>
-  "description": "<@safe_include "${templateName}"/>"
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            <#assign model=templateModel/>
+            "description": "<@safe_include "${templateName}"/>"
+        }
+    ],
+    "messageConfig": {
+        "ephemeral": true
+    }
 }

abstracto-modules/assignable-roles/src/main/resources/en_US/exception/assignable_role_booster_place_member_not_boosting_exception_en_US.ftl

@@ -1 +1 @@
-<#include "assignable_role_booster_place_member_not_boosted_exception_message">
+<#include "assignable_role_booster_place_member_not_boosting_exception_message">

abstracto-modules/assignable-roles/src/main/resources/en_US/listener/assignableButtonClickedListener/assignable_role_success_notification_embed_en_US.ftl

@@ -1,15 +1,21 @@
 {
-  <#include "abstracto_color">,
-  "metaConfig" : {
-    "preventEmptyEmbed": "true",
-    "ephemeral": true
-  },
-  <#assign roleText=role.asMention>
-  <#if added>
-  <#assign removedRolesText>${removedRoles?map(role -> role.asMention)?join(", ")}</#assign>
-  "description": "<@safe_include "assignable_role_added_success"/>
-  <#if removedRoles?size gt 0><@safe_include "assignable_role_added_roles_removed"/></#if>"
-  <#else>
-  "description": "<@safe_include "assignable_role_removed_success"/>"
-  </#if>
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            <#assign roleText=role.asMention>
+            <#if added>
+            <#assign removedRolesText>${removedRoles?map(role -> role.asMention)?join(", ")}</#assign>
+            "description": "<@safe_include "assignable_role_added_success"/>
+            <#if removedRoles?size gt 0><@safe_include "assignable_role_added_roles_removed"/></#if>"
+            <#else>
+            "description": "<@safe_include "assignable_role_removed_success"/>"
+            </#if>
+        }
+    ],
+    "messageConfig": {
+     "ephemeral": true
+    }
 }

abstracto-modules/assignable-roles/src/main/resources/en_US/messages/assignable_roles_post_embed_en_US.ftl

@@ -1,22 +1,26 @@
 {
-  <#include "assignable_place_color">,
-  "description": "${placeDescription?json_string}"
-  <#if roles?size gt 0>
-   ,"buttons": [
-   <#list roles as role>
-      {
-          "label": "${role.description?json_string}",
-          "id": "${role.componentId}",
-          "buttonStyle": "secondary",
-          <#if role.emoteMarkDown??>
-          "emoteMarkdown": "${role.emoteMarkDown?json_string}",
-          </#if>
-          "metaConfig": {
-              "persistCallback": false
-          }
-      }
-      <#sep>,
+    "embeds": [
+        {
+            <#include "assignable_place_color">,
+            "description": "${placeDescription?json_string}"
+        }
+    ]
+    <#if roles?size gt 0>
+    ,"buttons": [
+    <#list roles as role>
+        {
+           "label": "${role.description?json_string}",
+           "id": "${role.componentId}",
+           "buttonStyle": "secondary",
+           <#if role.emoteMarkDown??>
+           "emoteMarkdown": "${role.emoteMarkDown?json_string}",
+           </#if>
+           "metaConfig": {
+               "persistCallback": false
+           }
+        }
+    <#sep>,
     </#list>
     ]
-  </#if>
+    </#if>
 }

abstracto-modules/core/pom.xml

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

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

@@ -0,0 +1 @@
+<#macro default_template_if_null value="" template_key=""><#if value?has_content>${value}<#else><#include "${template_key}"></#if></#macro>

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

@@ -0,0 +1,8 @@
+<#macro format_instant instant><t:${instant.epochSecond?c}></#macro>
+<#macro format_instant_time instant><t:${instant.epochSecond?c}:t></#macro>
+<#macro format_instant_long_time instant><t:${instant.epochSecond?c}:T></#macro>
+<#macro format_instant_date instant><t:${instant.epochSecond?c}:d></#macro>
+<#macro format_instant_long_date instant><t:${instant.epochSecond?c}:D></#macro>
+<#macro format_instant_date_time instant><t:${instant.epochSecond?c}:f></#macro>
+<#macro format_instant_long_date_time instant><t:${instant.epochSecond?c}:F></#macro>
+<#macro format_instant_relative instant><t:${instant.epochSecond?c}:R></#macro>

abstracto-modules/core/src/main/resources/en_US/command/command_aborted_notification_embed_en_US.ftl

@@ -0,0 +1,14 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            "description": "<@safe_include "command_aborted_notification_text"/>"
+        }
+    ],
+    "messageConfig": {
+        "ephemeral": true
+    }
+}

abstracto-modules/core/src/main/resources/en_US/command/command_confirmation_message_embed_en_US.ftl

@@ -0,0 +1,27 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign text><#include "${commandName}_confirmation"></#assign>
+            "description": "${text?json_string}"
+        }
+    ],
+    "buttons": [
+      {
+          "label": "<@safe_include "command_confirmation_message_confirm_field_title"/>",
+          "id": "${confirmButtonId}",
+          "buttonStyle": "secondary",
+          "metaConfig": {
+              "persistCallback": false
+          }
+      },
+      {
+        "label": "<@safe_include "command_confirmation_message_abort_field_title"/>",
+        "id": "${abortButtonId}",
+        "buttonStyle": "secondary",
+        "metaConfig": {
+            "persistCallback": false
+        }
+      }
+    ]
+}

abstracto-modules/core/src/main/resources/en_US/commands/disableFeature/disableFeature_all_features_response_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<#assign featureString>${features?join(", ")}</#assign><#include "disableFeature_available_features_text">"
+        }
+    ]
+}

abstracto-modules/core/src/main/resources/en_US/commands/disableFeature/disableFeature_feature_dependencies_response_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<#assign featureString>${features?join(", ")}</#assign><#include "disableFeature_feature_dependencies_text">"
+        }
+    ]
+}

abstracto-modules/core/src/main/resources/en_US/commands/disableFeature/disable_features_response_en_US.ftl

@@ -1 +0,0 @@
-<#assign featureString>${features?join(", ")}</#assign><#include "disable_available_features">

abstracto-modules/core/src/main/resources/en_US/commands/documentation/documentation_response_embed_en_US.ftl

@@ -1,4 +1,8 @@
 {
-  <#include "abstracto_color">,
-  "description": "<@safe_include "documentation_response_embed_description"/>"
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<@safe_include "documentation_response_embed_description"/>"
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_all_features_response_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<#assign featureString>${features?join(", ")}</#assign><#include "enableFeature_available_features_text">"
+        }
+    ]
+}

abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_feature_dependencies_response_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<#assign featureString>${features?join(", ")}</#assign><#include "enableFeature_feature_dependencies_text">"
+        }
+    ]
+}

abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enable_features_response_en_US.ftl

@@ -1 +0,0 @@
-<#assign featureString>${features?join(", ")}</#assign><#include "enable_available_features">

abstracto-modules/core/src/main/resources/en_US/commands/featureModes/feature_modes_response_embed_en_US.ftl

@@ -1,9 +1,11 @@
 {
-  "title": {
-    "title": "<@safe_include "feature_modes_embed_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "feature_modes_embed_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "
 <#list featureModes as featureMode>
 <#assign featureName><@safe_include "feature_${featureMode.featureConfig.feature.key}"/></#assign>
 <#assign featureKey=featureMode.featureConfig.feature.key>
@@ -15,4 +17,6 @@
 
 <#else><@safe_include "feature_modes_embed_no_feature_modes_available"/></#list>
 "
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/features/features_response_embed_en_US.ftl

@@ -1,9 +1,11 @@
 {
-  "title": {
-    "title": "<@safe_include "features_embed_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "features_embed_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "
 <#list features as feature>
 ${feature.featureFlag.enabled?string('✅', '❌')} **<@safe_include "feature_${feature.featureConfig.feature.key}"/>** <@safe_include "features_embed_key"/>: `${feature.featureConfig.feature.key}`
 </#list>
@@ -11,4 +13,6 @@ ${feature.featureFlag.enabled?string('✅', '❌')} **<@safe_include "feature_${
 ${defaultFeature.featureFlagProperty.enabled?string('✅', '❌')} **<@safe_include "feature_${defaultFeature.featureConfig.feature.key}"/>** <@safe_include "features_embed_key"/>: `${defaultFeature.featureConfig.feature.key}` (<@safe_include "features_default_marker"/>)
 </#list>
 "
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/help/help_command_details_response_embed_en_US.ftl

@@ -1,9 +1,11 @@
 {
-  "title": {
-    "title": "<@safe_include "help_command_embed_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "<@safe_include "help_command_embed_command_name"/>: **${command.name?json_string}**
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "help_command_embed_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "<@safe_include "help_command_embed_command_name"/>: **${command.name?json_string}**
 <@safe_include "help_command_embed_command_description"/>: <#if command.templated> <@safe_include "${command.name}_description"/> <#else> ${command.description?json_string} </#if>
 
 <#if command.help??>
@@ -67,5 +69,7 @@
 <#else>
 <@safe_include "help_command_embed_command_no_parameters"/>
 </#if>
-  "
+"
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_details_response_embed_en_US.ftl

@@ -1,19 +1,23 @@
 {
-  "title": {
-    <#assign name=module.moduleDefinition.info.name/>
-    "title": "<@safe_include "help_module_embed_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "
-       <@safe_include "help_module_embed_module_name"/>: **${name?json_string}**
-       <@safe_include "help_module_embed_module_description"/>: <#if module.moduleDefinition.info.templated?? && module.moduleDefinition.info.templated><@safe_include "module_${name}_description"/><#else>${module.moduleDefinition.info.description?json_string}</#if>
-       <@safe_include "help_module_embed_commands"/>:
-       <#list module.commands as command>`${command.configuration.name?json_string}`<#sep>, <#else><@safe_include "help_module_no_commands_available"/></#list>
-       <#if subModules?has_content && subModules?size gt 0>
-       <@safe_include "help_module_embed_sub_modules"/>: <#list subModules as module>`${module.info.name?json_string}`<#sep>, </#list>
-       </#if>
-  ",
-  "footer": {
-       "text": "<@safe_include "help_command_embed_hint_footer"/>"
-   }
+    "embeds": [
+        {
+            "title": {
+                <#assign name=module.moduleDefinition.info.name/>
+                "title": "<@safe_include "help_module_embed_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "
+<@safe_include "help_module_embed_module_name"/>: **${name?json_string}**
+<@safe_include "help_module_embed_module_description"/>: <#if module.moduleDefinition.info.templated?? && module.moduleDefinition.info.templated><@safe_include "module_${name}_description"/><#else>${module.moduleDefinition.info.description?json_string}</#if>
+<@safe_include "help_module_embed_commands"/>:
+<#list module.commands as command>`${command.configuration.name?json_string}`<#sep>, <#else><@safe_include "help_module_no_commands_available"/></#list>
+<#if subModules?has_content && subModules?size gt 0>
+<@safe_include "help_module_embed_sub_modules"/>: <#list subModules as module>`${module.info.name?json_string}`<#sep>, </#list>
+</#if>
+",
+            "footer": {
+                "text": "<@safe_include "help_command_embed_hint_footer"/>"
+            }
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_overview_response_embed_en_US.ftl

@@ -1,15 +1,19 @@
 {
-  "title": {
-    "title": "<@safe_include "help_modules_embed_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "
-       <#list modules as module><#assign module=module/>
-       **${module.info.name?json_string}**
-       <#if module.info.templated?? && module.info.templated><@safe_include "module_${module.info.name}_description"/><#else>${module.info.description?json_string}</#if>
-       </#list>
-  ",
-  "footer": {
-    "text": "<@safe_include "help_modules_embed_footer_hint"/>"
-  }
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "help_modules_embed_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "
+<#list modules as module><#assign module=module/>
+**${module.info.name?json_string}**
+<#if module.info.templated?? && module.info.templated><@safe_include "module_${module.info.name}_description"/><#else>${module.info.description?json_string}</#if>
+</#list>
+",
+            "footer": {
+                "text": "<@safe_include "help_modules_embed_footer_hint"/>"
+            }
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl

@@ -1,20 +1,25 @@
 {
-  "title": {
-    "title": "<@safe_include "listChannelGroups_embed_title"/>"
-  },
-  <#include "success_color">,
-  <#if groups?size = 0>
-  "description": "<@safe_include "listChannelGroups_no_channel_group"/>",
-  </#if>
-  "fields": [
-     <#list groups as group>
+    "embeds": [
         {
-            "name": "${group.name?json_string} (<@safe_include "channel_group_type_${group.typeKey}_name"/> ${group.enabled?string('✅', '❌')})",
-            "value": "
-            <#if group.channelGroupInformation??><#assign model=group.channelGroupInformation.templateModel/> <@safe_include "${group.channelGroupInformation.templateName}"/></#if>
-            <#list group.channels as channel><#if channel.discordChannel??>${channel.discordChannel.asMention?json_string}<#else>${channel.channel.id?c}</#if><#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/></#list>
-            "
-        }<#sep>,
-     </#list>
-  ]
+            "title": {
+                "title": "<@safe_include "listChannelGroups_embed_title"/>"
+            },
+            <#include "success_color">,
+            <#if groups?size = 0>
+            "description": "<@safe_include "listChannelGroups_no_channel_group"/>"
+            <#else>
+            "fields": [
+             <#list groups as group>
+                {
+                    "name": "${group.name?json_string} (<@safe_include "channel_group_type_${group.typeKey}_name"/> ${group.enabled?string('✅', '❌')})",
+                    "value": "
+                    <#if group.channelGroupInformation??><#assign model=group.channelGroupInformation.templateModel/> <@safe_include "${group.channelGroupInformation.templateName}"/></#if>
+                    <#list group.channels as channel><#if channel.discordChannel??>${channel.discordChannel.asMention?json_string}<#else>${channel.channel.id?c}</#if><#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/></#list>
+                    "
+                }<#sep>,
+             </#list>
+            ]
+            </#if>
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/posttarget/posttarget_show_targets_embed_en_US.ftl

@@ -1,11 +1,14 @@
 {
-  "title": {
-    "title": "<@safe_include "posttarget_embed_title"/>"
-  },
-  <#include "success_color">,
-  "description": "
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "posttarget_embed_title"/>"
+            },
+            <#include "success_color">,
+            "description": "
 <#list postTargets as postTarget><#assign postTarget=postTarget/>
 <#assign postTargetName>${postTarget.postTarget.name?json_string}</#assign>
+<#assign statusIndicator>${postTarget.disabled?string('❌', '✅')}</#assign>
 <#assign channelMention><#if postTarget.channel?has_content>${postTarget.channel.asMention?json_string}<#else><@safe_include "posttarget_no_channel"/></#if></#assign>
 <@safe_include "posttarget_post_target_text"/>
 
@@ -13,4 +16,6 @@
 <@safe_include "posttarget_no_post_targets_found"/>
 </#list>
 "
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/showEffects/showEffects_response_embed_en_US.ftl

@@ -1,8 +1,12 @@
 {
-  <#include "abstracto_color">,
-  "description": "
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "
 <#list effects as effect>
 `${effect}` <@safe_include "effect_type_${effect}_description"/>
 </#list>
 "
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/showProfanityConfig/showProfanityConfig_response_embed_en_US.ftl

@@ -1,6 +1,8 @@
 {
-  <#include "success_color">,
-  "description": "
+    "embeds": [
+        {
+            <#include "success_color">,
+            "description": "
 <#list profanityGroups as profanityGroup><#assign profanityGroup=profanityGroup/>
 <#assign profanityGroupName>${profanityGroup.groupName?json_string}</#assign>
 <@safe_include "showProfanityConfig_group_description"/>
@@ -16,4 +18,6 @@
 <@safe_include "showProfanityConfig_no_profanity_groups"/>
 </#list>
 "
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/commands/uptime/uptime_response_embed_en_US.ftl

@@ -1,9 +1,13 @@
 {
-  <#include "abstracto_color">,
-  <#assign uptime>${fmtDuration(uptime)}</#assign>
-  "description": "${uptime}",
-  "footer": {
-    "text": "<@safe_include "uptime_response_embed_start_date_field_title"/>"
-  },
-  "timeStamp": "${startDate}"
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign uptime>${fmtDuration(uptime)}</#assign>
+            "description": "${uptime}",
+            "footer": {
+                "text": "<@safe_include "uptime_response_embed_start_date_field_title"/>"
+            },
+            "timeStamp": "${startDate}"
+        }
+    ]
 }

abstracto-modules/core/src/main/resources/en_US/condition/generic_condition_notification_embed_en_US.ftl

@@ -1,10 +1,14 @@
 {
-  <#include "member_author">
-  <@member_author member=guildChannelMember.member/>,
-  <#include "warning_color">,
-  "metaConfig" : {
-    "preventEmptyEmbed": "true"
-  },
-  <#assign model=conditionDetail.templateModel/>
-  "description": "<@safe_include "${conditionDetail.templateName}"/>"
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=guildChannelMember.member/>,
+            <#include "warning_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            <#assign model=conditionDetail.templateModel/>
+            "description": "<@safe_include "${conditionDetail.templateName}"/>"
+        }
+    ]
 }

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

@@ -1,26 +1,30 @@
 {
-  <#include "member_author">
-  <#if user?has_content>
-  <@member_author member=user.member/>,
-  <#else>
-  "author":
-    {
-        "name": "${fullUser.user.name?json_string}#${fullUser.user.discriminator}",
-        "avatar":  "${fullUser.user.effectiveAvatarUrl}"
-    },
-  </#if>
-  <#include "exception_color">,
-  "metaConfig" : {
-    "preventEmptyEmbed": "true"
-  },
-  <#if template?has_content>
-  <#if template.templateModel?has_content>
-    <#assign model=template.templateModel/>
-    "description": "<@safe_include "${template.templateName}"/>"
-  </#if>
-  <#elseif throwable.localizedMessage?has_content>
-  "description": "${throwable.localizedMessage?json_string}"
-  <#else>
-  "description": "${throwable.class.simpleName?json_string}"
-  </#if>
+    "embeds": [
+        {
+            <#include "member_author">
+            <#if user?has_content>
+            <@member_author member=user.member/>,
+            <#else>
+            "author":
+            {
+                "name": "${fullUser.user.name?json_string}#${fullUser.user.discriminator}",
+                "avatar":  "${fullUser.user.effectiveAvatarUrl}"
+            },
+            </#if>
+            <#include "exception_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            <#if template?has_content>
+            <#if template.templateModel?has_content>
+            <#assign model=template.templateModel/>
+            "description": "<@safe_include "${template.templateName}"/>"
+            </#if>
+            <#elseif throwable.localizedMessage?has_content>
+            "description": "${throwable.localizedMessage?json_string}"
+            <#else>
+            "description": "${throwable.class.simpleName?json_string}"
+            </#if>
+        }
+    ]
 }

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

@@ -1,20 +1,25 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "exception_color">,
-  "metaConfig" : {
-    "preventEmptyEmbed": "true",
-    "ephemeral": true
-  },
-  <#assign effectiveTemplate=template>
-  <#if effectiveTemplate?has_content>
-  <#if effectiveTemplate.templateModel?has_content>
-    <#assign model=effectiveTemplate.templateModel/>
-    "description": "<@safe_include "${effectiveTemplate.templateName}"/>"
-  </#if>
-  <#elseif throwable.localizedMessage?has_content>
-  "description": "${throwable.localizedMessage?json_string}"
-  <#else>
-  "description": "${throwable.class.simpleName?json_string}"
-  </#if>
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "exception_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+            <#if template?has_content>
+            <#if template.templateModel?has_content>
+            <#assign model=template.templateModel/>
+            "description": "<@safe_include "${template.templateName}"/>"
+            </#if>
+            <#elseif throwable.localizedMessage?has_content>
+            "description": "${throwable.localizedMessage?json_string}"
+            <#else>
+            "description": "${throwable.class.simpleName?json_string}"
+            </#if>
+        }
+    ],
+    "messageConfig": {
+        "ephemeral": true
+    }
 }

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

@@ -0,0 +1,2 @@
+<#assign postTargetKey=model.postTargetKey>
+<#include "post_target_not_usable_exception_text">

abstracto-modules/core/src/main/resources/en_US/general/paginator/paginator_buttons_en_US.ftl

@@ -0,0 +1,60 @@
+{
+    "label": "<@safe_include "paginator_exit_button_label"/>",
+    "id": "${exitButtonId}",
+    "buttonStyle": "secondary",
+    "emoteMarkdown": "⏹️",
+    "metaConfig": {
+      "persistCallback": false
+    }
+}
+<#if !exitOnly>
+,
+{
+    "label": "<@safe_include "paginator_start_button_label"/>",
+    "id": "${startButtonId}",
+    "buttonStyle": "secondary",
+    <#if counter = 0>
+        "disabled": true,
+    </#if>
+    "emoteMarkdown": "⏮",
+    "metaConfig": {
+      "persistCallback": false
+    }
+},
+{
+    "label": "<@safe_include "paginator_previous_button_label"/>",
+    "id": "${previousButtonId}",
+    "buttonStyle": "secondary",
+    <#if counter = 0>
+        "disabled": true,
+    </#if>
+    "emoteMarkdown": "◀️",
+    "metaConfig": {
+        "persistCallback": false
+    }
+},
+{
+    "label": "<@safe_include "paginator_next_button_label"/>",
+    "id": "${nextButtonId}",
+    "buttonStyle": "secondary",
+    <#if counter = chunks?size -1>
+        "disabled": true,
+    </#if>
+    "emoteMarkdown": "▶",
+    "metaConfig": {
+        "persistCallback": false
+    }
+},
+{
+     "label": "<@safe_include "paginator_last_button_label"/>",
+     "id": "${lastButtonId}",
+     "buttonStyle": "secondary",
+     <#if counter = chunks?size -1>
+         "disabled": true,
+     </#if>
+     "emoteMarkdown": "⏭",
+     "metaConfig": {
+         "persistCallback": false
+     }
+}
+</#if>

abstracto-modules/core/src/main/resources/en_US/general/paginator/paginator_footer_en_US.ftl

@@ -0,0 +1,3 @@
+<#assign page=page>
+<#assign pageCount=pageCount>
+<#include "paginator_footer_text">

abstracto-modules/entertainment/pom.xml

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

abstracto-modules/entertainment/src/main/resources/en_US/commands/choose/choose_response_embed_en_US.ftl

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

abstracto-modules/entertainment/src/main/resources/en_US/commands/loveCalc/loveCalc_response_embed_en_US.ftl

@@ -1,11 +1,15 @@
 {
- "color" : {
-     "r": 31,
-     "g": 35,
-     "b": 122
- },
-  <#assign first=firstPart>
-  <#assign second=secondPart>
-  <#assign chance=rolled>
-  "description": "<@safe_include "loveCalc_response_embed_description"/>"
+    "embeds": [
+        {
+            "color" : {
+                 "r": 31,
+                 "g": 35,
+                 "b": 122
+            },
+            <#assign first=firstPart>
+            <#assign second=secondPart>
+            <#assign chance=rolled>
+            "description": "<@safe_include "loveCalc_response_embed_description"/>"
+        }
+    ]
 }

abstracto-modules/entertainment/src/main/resources/en_US/commands/mock/mock_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
-  <#include "abstracto_color">,
-  <#assign mockingText=mockingText>
-  <#assign originalText=originalText>
-  "description": "<@safe_include "mock_response_text"/>",
-  "thumbnail": "https://i.imgur.com/upItEiG.jpg"
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign mockingText=mockingText>
+            <#assign originalText=originalText>
+            "description": "<@safe_include "mock_response_text"/>",
+            "thumbnail": "https://i.imgur.com/upItEiG.jpg"
+        }
+    ]
 }

abstracto-modules/experience-tracking/pom.xml

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

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

@@ -1,20 +1,24 @@
 {
-<#macro userDisplay user>
-  [${user.rank}] -> <#if user.member?has_content>**<@member_user_name member=user.member/>**<#else>${user.userId?c}</#if>
-  <@safe_include "leaderboard_experience_column"/>: ${user.experience} | <@safe_include "leaderboard_level_column"/>: ${user.level} | <@safe_include "leaderboard_messages_column"/>:  ${user.messageCount}
-</#macro>
-  <#include "success_color">,
-  "description": "
-        <@safe_include "leaderboard_rank_column"/> | <@safe_include "leaderboard_name_column"/> | <@safe_include "leaderboard_experience_column"/> | <@safe_include "leaderboard_level_column"/> | <@safe_include "leaderboard_messages_column"/>
-       <#list userExperiences as user>
-            <@userDisplay user=user />
+    "embeds": [
+        {
+            <#macro userDisplay user>
+            [${user.rank}] -> <#if user.member?has_content>**<@member_user_name member=user.member/>**<#else>${user.userId?c}</#if>
+            <@safe_include "leaderboard_experience_column"/>: ${user.experience} | <@safe_include "leaderboard_level_column"/>: ${user.level} | <@safe_include "leaderboard_messages_column"/>:  ${user.messageCount}
+            </#macro>
+            <#include "success_color">,
+            "description": "
+<@safe_include "leaderboard_rank_column"/> | <@safe_include "leaderboard_name_column"/> | <@safe_include "leaderboard_experience_column"/> | <@safe_include "leaderboard_level_column"/> | <@safe_include "leaderboard_messages_column"/>
+<#list userExperiences as user>
+<@userDisplay user=user />
 
-       </#list>
+</#list>
 
-       <@safe_include "leaderboard_own_placement"/>:
-       <@userDisplay user=userExecuting />
-  ",
-  "footer": {
-      "text": "<@safe_include "leaderboard_footer"/>"
-  }
+<@safe_include "leaderboard_own_placement"/>:
+<@userDisplay user=userExecuting />
+",
+            "footer": {
+                "text": "<@safe_include "leaderboard_footer"/>"
+            }
+        }
+    ]
 }

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/levelRoles/levelRoles_response_embed_en_US.ftl

@@ -1,5 +1,9 @@
 {
-  <#include "success_color">,
-  "description": "<#list levelRoles as role><#if role.role??><#assign roleRepr=role.role.asMention><#else><#assign roleRepr=role.roleId?c></#if><#assign levelRepr=role.level><@safe_include "levelRoles_response_description"/><#sep>
-  <#else><@safe_include "levelRoles_no_roles_found"/></#list>"
+    "embeds": [
+        {
+            <#include "success_color">,
+            "description": "<#list levelRoles as role><#if role.role??><#assign roleRepr=role.role.asMention><#else><#assign roleRepr=role.roleId?c></#if><#assign levelRepr=role.level><@safe_include "levelRoles_response_description"/><#sep>
+<#else><@safe_include "levelRoles_no_roles_found"/></#list>"
+        }
+    ]
 }

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/listDisabledExperienceRoles/list_disabled_experience_roles_embed_en_US.ftl

@@ -1,15 +1,19 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  "title": {
-    "title": "<@safe_include "list_disabled_experience_roles_embed_title"/>"
-  },
-  <#include "success_color">,
-  "description": "
-    <#list roles as role>
-    ${role.role.asMention?json_string}
-    <#else>
-    <@safe_include "list_disabled_experience_roles_embed_no_roles"/>
-    </#list>
-  "
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            "title": {
+                "title": "<@safe_include "list_disabled_experience_roles_embed_title"/>"
+            },
+            <#include "success_color">,
+            "description": "
+<#list roles as role>
+${role.role.asMention?json_string}
+<#else>
+<@safe_include "list_disabled_experience_roles_embed_no_roles"/>
+</#list>
+"
+        }
+    ]
 }

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl

@@ -1,32 +1,36 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "success_color">,
-  "fields": [
-    {
-        "name": "<@safe_include "rank_xp_field_title"/>",
-        "value": "${rankUser.experience}",
-        "inline": "true"
-    },
-    {
-        "name": "<@safe_include "rank_level_field_title"/>",
-        "value": "${rankUser.level}",
-        "inline": "true"
-    },
-    {
-        "name": "<@safe_include "rank_messages_field_title"/>",
-        "value": "${rankUser.messageCount}",
-        "inline": "true"
-    },
-    {
-        "name": "<@safe_include "rank_to_next_level_field_title"/>",
-        "value": "${experienceToNextLevel}",
-        "inline": "true"
-    },
-    {
-        "name": "<@safe_include "rank_rank_field_title"/>",
-        "value": "${rankUser.rank}",
-        "inline": "true"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "success_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "rank_xp_field_title"/>",
+                    "value": "${rankUser.experience}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "rank_level_field_title"/>",
+                    "value": "${rankUser.level}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "rank_messages_field_title"/>",
+                    "value": "${rankUser.messageCount}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "rank_to_next_level_field_title"/>",
+                    "value": "${experienceToNextLevel}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "rank_rank_field_title"/>",
+                    "value": "${rankUser.rank}",
+                    "inline": "true"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/invite-filter/pom.xml

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

abstracto-modules/invite-filter/src/main/resources/en_US/command/showTrackedInviteLinks/showTrackedInviteLinks_response_embed_en_US.ftl

@@ -1,11 +1,15 @@
 {
-  "title": {
-   "title": "<@safe_include "tracked_invite_links_embed_title"/>"
-  },
-  <#include "success_color">,
-  "description": "<#list inviteLinks as link><#assign link=link/>
-  <#assign linkText>${link.serverName}</#assign>
-  <#assign linkUses>${link.uses}</#assign>
-  <@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
-  </#list>"
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "tracked_invite_links_embed_title"/>"
+            },
+            <#include "success_color">,
+            "description": "<#list inviteLinks as link><#assign link=link/>
+<#assign linkText>${link.serverName}</#assign>
+<#assign linkUses>${link.uses}</#assign>
+<@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
+</#list>"
+        }
+    ]
 }

abstracto-modules/invite-filter/src/main/resources/en_US/listener/invite_link_deleted/invite_link_deleted_notification_embed_en_US.ftl

@@ -1,17 +1,21 @@
 {
-  <#include "member_author">
-  <@member_author member=author/>,
-  <#assign authorMention=author.asMention>
-  "description": "<@safe_include "invite_link_deleted_embed_description"/>",
-  <#include "abstracto_color"/>,
-  "fields": [
-    {
-      "name": "<@safe_include "invite_link_deleted_invite_field_header"/>",
-      "value": "<#list invites as invite><#if invite.count gt 1>${invite.count}x </#if>${invite.code}<#sep>, </#list>"
-    },
-    {
-        "name": "<@safe_include "invite_link_deleted_message_link_title"/>",
-        "value": "[${channel.name?json_string}](${message.jumpUrl})"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=author/>,
+            <#assign authorMention=author.asMention>
+            "description": "<@safe_include "invite_link_deleted_embed_description"/>",
+            <#include "abstracto_color"/>,
+            "fields": [
+                {
+                  "name": "<@safe_include "invite_link_deleted_invite_field_header"/>",
+                  "value": "<#list invites as invite><#if invite.count gt 1>${invite.count}x </#if>${invite.code}<#if invite.guildName?has_content> (${invite.guildName})</#if><#sep>, </#list>"
+                },
+                {
+                    "name": "<@safe_include "invite_link_deleted_message_link_title"/>",
+                    "value": "[${channel.name?json_string}](${message.jumpUrl})"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/link-embed/pom.xml

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

abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl

@@ -1,57 +1,67 @@
 {
-  <#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>
-  "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"/>"
-    }
-    <#if embeddedMessage.referencedMessage??>
-    ,
-    {
-        <#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"/>"
-    }
-    </#if>
-  ],
-  <#if useButton>
-  "buttons": [
-    {
-        "label": "<@safe_include "message_embed_button_delete"/>",
-        "id": "${buttonConfigModel.buttonId}",
-        "buttonStyle": "danger",
-        "metaConfig": {
-            "persistCallback": false
+    "embeds": [
+        {
+            <#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>
+            "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"/>"
+                }
+                <#if embeddedMessage.referencedMessage??>
+                ,
+                {
+                    <#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"/>"
+                }
+                </#if>
+            ],
+            "timeStamp": "${embeddedMessage.timeCreated}"
         }
+    ]
+     <#if useButton>
+    ,"buttons": [
+        {
+            "label": "<@safe_include "message_embed_button_delete"/>",
+            "id": "${buttonConfigModel.buttonId}",
+            "buttonStyle": "danger",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }
+    ]
+    </#if>
+<#if referencedMessageId?has_content && mentionsReferencedMessage?has_content>
+    ,"referencedMessageId": "${referencedMessageId?c}",
+    "messageConfig": {
+        "mentionsReferencedMessage": ${mentionsReferencedMessage?string('true', 'false')}
     }
-  ],
-  </#if>
-  "timeStamp": "${embeddedMessage.timeCreated}"
+</#if>
 }

abstracto-modules/logging/pom.xml

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

abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl

@@ -1,13 +1,17 @@
 {
-  "imageUrl": "${imageUrl}",
-  <#include "abstracto_color"/>,
-  "fields": [
-  {
-    "name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
-    "value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
-  }
-  ],
-  "footer": {
-    "text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
-  }
+    "embeds": [
+        {
+            "imageUrl": "${imageUrl}",
+            <#include "abstracto_color"/>,
+            "fields": [
+                {
+                    "name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
+                    "value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
+                }
+            ],
+            "footer": {
+                "text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
+            }
+        }
+    ]
 }

abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl

@@ -1,16 +1,20 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  "description": "<@safe_include "messageDeleted_description_text"/>",
-  <#include "abstracto_color"/>,
-  "fields": [
-    {
-      "name": "<@safe_include "messageDeleted_original_message_field_title"/>",
-      "value": "${cachedMessage.content?json_string}"
-    },
-    {
-        "name": "<@safe_include "messageDeleted_message_link_field_title"/>",
-        "value": "[${channel.name?json_string}](${cachedMessage.messageUrl})"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            "description": "<@safe_include "messageDeleted_description_text"/>",
+            <#include "abstracto_color"/>,
+            "fields": [
+                {
+                    "name": "<@safe_include "messageDeleted_original_message_field_title"/>",
+                    "value": "${cachedMessage.content?json_string}"
+                },
+                {
+                    "name": "<@safe_include "messageDeleted_message_link_field_title"/>",
+                    "value": "[${channel.name?json_string}](${cachedMessage.messageUrl})"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/logging/src/main/resources/en_US/listener/message_edited/message_edited_attachment_removed_embed_en_US.ftl

@@ -1,14 +1,18 @@
 {
-  "imageUrl": "${imageUrl}",
-  <#include "abstracto_color"/>,
-  "description": "<@safe_include "messageEdited_attachment_removed_description"/>",
-  "fields": [
-  {
-    "name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
-    "value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
-  }
-  ],
-  "footer": {
-    "text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
-  }
+    "embeds": [
+        {
+            "imageUrl": "${imageUrl}",
+            <#include "abstracto_color"/>,
+            "description": "<@safe_include "messageEdited_attachment_removed_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
+                    "value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
+                }
+            ],
+            "footer": {
+                "text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
+            }
+        }
+    ]
 }

abstracto-modules/logging/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl

@@ -1,20 +1,24 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "abstracto_color"/>,
-  "description": "<@safe_include "messageEdited_description_text"/>",
-  "fields": [
-    {
-      "name": "<@safe_include "messageEdited_original_message_field_title"/>",
-      "value": "${messageBefore.content?json_string}"
-    },
-    {
-          "name": "<@safe_include "messageEdited_new_message_field_title"/>",
-          "value": "${messageAfter.contentRaw?json_string}"
-    },
-    {
-        "name": "<@safe_include "messageEdited_link_field_title"/>",
-        "value": "[${messageChannel.name?json_string}](${messageBefore.messageUrl})"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "abstracto_color"/>,
+            "description": "<@safe_include "messageEdited_description_text"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "messageEdited_original_message_field_title"/>",
+                    "value": "${messageBefore.content?json_string}"
+                },
+                {
+                    "name": "<@safe_include "messageEdited_new_message_field_title"/>",
+                    "value": "${messageAfter.contentRaw?json_string}"
+                },
+                {
+                    "name": "<@safe_include "messageEdited_link_field_title"/>",
+                    "value": "[${messageChannel.name?json_string}](${messageBefore.messageUrl})"
+                }
+            ]
+        }
+    ]
 }

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

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

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

@@ -1,5 +1,9 @@
 {
-<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
-  "description": "<@safe_include "user_left_text"/>",
-  <#include "abstracto_color"/>
+    "embeds": [
+        {
+            <#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
+            "description": "<@safe_include "user_left_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.2.17</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.2.17</version>
+    <version>1.3.3-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

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

@@ -1,26 +1,37 @@
 {
-  <#include "user_detail">
-  <#include "full_member_info">
-  "title": {
-    "title": "<@safe_include "ban_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-      "value": "<@user_detail user=bannedUser/>"
-    },
-    {
-        "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-        "value": "<@full_member_info member=banningMember/>"
-    },
-    {
-        "name": "<@safe_include "ban_log_jump_link_field_title"/>",
-        "value": "[${commandMessage.channel.name?json_string}](${commandMessage.jumpUrl})"
-    },
-    {
-        "name": "<@safe_include "ban_log_reason_field_title"/>",
-        "value": "${reason?json_string}"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "user_detail">
+            <#include "full_member_info">
+            "title": {
+                "title": "<@safe_include "ban_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "ban_log_banned_user_field_title"/>",
+                    "value": "<@user_detail user=bannedUser/>"
+                },
+                {
+                    "name": "<@safe_include "ban_log_banning_user_field_title"/>",
+                    "value": "<@full_member_info member=banningMember/>"
+                },
+                {
+                    "name": "<@safe_include "ban_log_jump_link_field_title"/>",
+                    "value": "[${commandMessage.channel.name?json_string}](${commandMessage.jumpUrl})"
+                },
+                {
+                    "name": "<@safe_include "ban_log_reason_field_title"/>",
+                    "value": "${reason?json_string}"
+                }
+                <#if deletionDays gt 0>
+                ,
+                {
+                    "name": "<@safe_include "ban_log_deletion_days_field_title"/>",
+                    "value": "${deletionDays?c}"
+                }
+                </#if>
+            ]
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl

@@ -1,27 +1,31 @@
 {
-  <#include "full_member_info">
-  <#include "member_author">
-  <@member_author member=kickedUser/>,
-  "title": {
-    "title": "<@safe_include "kick_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "kick_log_kicked_user_field_title"/>",
-      "value": "<@full_member_info member=kickedUser/>"
-    },
-    {
-        "name": "<@safe_include "kick_log_kicking_user_field_title"/>",
-        "value": "<@full_member_info member=member/>"
-    },
-    {
-        "name": "<@safe_include "kick_log_jump_link_field_title"/>",
-        "value": "[${channel.name?json_string}](${message.jumpUrl})"
-    },
-    {
-        "name": "<@safe_include "kick_log_reason_field_title"/>",
-        "value": "${reason?json_string}"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "full_member_info">
+            <#include "member_author">
+            <@member_author member=kickedUser/>,
+            "title": {
+                "title": "<@safe_include "kick_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "kick_log_kicked_user_field_title"/>",
+                    "value": "<@full_member_info member=kickedUser/>"
+                },
+                {
+                    "name": "<@safe_include "kick_log_kicking_user_field_title"/>",
+                    "value": "<@full_member_info member=member/>"
+                },
+                {
+                    "name": "<@safe_include "kick_log_jump_link_field_title"/>",
+                    "value": "[${channel.name?json_string}](${message.jumpUrl})"
+                },
+                {
+                    "name": "<@safe_include "kick_log_reason_field_title"/>",
+                    "value": "${reason?json_string}"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl

@@ -1,27 +1,32 @@
+<#include "format_instant">
 {
-  "author": {
-  <#if specifiedUser??>
-    "name": "<@member_user_name member=specifiedUser.member/>",
-    "avatar": "${specifiedUser.member.user.effectiveAvatarUrl}"
-  <#else>
-   "name": "<@member_user_name member=member/>",
-   "avatar": "${member.user.effectiveAvatarUrl}"
-  </#if>
-  },
-  "title": {
-  <#if specifiedUser??>
-  <#assign user><@member_user_name member=specifiedUser.member/></#assign>
-   "title": "<@safe_include "user_notes_embed_user_title"/>"
-  <#else>
-   "title": "<@safe_include "user_notes_embed_title"/>"
-  </#if>
-  },
-  <#include "success_color">,
-  "description": "<#list userNotes as note><#assign note=note/>
-  <#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign>
-  <#assign noteText>${note.note.note?json_string}</#assign>
-  <#assign noteId>${note.note.userNoteId.id}</#assign>
-  <#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
-  <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
-  </#list>"
+    "embeds": [
+        {
+            "author": {
+                <#if specifiedUser??>
+                "name": "<@member_user_name member=specifiedUser.member/>",
+                "avatar": "${specifiedUser.member.user.effectiveAvatarUrl}"
+                <#else>
+                "name": "<@member_user_name member=member/>",
+                "avatar": "${member.user.effectiveAvatarUrl}"
+                </#if>
+            },
+            "title": {
+            <#if specifiedUser??>
+            <#assign user><@member_user_name member=specifiedUser.member/></#assign>
+                "title": "<@safe_include "user_notes_embed_user_title"/>"
+            <#else>
+                "title": "<@safe_include "user_notes_embed_title"/>"
+            </#if>
+            },
+            <#include "success_color">,
+            "description": "<#list userNotes as note><#assign note=note/>
+<#assign user><#if note.member.memberMention?has_content>${note.member.memberMention}<#else>${note.member.userId?c}</#if></#assign>
+<#assign noteText>${note.note?json_string}</#assign>
+<#assign noteId>${note.noteId}</#assign>
+<#assign date><@format_instant_date_time instant=note.created/></#assign>
+<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
+</#list>"
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl

@@ -1,39 +1,44 @@
+<#include "full_member_info">
+<#include "format_instant">
+<#include "member_author">
 {
-  <#include "full_member_info">
-  <#include "member_author">
-  <@member_author member=mutedUser/>,
-  "title": {
-    "title": "<@safe_include "mute_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "mute_log_muted_user_field_title"/>",
-      "value": "<@full_member_info member=mutedUser/>"
-    },
-    {
-        "name": "<@safe_include "mute_log_muting_user_field_title"/>",
-        "value": "<@full_member_info member=mutingUser/>"
-    },
-    {
-        "name": "<@safe_include "mute_log_mute_location_field_title"/>",
-        "value": "[${contextChannel.name?json_string}](${message.jumpUrl})"
-    },
-    {
-        "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
-        "value": "${reason?json_string}"
-    },
-    {
-        "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
-        "value": "${fmtDuration(muteDuration)}"
-    },
-    {
-        "name": "<@safe_include "mute_log_muted_until_field_title"/>",
-        "value": "${formatDate(muteTargetDate, "yyyy-MM-dd HH:mm:ss zz")}"
-    }
-  ],
-  "footer": {
-    "text": "<@safe_include "mute_log_mute_id_footer"/>"
-  },
-  "timeStamp": "${muteDate}"
+    "embeds": [
+        {
+            <@member_author member=mutedUser/>,
+            "title": {
+                "title": "<@safe_include "mute_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "mute_log_muted_user_field_title"/>",
+                    "value": "<@full_member_info member=mutedUser/>"
+                },
+                {
+                    "name": "<@safe_include "mute_log_muting_user_field_title"/>",
+                    "value": "<@full_member_info member=mutingUser/>"
+                },
+                {
+                    "name": "<@safe_include "mute_log_mute_location_field_title"/>",
+                    "value": "[${contextChannel.name?json_string}](${message.jumpUrl})"
+                },
+                {
+                    "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
+                    "value": "${reason?json_string}"
+                },
+                {
+                    "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
+                    "value": "${fmtDuration(muteDuration)}"
+                },
+                {
+                    "name": "<@safe_include "mute_log_muted_until_field_title"/>",
+                    "value": "<@format_instant_date_time instant=muteTargetDate/>"
+                }
+            ],
+            "footer": {
+                "text": "<@safe_include "mute_log_mute_id_footer"/>"
+            },
+            "timeStamp": "${muteDate}"
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl

@@ -1,53 +1,57 @@
+<#include "full_member_info">
+<#include "format_instant">
 {
-  <#include "full_member_info">
-  <#if unMutedUser?has_content>
-      <#include "member_author">
-      <@member_author member=unMutedUser/>,
-  </#if>
-  "title": {
-    "title": "<@safe_include "unMute_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
-      <#if unMutedUser?has_content>
-        "value": "<@full_member_info member=unMutedUser/>"
-      <#else>
-        "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
-      </#if>
-
-    },
-    {
-        "name": "<@safe_include "mute_log_muting_user_field_title"/>",
-         <#if mutingUser?has_content>
-            "value": "<@full_member_info member=mutingUser/>"
-         <#else>
-                "value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
-         </#if>
-    },
-    <#if messageUrl??>
-    {
-        "name": "<@safe_include "mute_log_mute_location_field_title"/>",
-        "value": "[Link](${messageUrl})"
-    },
-    </#if>
-    {
-        "name": "<@safe_include "unMute_log_muted_since_field_title"/>",
-        "value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss zz")}"
-    },
-    {
-        "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
-        "value": "${fmtDuration(muteDuration)}"
-    },
-    {
-        "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
-        "value": "${mute.reason?json_string}"
-    }
-  ],
-  "footer": {
-  <#assign muteId=mute.muteId.id/>
-    "text": "<@safe_include "mute_log_mute_id_footer"/>"
-  },
-  "timeStamp": "${unmuteDate}"
+    "embeds": [
+        {
+            <#if unMutedUser?has_content>
+            <#include "member_author">
+            <@member_author member=unMutedUser/>,
+            </#if>
+            "title": {
+                "title": "<@safe_include "unMute_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
+                    <#if unMutedUser?has_content>
+                    "value": "<@full_member_info member=unMutedUser/>"
+                    <#else>
+                    "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "mute_log_muting_user_field_title"/>",
+                    <#if mutingUser?has_content>
+                    "value": "<@full_member_info member=mutingUser/>"
+                    <#else>
+                    "value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
+                    </#if>
+                },
+                <#if messageUrl??>
+                {
+                    "name": "<@safe_include "mute_log_mute_location_field_title"/>",
+                    "value": "[Link](${messageUrl})"
+                },
+                </#if>
+                {
+                    "name": "<@safe_include "unMute_log_muted_since_field_title"/>",
+                    "value": "<@format_instant_date_time instant=mute.muteDate/>"
+                },
+                {
+                    "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
+                    "value": "${fmtDuration(muteDuration)}"
+                },
+                {
+                    "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
+                    "value": "${mute.reason?json_string}"
+                }
+            ],
+            "footer": {
+                <#assign muteId=mute.muteId.id/>
+                "text": "<@safe_include "mute_log_mute_id_footer"/>"
+            },
+            "timeStamp": "${unmuteDate}"
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl

@@ -0,0 +1,11 @@
+{
+<#assign exitOnly=innerModel.mutes?size lt 6/>
+ "embedConfigs": [
+    <#assign chunks=innerModel.mutes?chunk(5)>
+    <#-- we have to separate the chunk, so we can re-use it to disable the last buttons, and also we have to assign the for loop value, -->
+    <#-- so it available in sub templates, also the counter needs to be defined, else it doesnt the detect its a loop variable it seems  -->
+    <#list chunks as row><#assign counter=row?index><#assign row=row><#include "mutes_response_entry"><#sep>,</#list>
+ ],
+ "timeoutSeconds": 120,
+ "restrictUser": true
+}

abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_mute_entry_en_US.ftl

@@ -0,0 +1,10 @@
+<#include "format_instant">
+<#assign muteId>${mute.muteId}</#assign>
+<#assign reason>${mute.reason}</#assign>
+<#assign mutedUserText><#if mute.mutedUser.memberMention??>${mute.mutedUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutedUser.userId?c}</#if></#assign>
+<#assign mutingUserText><#if mute.mutingUser.memberMention??>${mute.mutingUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutingUser.userId?c}</#if></#assign>
+<#assign muteDate><@format_instant_date_time instant=mute.muteDate/></#assign>
+<#assign muteEnded>${mute.muteEnded?string('✅', '❌')}</#assign>
+<#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign>
+
+<#include "mutes_mute_entry_text">

abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_no_mutes_found_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "moderation_action_color">,
+            "description": "<@safe_include "mutes_no_mutes_found_text"/>"
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_response_entry_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/myWarnings/myWarnings_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "success_color">,
-  <#assign userMention><@member_user_name member=member/></#assign>
-  "description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "success_color">,
+            <#assign userMention><@member_user_name member=member/></#assign>
+            "description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
+        }
+    ]
 }

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

@@ -1,18 +1,22 @@
 {
-  <#include "user_detail">
-  <#include "full_member_info">
-  "title": {
-    "title": "<@safe_include "unBan_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
-      "value": "<@user_detail user=bannedUser/>"
-    },
-    {
-        "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
-        "value": "<@full_member_info member=unBanningMember/>"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "user_detail">
+            <#include "full_member_info">
+            "title": {
+                "title": "<@safe_include "unBan_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
+                    "value": "<@user_detail user=bannedUser/>"
+                },
+                {
+                    "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
+                    "value": "<@full_member_info member=unBanningMember/>"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl

@@ -1,32 +1,36 @@
 {
-  <#include "full_member_info">
-  <#include "member_author">
-  <@member_author member=warnedMember/>,
-  "title": {
-    "title": "<@safe_include "warn_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "warn_log_warned_user_field_title"/>",
-      "value": "<@full_member_info member=warnedMember/>"
-    },
-    <#if member?has_content>
-    {
-        "name": "<@safe_include "warn_log_warning_user_field_title"/>",
-        "value": "<@full_member_info member=member/>"
-    },
-    </#if>
-    {
-        "name": "<@safe_include "warn_log_warn_location_field_title"/>",
-        "value": "[${channel.name?json_string}](${message.jumpUrl})"
-    },
-    {
-        "name": "<@safe_include "warn_log_warn_reason_field_title"/>",
-        "value": "${reason?json_string}"
-    }
-  ],
-  "footer": {
-    "text": "<@safe_include "warn_log_warn_id_footer"/> #${warnId}"
-  }
+    "embeds": [
+        {
+            <#include "full_member_info">
+            <#include "member_author">
+            <@member_author member=warnedMember/>,
+            "title": {
+                "title": "<@safe_include "warn_log_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "warn_log_warned_user_field_title"/>",
+                    "value": "<@full_member_info member=warnedMember/>"
+                },
+                <#if member?has_content>
+                {
+                    "name": "<@safe_include "warn_log_warning_user_field_title"/>",
+                    "value": "<@full_member_info member=member/>"
+                },
+                </#if>
+                {
+                    "name": "<@safe_include "warn_log_warn_location_field_title"/>",
+                    "value": "[${channel.name?json_string}](${message.jumpUrl})"
+                },
+                {
+                    "name": "<@safe_include "warn_log_warn_reason_field_title"/>",
+                    "value": "${reason?json_string}"
+                }
+            ],
+            "footer": {
+                "text": "<@safe_include "warn_log_warn_id_footer"/> #${warnId}"
+            }
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_no_warnings_found_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+    "embeds": [
+        {
+            <#include "moderation_action_color">,
+            "description": "<@safe_include "warnings_no_warnings_found_text"/>"
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_entry_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_paginator_en_US.ftl

@@ -1,7 +0,0 @@
-{
-<#assign warnCount>${warnings?size}</#assign>
-  "headerText": "<@safe_include "warnings_header_text"/>",
-   "items": [
-   <#list warnings as warning><#assign warning=warning/>"<@safe_include "warnings_warn_entry"/>"<#sep>,</#list>
-   ]
-}

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl

@@ -1,11 +1,14 @@
-<#assign warnId>${warning.warning.warnId.id}</#assign>
-<#assign reason>${warning.warning.reason}</#assign>
-<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.userId?c}</#if></#assign>
-<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.userId?c}</#if></#assign>
-<#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
+<#include "format_instant">
+<#assign decayed=warning.decayed/>
+<#assign warnId=warning.warnId/>
+<#assign reason=warning.reason/>
+<#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warnedUser.userId?c}</#if></#assign>
+<#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warningUser.userId?c}</#if></#assign>
+<#assign warnDate><@format_instant_date_time instant=warning.warnDate/></#assign>
 
 <#include "warnings_warn_entry_text">
-<#if warning.warning.decayed>
-<#assign decayDate>${formatDate(warning.warning.decayDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
+
+<#if decayed>
+<#assign decayDate><@format_instant_date_time instant=warning.decayDate/></#assign>
  <#include "warnings_warn_is_decayed">
 </#if>

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

@@ -0,0 +1,15 @@
+{
+    "embeds": [
+        {
+            <#include "user_detail">
+            <#include "full_member_info">
+            <#include "moderation_action_color">,
+            <#assign newLevel=newLevel>
+            <#assign oldLevel=oldLevel>
+            <#assign newPoints=newPoints>
+            <#assign oldPoints=oldPoints>
+            <#assign memberMention=member.memberMention>
+            "description" :"<@safe_include "infraction_level_notification_description"/>"
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl

@@ -1,11 +1,15 @@
 {
-  <#include "abstracto_color">,
-  <#assign messageLink=reportedMessage.messageUrl>
-  "description" : "<@safe_include "reactionReport_notification_embed_description"/>",
-  "fields": [
-    {
-      "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
-      "value": "${reportCount}"
-    }
-  ]
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign messageLink=reportedMessage.messageUrl>
+            "description" : "<@safe_include "reactionReport_notification_embed_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
+                    "value": "${reportCount}"
+                }
+            ]
+        }
+    ]
 }

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

@@ -1,25 +1,29 @@
 {
-  <#include "user_detail">
-  <#include "abstracto_color">,
-  "description" : "<@safe_include "userBanned_description"/>",
-  "fields": [
-    {
-      "name": "<@safe_include "userBanned_field_title_banned_user"/>",
-      "value": "<@user_detail user=bannedUser/>"
-    }
-    <#if banningUser??>
-    ,
-    {
-        "name": "<@safe_include "userBanned_field_title_banning_user"/>",
-        "value": "<@user_detail user=banningUser/>"
-    }
-    </#if>
-    <#if reason??>
-    ,
-    {
-        "name": "<@safe_include "userBanned_field_title_reason"/>",
-        "value": "${reason}"
-    }
-    </#if>
-  ]
+    "embeds": [
+        {
+            <#include "user_detail">
+            <#include "abstracto_color">,
+            "description" : "<@safe_include "userBanned_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "userBanned_field_title_banned_user"/>",
+                    "value": "<@user_detail user=bannedUser/>"
+                }
+                <#if banningUser??>
+                ,
+                {
+                    "name": "<@safe_include "userBanned_field_title_banning_user"/>",
+                    "value": "<@user_detail user=banningUser/>"
+                }
+                </#if>
+                <#if reason??>
+                ,
+                {
+                    "name": "<@safe_include "userBanned_field_title_reason"/>",
+                    "value": "${reason}"
+                }
+                </#if>
+            ]
+        }
+    ]
 }

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

@@ -1,18 +1,22 @@
 {
-  <#include "user_detail">
-  <#include "abstracto_color">,
-  "description" : "<@safe_include "userUnBanned_description"/>",
-  "fields": [
-    {
-      "name": "<@safe_include "userUnBanned_field_title_un_banned_user"/>",
-      "value": "<@user_detail user=unBannedUser/>"
-    }
-    <#if unBanningUser??>
-    ,
-    {
-        "name": "<@safe_include "userUnBanned_field_title_un_banning_user"/>",
-        "value": "<@user_detail user=unBanningUser/>"
-    }
-    </#if>
-  ]
+    "embeds": [
+        {
+            <#include "user_detail">
+            <#include "abstracto_color">,
+            "description" : "<@safe_include "userUnBanned_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "userUnBanned_field_title_un_banned_user"/>",
+                    "value": "<@user_detail user=unBannedUser/>"
+                }
+                <#if unBanningUser??>
+                ,
+                {
+                    "name": "<@safe_include "userUnBanned_field_title_un_banning_user"/>",
+                    "value": "<@user_detail user=unBanningUser/>"
+                }
+                </#if>
+            ]
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl

@@ -1,11 +1,16 @@
+<#include "format_instant">
 {
-  "title": {
-    "title": "<@safe_include "warnDecay_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "description": "<#list warnings as warning><#assign warning=warning/>
-        <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
-  <#else>
-  <@safe_include "warnDecay_log_no_warnings"/>
-  </#list>"
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "warnDecay_title"/>"
+            },
+            <#include "moderation_action_color">,
+            "description": "<#list warnings as warning><#assign warning=warning/>
+<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
+<#else>
+<@safe_include "warnDecay_log_no_warnings"/>
+</#list>"
+        }
+    ]
 }

abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_member_notification_embed_en_US.ftl

@@ -1,6 +1,7 @@
+<#include "format_instant">
 {
   <#assign reason=warnReason>
-  <#assign warningDate>${formatDate(warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
+  <#assign warningDate><@format_instant_date_time instant=warnDate/></#assign>
   <#assign remainingWarningsCount=remainingWarningsCount>
   "additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>"
 }

abstracto-modules/modmail/pom.xml

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

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

@@ -1,12 +1,16 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "modmail_color">,
-  "description": "<@safe_include "modmail_thread_already_exists"/>",
-  "fields": [
-     {
-        "name": "<@safe_include "modmail_existing_thread_link_field_title"/>",
-        "value": "[<@safe_include "modmail_existing_thread_link_content_display_text"/>](${threadUrl})"
-     }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "modmail_color">,
+            "description": "<@safe_include "modmail_thread_already_exists"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "modmail_existing_thread_link_field_title"/>",
+                    "value": "[<@safe_include "modmail_existing_thread_link_content_display_text"/>](${threadUrl})"
+                }
+            ]
+        }
+    ]
 }

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

@@ -1,12 +1,16 @@
 {
-  <#include "member_author">
-  <@member_author member=targetMember/>,
-  "description": "<@safe_include "modmail_thread_created_description"/>",
-  <#include "modmail_color">,
-  "fields": [
-     {
-        "name": "<@safe_include "modmail_thread_created_link_field_title"/>",
-        "value": "${createdChannel.asMention}"
-     }
-  ]
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=targetMember/>,
+            "description": "<@safe_include "modmail_thread_created_description"/>",
+            <#include "modmail_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "modmail_thread_created_link_field_title"/>",
+                    "value": "${createdChannel.asMention}"
+                }
+            ]
+        }
+    ]
 }

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

@@ -1,4 +1,8 @@
 {
-  <#include "warning_color">,
-  "description": "<@safe_include "modmail_no_server_available"/>"
+    "embeds": [
+        {
+            <#include "warning_color">,
+            "description": "<@safe_include "modmail_no_server_available"/>"
+        }
+    ]
 }

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

@@ -1,22 +1,26 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  "title": {
-    "title": "<@safe_include "modmail_notification_message_title"/>"
-  },
-  "metaConfig": {
-    "allowsRoleMention": true
-  },
-  <#include "modmail_color">,
-  <#assign user><@member_user_name member=member/>(${member.user.id})</#assign>
-  "description": "<@safe_include "modmail_notification_message_description"/>",
-  "fields": [
+    "embeds": [
         {
-          "name": "<@safe_include "modmail_notification_field_title_channel"/>",
-          "value": "${channel.asMention}"
+            <#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>
+            "description": "<@safe_include "modmail_notification_message_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "modmail_notification_field_title_channel"/>",
+                    "value": "${channel.asMention}"
+                }
+            ]
         }
-      ]
-  <#if roles?size gt 0>
-  ,"additionalMessage": "<#list roles as role>${role.role.asMention?json_string}<#sep>,</#list>"
-  </#if>
+    ],
+    "messageConfig": {
+        "allowsRoleMention": true
+    }
+    <#if roles?size gt 0>
+    ,"additionalMessage": "<#list roles as role>${role.role.asMention?json_string}<#sep>,</#list>"
+    </#if>
 }

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

@@ -1,19 +1,44 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  "title": {
-    "title": "<@safe_include "modmail_thread_user_message_title"/>"
-  },
-  <#include "modmail_color">,
-  <#if postedMessage.contentRaw?has_content>
-    "description": "${postedMessage.contentRaw?json_string}"
-  </#if>
-   <#if postedMessage.attachments?size gt 0>
-   <#if postedMessage.contentRaw?has_content>,</#if>
-   "imageUrl": "${postedMessage.attachments[0].proxyUrl}"
-   </#if>
-   <#if subscribers?size gt 0>
-   <#if postedMessage.contentRaw?has_content || postedMessage.attachments?size gt 0>,</#if>
-   "additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"
-   </#if>
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            "title": {
+                "title": "<@safe_include "modmail_thread_user_message_title"/>"
+            },
+            <#include "modmail_color">,
+            <#if postedMessage.contentRaw?has_content>
+            "description": "${postedMessage.contentRaw?json_string}"
+            <#else>
+            "description": "<@safe_include "modmail_no_message_provided"/>"
+            </#if>
+            <#if attachedImageUrls?size gt 0>
+            ,"imageUrl": "${attachedImageUrls[0]}"
+            </#if>
+            <#if remainingAttachments?size gt 0>
+            ,"fields": [
+                <#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
+                {
+                    "name": "${attachment?json_string}",
+                    "value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
+                }
+                <#sep>,</#list>
+                ]
+            </#if>
+        }
+        <#if attachedImageUrls?size gt 1>
+            <#assign attachmentCount>${attachedImageUrls?size}</#assign>
+            ,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
+        {
+            <#include "modmail_color">,
+            <#assign currentIndex>${attachment?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${attachment}"
+        }
+            <#sep>,</#list>
+        </#if>
+    ]
+    <#if subscribers?size gt 0>
+    ,"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"
+    </#if>
 }

abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_header_embed_en_US.ftl

@@ -1,14 +1,19 @@
+<#include "format_instant">
 {
-  <#include "user_detail">
-  "title": {
-      "title": "<@safe_include "modmail_closing_notification_title"/>"
-    },
-  <#include "modmail_color">,
-  <#assign messageCount>${messageCount}</#assign>
-  <#assign user><#if user??><@user_detail user=user/><#else>${userId}</#if></#assign>
-  <#assign closingUserDescription><@member_user_name member=closingMember/> (${closingMember.idLong?c})</#assign>
-  <#assign startDate>${formatDate(startDate,"yyyy-MM-dd HH:mm:ss zz")}</#assign>
-  <#assign duration>${fmtDuration(duration)}</#assign>
-  <#assign closedSilently=silently>
-  "description": "<@safe_include "close_closing_description"/>"
+    "embeds": [
+        {
+            <#include "user_detail">
+            "title": {
+                "title": "<@safe_include "modmail_closing_notification_title"/>"
+            },
+            <#include "modmail_color">,
+            <#assign messageCount>${messageCount}</#assign>
+            <#assign user><#if user??><@user_detail user=user/><#else>${userId}</#if></#assign>
+            <#assign closingUserDescription><@member_user_name member=closingMember/> (${closingMember.idLong?c})</#assign>
+            <#assign startDate><@format_instant_date_time instant=startDate/></#assign>
+            <#assign duration>${fmtDuration(duration)}</#assign>
+            <#assign closedSilently=silently>
+            "description": "<@safe_include "close_closing_description"/>"
+        }
+    ]
 }

abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl

@@ -1,15 +1,41 @@
 {
-  <#include "user_author">
-  <@user_author user=author/>,
-  <#include "modmail_color">
-  <#if message.embeds[0].description?has_content>
-  ,"description": "${message.embeds[0].description?json_string}"
-  </#if>
-   <#if message.embeds[0].image?has_content>
-     ,"imageUrl": "${message.embeds[0].image.proxyUrl}"
-   </#if>
-   <#if modMailMessage.anonymous>
-   , "additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>"
-   </#if>
-   ,"timeStamp": "${message.timeCreated}"
+    "embeds": [
+        {
+            <#include "user_author">
+            <@user_author user=author/>,
+            <#include "modmail_color">
+            <#if message.embeds[0].description?has_content>
+            ,"description": "${message.embeds[0].description?json_string}"
+            </#if>
+            <#if message.embeds?size gt 0 && message.embeds[0].image??>
+                ,"imageUrl": "${message.embeds[0].image.proxyUrl}"
+            </#if>
+            <#if message.embeds?size gt 0 && message.embeds[0].fields?size gt 0>
+                ,"fields": [
+                <#list message.embeds[0].fields as field><#assign field=field/>
+                    {
+                    "name": "${field.name?json_string}",
+                    "value": "${field.value?json_string}"
+                    }
+                    <#sep>,</#list>
+                ]
+            </#if>
+            ,"timeStamp": "${message.timeCreated}"
+        }
+        <#if message.embeds?size gt 1>
+        <#assign attachmentCount>${message.embeds?size}</#assign>
+            <#list message.embeds[1..] as embed><#assign embed=embed/>
+            <#if embed.image?? && embed.image.proxyUrl??>
+        ,{
+            <#include "modmail_color">,
+            <#assign currentIndex>${embed?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${embed.image.proxyUrl}"
+        }
+            </#if></#list>
+        </#if>
+    ]
+    <#if modMailMessage.anonymous>
+    ,"additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>"
+    </#if>
 }

abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/modmail_closing_user_message_embed_en_US.ftl

@@ -1,4 +1,8 @@
 {
-  <#include "modmail_color">,
-  "description": "${closingMessage?json_string}"
+    "embeds": [
+        {
+            <#include "modmail_color">,
+            "description": "${closingMessage?json_string}"
+        }
+    ]
 }

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

@@ -1,14 +1,39 @@
 {
-  <#include "member_author">
-  <@member_author member=moderator/>,
-  "title": {
-    "title": "<@safe_include "modmail_thread_staff_message_title"/>"
-  },
-  <#include "modmail_color">
-  <#if text?has_content>
-   , "description": "${text?json_string}"
-  </#if>
-   <#if postedMessage.attachments?size gt 0>
-   ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
-   </#if>
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=moderator/>,
+            "title": {
+                "title": "<@safe_include "modmail_thread_staff_message_title"/>"
+            },
+            <#include "modmail_color">
+            <#if text?has_content>
+            ,"description": "${text?json_string}"
+            </#if>
+            <#if attachedImageUrls?size gt 0>
+                ,"imageUrl": "${attachedImageUrls[0]}"
+            </#if>
+            <#if remainingAttachments?size gt 0>
+                ,"fields": [
+                <#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
+                    {
+                    "name": "${attachment?json_string}",
+                    "value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
+                    }
+                    <#sep>,</#list>
+                ]
+            </#if>
+        }
+        <#if attachedImageUrls?size gt 1>
+            <#assign attachmentCount>${attachedImageUrls?size}</#assign>
+            ,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
+        {
+            <#include "modmail_color">,
+            <#assign currentIndex>${attachment?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${attachment}"
+        }
+                <#sep>,</#list>
+        </#if>
+    ]
 }

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

@@ -1,9 +1,14 @@
+<#include "format_instant">
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "modmail_color">,
-  <#assign user><@member_user_name member=member/> (${member.user.id})</#assign>
-  <#assign joinDate>${member.timeJoined}</#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"/>"
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "modmail_color">,
+            <#assign user><@member_user_name member=member/> (${member.user.id})</#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.2.17</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.2.17</version>
+    <version>1.3.3-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.2.17</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/profanity-filter/src/main/resources/en_US/command/profanities/profanities_response_embed_en_US.ftl

@@ -1,32 +1,36 @@
 {
-  <#include "full_member_info">
-  <#include "abstracto_color">,
-  <#include "member_author">
-  <@member_author member=member/>,
-  "fields": [
-  {
-        "name": "<@safe_include "profanities_response_embed_true_profanities_field_title"/>",
-        "value": "${truePositives?c}",
-        "inline": "true"
-  },
-  {
-        "name": "<@safe_include "profanities_response_embed_false_profanities_field_title"/>",
-        "value": "${falsePositives?c}",
-        "inline": "true"
-  }<#if recentPositiveReports?size gt 0>
-  ,
-  {
-    "name": "​",
-    "value": "​",
-    "inline": "true"
-  },
-  <#list recentPositiveReports as report><#assign report=report>
-  {
-    <#assign reportIndex>${report?index + 1}</#assign>
-    "name": "<@safe_include "profanities_response_embed_true_profanities_report_field_value"/>",
-    "value": "[<@safe_include "profanities_response_embed_true_profanities_link_field_title"/>](${report.jumpUrl})",
-    "inline": "true"
-  }<#sep>,</#list>
-  </#if>
-  ]
+    "embeds": [
+        {
+            <#include "full_member_info">
+            <#include "abstracto_color">,
+            <#include "member_author">
+            <@member_author member=member/>,
+            "fields": [
+                {
+                    "name": "<@safe_include "profanities_response_embed_true_profanities_field_title"/>",
+                    "value": "${truePositives?c}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "profanities_response_embed_false_profanities_field_title"/>",
+                    "value": "${falsePositives?c}",
+                    "inline": "true"
+                }<#if recentPositiveReports?size gt 0>
+                ,
+                {
+                    "name": "​",
+                    "value": "​",
+                    "inline": "true"
+                },
+                <#list recentPositiveReports as report><#assign report=report>
+                {
+                    <#assign reportIndex>${report?index + 1}</#assign>
+                    "name": "<@safe_include "profanities_response_embed_true_profanities_report_field_value"/>",
+                    "value": "[<@safe_include "profanities_response_embed_true_profanities_link_field_title"/>](${report.jumpUrl})",
+                    "inline": "true"
+                }<#sep>,</#list>
+                </#if>
+            ]
+        }
+    ]
 }

abstracto-modules/profanity-filter/src/main/resources/en_US/listener/profanityListener/profanityDetection_listener_report_embed_en_US.ftl

@@ -1,27 +1,31 @@
 {
-  <#include "full_member_info">
-  <#include "abstracto_color">,
-  "description":  "<@safe_include "profanityListener_report_embed_description"/>",
-  "fields": [
-  {
-        "name": "<@safe_include "profanityListener_report_embed_member_field_title"/>",
-        "value": "<@full_member_info member=profaneMessage.member/>",
-        "inline": "true"
-  },
-  {
-        "name": "<@safe_include "profanityListener_report_embed_message_link_field_title"/>",
-        "value": "[${profaneMessage.channel.name?json_string}](${profaneMessage.jumpUrl?json_string})",
-        "inline": "true"
-  },
-  {
-        "name": "<@safe_include "profanityListener_report_embed_profanity_type_field_title"/>",
-        "value": "${profanityGroupKey}",
-        "inline": "true"
-  },
-  {
-        "name": "<@safe_include "profanityListener_report_embed_message_content_field_title"/>",
-        "value": "${profaneMessage.contentRaw}",
-        "inline": "true"
-  }
-  ]
+    "embeds": [
+        {
+            <#include "full_member_info">
+            <#include "abstracto_color">,
+            "description":  "<@safe_include "profanityListener_report_embed_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "profanityListener_report_embed_member_field_title"/>",
+                    "value": "<@full_member_info member=profaneMessage.member/>",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "profanityListener_report_embed_message_link_field_title"/>",
+                    "value": "[${profaneMessage.channel.name?json_string}](${profaneMessage.jumpUrl?json_string})",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "profanityListener_report_embed_profanity_type_field_title"/>",
+                    "value": "${profanityGroupKey?json_string}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "profanityListener_report_embed_message_content_field_title"/>",
+                    "value": "${profaneMessage.contentRaw?json_string}",
+                    "inline": "true"
+                }
+            ]
+        }
+    ]
 }

abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.2.17</version>
+        <version>1.3.3-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,21 +1,25 @@
 {
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "abstracto_color">,
-  "description": "<@safe_include "remind_reminder_description"/>",
-  "fields": [
-    {
-        "name": "<@safe_include "remind_reminder_duration_field_title"/>",
-        "value": "${fmtDuration(duration)}"
-    },
-    {
-        "name": "<@safe_include "remind_reminder_note_field_title"/>",
-        "value": "${reminder.text?json_string}"
-    },
-    {
-        "name": "<@safe_include "remind_reminder_link_field_title"/>",
-        "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
-    }
-  ],
-  "additionalMessage": "${member.asMention?json_string} 🔔"
+    "embeds": [
+        {
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "abstracto_color">,
+            "description": "<@safe_include "remind_reminder_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "remind_reminder_duration_field_title"/>",
+                    "value": "${fmtDuration(duration)}"
+                },
+                {
+                    "name": "<@safe_include "remind_reminder_note_field_title"/>",
+                    "value": "${reminder.text?json_string}"
+                },
+                {
+                    "name": "<@safe_include "remind_reminder_link_field_title"/>",
+                    "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
+                }
+            ]
+        }
+    ],
+    "additionalMessage": "${member.asMention?json_string} 🔔"
 }

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

@@ -1,9 +1,13 @@
 {
-    <#assign id>${reminder.id}</#assign>
-    <#assign messageUrl>${message.jumpUrl}</#assign>
-  <#include "member_author">
-  <@member_author member=member/>,
-  <#include "abstracto_color">,
-  "description": "<@safe_include "remind_reminding_description_text"/>",
-  "additionalMessage": "${member.asMention?json_string}"
+    "embeds": [
+        {
+            <#assign id>${reminder.id}</#assign>
+            <#assign messageUrl>${message.jumpUrl}</#assign>
+            <#include "member_author">
+            <@member_author member=member/>,
+            <#include "abstracto_color">,
+            "description": "<@safe_include "remind_reminding_description_text"/>"
+        }
+    ],
+    "additionalMessage": "${member.asMention?json_string}"
 }