[AB-349] refactoring templates to have the new multi embed structure

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

@@ -1,4 +1,5 @@
 {
+    "embeds": [
         <#include "moderation_action_color">,
         <#assign mentionCount=mentionCount/>
         <#assign memberMention=memberDisplay.memberMention/>
@@ -13,4 +14,5 @@
                   "value": "[<@safe_include "massPing_mute_notification_embed_message_link_field_value"/>](${messageLink})"
             }
         ]
+    ]
 }

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

@@ -1,17 +1,21 @@
 {
+    "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>
+<#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_place_description"/>
 
-    <@safe_include "assignable_roles_config_embed_role_header"/>:
+<@safe_include "assignable_roles_config_embed_role_header"/>:
-    <#list roles as role><#assign role=role/>
+<#list roles as role><#assign role=role/>
-    <#assign emoteMention><#if role.emoteMarkDown??>${role.emoteMarkDown}<#else>No emote</#if></#assign>
+<#assign emoteMention><#if role.emoteMarkDown??>${role.emoteMarkDown}<#else>No emote</#if></#assign>
-    <#assign roleMention=role.roleDisplay.roleMention/>
+<#assign roleMention=role.roleDisplay.roleMention/>
-    <#assign roleDescription=role.description/>
+<#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>
+<#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_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 @@
 {
+    "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>
+<#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 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             "metaConfig" : {
-    "preventEmptyEmbed": "true",
+                "preventEmptyEmbed": "true"
-    "ephemeral": true
             },
             <#assign model=templateModel/>
             "description": "<@safe_include "${templateName}"/>"
+        }
+    ],
+    "messageConfig": {
+        "ephemeral": true
+    }
 }

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

@@ -1,8 +1,9 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             "metaConfig" : {
-    "preventEmptyEmbed": "true",
+                "preventEmptyEmbed": "true"
-    "ephemeral": true
             },
             <#assign roleText=role.asMention>
             <#if added>
@@ -12,4 +13,9 @@
             <#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,6 +1,10 @@
 {
+    "embeds": [
+        {
             <#include "assignable_place_color">,
             "description": "${placeDescription?json_string}"
+        }
+    ]
     <#if roles?size gt 0>
     ,"buttons": [
     <#list roles as role>

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

@@ -1,8 +1,14 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             "metaConfig" : {
-    "preventEmptyEmbed": "true",
+                "preventEmptyEmbed": "true"
-    "ephemeral": 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

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             <#assign text><#include "${commandName}_confirmation"></#assign>
-  "description": "${text?json_string}",
+            "description": "${text?json_string}"
+        }
+    ],
     "buttons": [
       {
           "label": "<@safe_include "command_confirmation_message_confirm_field_title"/>",

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

@@ -1,4 +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

@@ -1,4 +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/documentation/documentation_response_embed_en_US.ftl

@@ -1,4 +1,8 @@
 {
+    "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

@@ -1,4 +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

@@ -1,4 +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/featureModes/feature_modes_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "feature_modes_embed_title"/>"
             },
@@ -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,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "features_embed_title"/>"
             },
@@ -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,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "help_command_embed_title"/>"
             },
@@ -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 @@
 {
+    "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_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_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"/>:
+<@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>
+<#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>
+<#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>
+<@safe_include "help_module_embed_sub_modules"/>: <#list subModules as module>`${module.info.name?json_string}`<#sep>, </#list>
-       </#if>
+</#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 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "help_modules_embed_title"/>"
             },
             <#include "abstracto_color">,
             "description": "
-       <#list modules as module><#assign module=module/>
+<#list modules as module><#assign module=module/>
-       **${module.info.name?json_string}**
+**${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>
+<#if module.info.templated?? && module.info.templated><@safe_include "module_${module.info.name}_description"/><#else>${module.info.description?json_string}</#if>
-       </#list>
+</#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,11 +1,13 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "listChannelGroups_embed_title"/>"
             },
             <#include "success_color">,
             <#if groups?size = 0>
-  "description": "<@safe_include "listChannelGroups_no_channel_group"/>",
+            "description": "<@safe_include "listChannelGroups_no_channel_group"/>"
-  </#if>
+            <#else>
             "fields": [
              <#list groups as group>
                 {
@@ -17,4 +19,7 @@
                 }<#sep>,
              </#list>
             ]
+            </#if>
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "posttarget_embed_title"/>"
             },
@@ -14,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 @@
 {
+    "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "success_color">,
             "description": "
 <#list profanityGroups as profanityGroup><#assign profanityGroup=profanityGroup/>
@@ -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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             <#assign uptime>${fmtDuration(uptime)}</#assign>
             "description": "${uptime}",
@@ -6,4 +8,6 @@
                 "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=guildChannelMember.member/>,
             <#include "warning_color">,
@@ -7,4 +9,6 @@
             },
             <#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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <#if user?has_content>
             <@member_author member=user.member/>,
@@ -23,4 +25,6 @@
             <#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 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "exception_color">,
             "metaConfig" : {
-    "preventEmptyEmbed": "true",
+                "preventEmptyEmbed": "true"
-    "ephemeral": true
             },
-  <#assign effectiveTemplate=template>
+            <#if template?has_content>
-  <#if effectiveTemplate?has_content>
+            <#if template.templateModel?has_content>
-  <#if effectiveTemplate.templateModel?has_content>
+            <#assign model=template.templateModel/>
-    <#assign model=effectiveTemplate.templateModel/>
+            "description": "<@safe_include "${template.templateName}"/>"
-    "description": "<@safe_include "${effectiveTemplate.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/entertainment/src/main/resources/en_US/commands/choose/choose_response_embed_en_US.ftl

@@ -1,5 +1,9 @@
 {
+    "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             "color" : {
                  "r": 31,
                  "g": 35,
@@ -8,4 +10,6 @@
             <#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 @@
 {
+    "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/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl

@@ -1,20 +1,24 @@
 {
-<#macro userDisplay 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>
+            </#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"/>
+<@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>
+<#list userExperiences as user>
-            <@userDisplay user=user />
+<@userDisplay user=user />
 
-       </#list>
+</#list>
 
-       <@safe_include "leaderboard_own_placement"/>:
+<@safe_include "leaderboard_own_placement"/>:
-       <@userDisplay user=userExecuting />
+<@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 @@
 {
+    "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>"
+<#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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             "title": {
@@ -6,10 +8,12 @@
             },
             <#include "success_color">,
             "description": "
-    <#list roles as role>
+<#list roles as role>
-    ${role.role.asMention?json_string}
+${role.role.asMention?json_string}
-    <#else>
+<#else>
-    <@safe_include "list_disabled_experience_roles_embed_no_roles"/>
+<@safe_include "list_disabled_experience_roles_embed_no_roles"/>
-    </#list>
+</#list>
-  "
+"
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "success_color">,
@@ -29,4 +31,6 @@
                     "inline": "true"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,11 +1,15 @@
 {
+    "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 linkText>${link.serverName}</#assign>
-  <#assign linkUses>${link.uses}</#assign>
+<#assign linkUses>${link.uses}</#assign>
-  <@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
+<@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
-  </#list>"
+</#list>"
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=author/>,
             <#assign authorMention=author.asMention>
@@ -14,4 +16,6 @@
                     "value": "[${channel.name?json_string}](${message.jumpUrl})"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#if author??>
             <#include "user_author">
             <@user_author user=author/>
@@ -41,8 +43,11 @@
                 }
                 </#if>
             ],
+            "timeStamp": "${embeddedMessage.timeCreated}"
+        }
+    ]
      <#if useButton>
-  "buttons": [
+    ,"buttons": [
         {
             "label": "<@safe_include "message_embed_button_delete"/>",
             "id": "${buttonConfigModel.buttonId}",
@@ -51,15 +56,12 @@
                 "persistCallback": false
             }
         }
-  ],
+    ]
     </#if>
-  <#if mentionsReferencedMessage?has_content>
+<#if referencedMessageId?has_content && mentionsReferencedMessage?has_content>
-  "metaConfig": {
+    ,"referencedMessageId": "${referencedMessageId?c}",
+    "messageConfig": {
         "mentionsReferencedMessage": ${mentionsReferencedMessage?string('true', 'false')}
-  },
+    }
-  </#if>
+</#if>
-  "timeStamp": "${embeddedMessage.timeCreated}"
-  <#if referencedMessageId?has_content>
-    ,"referencedMessageId": "${referencedMessageId?c}"
-  </#if>
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "imageUrl": "${imageUrl}",
             <#include "abstracto_color"/>,
             "fields": [
@@ -10,4 +12,6 @@
             "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             "description": "<@safe_include "messageDeleted_description_text"/>",
@@ -13,4 +15,6 @@
                     "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             "imageUrl": "${imageUrl}",
             <#include "abstracto_color"/>,
             "description": "<@safe_include "messageEdited_attachment_removed_description"/>",
@@ -11,4 +13,6 @@
             "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "abstracto_color"/>,
@@ -17,4 +19,6 @@
                     "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>
+    "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>
+    "embeds": [
+        {
+            <#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
             "description": "<@safe_include "user_left_text"/>",
             <#include "abstracto_color"/>
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_detail">
             <#include "full_member_info">
             "title": {
@@ -30,4 +32,6 @@
                 }
                 </#if>
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "full_member_info">
             <#include "member_author">
             <@member_author member=kickedUser/>,
@@ -24,4 +26,6 @@
                     "value": "${reason?json_string}"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,5 +1,7 @@
 <#include "format_instant">
 {
+    "embeds": [
+        {
             "author": {
                 <#if specifiedUser??>
                 "name": "<@member_user_name member=specifiedUser.member/>",
@@ -19,10 +21,12 @@
             },
             <#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 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 noteText>${note.note.note?json_string}</#assign>
-  <#assign noteId>${note.note.userNoteId.id}</#assign>
+<#assign noteId>${note.note.userNoteId.id}</#assign>
-  <#assign date><@format_instant_date_time instant=note.note.created/></#assign>
+<#assign date><@format_instant_date_time instant=note.note.created/></#assign>
-  <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
+<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
-  </#list>"
+</#list>"
+        }
+    ]
 }

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

@@ -2,6 +2,8 @@
 <#include "format_instant">
 <#include "member_author">
 {
+    "embeds": [
+        {
             <@member_author member=mutedUser/>,
             "title": {
                 "title": "<@safe_include "mute_log_title"/>"
@@ -37,4 +39,6 @@
                 "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,6 +1,8 @@
 <#include "full_member_info">
 <#include "format_instant">
 {
+    "embeds": [
+        {
             <#if unMutedUser?has_content>
             <#include "member_author">
             <@member_author member=unMutedUser/>,
@@ -17,7 +19,6 @@
                     <#else>
                     "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
                     </#if>
-
                 },
                 {
                     "name": "<@safe_include "mute_log_muting_user_field_title"/>",
@@ -51,4 +52,6 @@
                 "text": "<@safe_include "mute_log_mute_id_footer"/>"
             },
             "timeStamp": "${unmuteDate}"
+        }
+    ]
 }

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

@@ -1,4 +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

@@ -1,5 +1,9 @@
 {
-   "description": "<#list row as mute><#assign mute=mute><@safe_include "mutes_mute_entry"/></#list>",
+    "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 @@
 {
+    "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_detail">
             <#include "full_member_info">
             "title": {
@@ -15,4 +17,6 @@
                     "value": "<@full_member_info member=unBanningMember/>"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "full_member_info">
             <#include "member_author">
             <@member_author member=warnedMember/>,
@@ -29,4 +31,6 @@
             "footer": {
                 "text": "<@safe_include "warn_log_warn_id_footer"/> #${warnId}"
             }
+        }
+    ]
 }

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

@@ -1,4 +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

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

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_detail">
             <#include "full_member_info">
             <#include "moderation_action_color">,
@@ -8,4 +10,6 @@
             <#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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             <#assign messageLink=reportedMessage.messageUrl>
             "description" : "<@safe_include "reactionReport_notification_embed_description"/>",
@@ -8,4 +10,6 @@
                     "value": "${reportCount}"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_detail">
             <#include "abstracto_color">,
             "description" : "<@safe_include "userBanned_description"/>",
@@ -22,4 +24,6 @@
                 }
                 </#if>
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_detail">
             <#include "abstracto_color">,
             "description" : "<@safe_include "userUnBanned_description"/>",
@@ -15,4 +17,6 @@
                 }
                 </#if>
             ]
+        }
+    ]
 }

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

@@ -1,12 +1,16 @@
 <#include "format_instant">
 {
+    "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"/>
+<#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>
+<#else>
-  <@safe_include "warnDecay_log_no_warnings"/>
+<@safe_include "warnDecay_log_no_warnings"/>
-  </#list>"
+</#list>"
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "modmail_color">,
@@ -9,4 +11,6 @@
                     "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=targetMember/>,
             "description": "<@safe_include "modmail_thread_created_description"/>",
@@ -9,4 +11,6 @@
                     "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 @@
 {
+    "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,12 +1,11 @@
 {
+    "embeds": [
+        {
             <#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"/>",
@@ -16,6 +15,11 @@
                     "value": "${channel.asMention}"
                 }
             ]
+        }
+    ],
+    "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,13 +1,12 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             "title": {
                 "title": "<@safe_include "modmail_thread_user_message_title"/>"
             },
             <#include "modmail_color">,
-  <#if subscribers?size gt 0>
-   "additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>",
-  </#if>
             <#if postedMessage.contentRaw?has_content>
             "description": "${postedMessage.contentRaw?json_string}"
             <#else>
@@ -16,4 +15,9 @@
             <#if postedMessage.attachments?size gt 0>
             ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
             </#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,5 +1,7 @@
 <#include "format_instant">
 {
+    "embeds": [
+        {
             <#include "user_detail">
             "title": {
                 "title": "<@safe_include "modmail_closing_notification_title"/>"
@@ -12,4 +14,6 @@
             <#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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_author">
             <@user_author user=author/>,
             <#include "modmail_color">
@@ -8,8 +10,10 @@
             <#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}"
+        }
+    ]
+    <#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 @@
 {
+    "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,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=moderator/>,
             "title": {
@@ -6,9 +8,11 @@
             },
             <#include "modmail_color">
             <#if text?has_content>
-   , "description": "${text?json_string}"
+            ,"description": "${text?json_string}"
             </#if>
             <#if postedMessage.attachments?size gt 0>
             ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
             </#if>
+        }
+    ]
 }

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

@@ -1,5 +1,7 @@
 <#include "format_instant">
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "modmail_color">,
@@ -7,4 +9,6 @@
             <#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/profanity-filter/src/main/resources/en_US/command/profanities/profanities_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "full_member_info">
             <#include "abstracto_color">,
             <#include "member_author">
@@ -29,4 +31,6 @@
                 }<#sep>,</#list>
                 </#if>
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "full_member_info">
             <#include "abstracto_color">,
             "description":  "<@safe_include "profanityListener_report_embed_description"/>",
@@ -24,4 +26,6 @@
                     "inline": "true"
                 }
             ]
+        }
+    ]
 }

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

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "abstracto_color">,
@@ -16,6 +18,8 @@
                     "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 @@
 {
+    "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"/>",
+            "description": "<@safe_include "remind_reminding_description_text"/>"
+        }
+    ],
     "additionalMessage": "${member.asMention?json_string}"
 }

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

@@ -1,5 +1,7 @@
 <#include "format_instant">
 {
+    "embeds": [
+        {
             <#include "member_author">
             <@member_author member=member/>,
             <#include "abstracto_color">,
@@ -23,4 +25,6 @@
                 </#list>
             ]
             </#if>
+        }
+    ]
 }

abstracto-modules/repost-detection/src/main/resources/en_US/commands/repostLeaderboard/repostLeaderboard_response_embed_en_US.ftl

@@ -1,22 +1,26 @@
 {
-<#macro userDisplay user>
+    "embeds": [
+        {
+            <#macro userDisplay user>
             ${user.rank} | <@member_user_name member=user.member/> | ${user.count}
-</#macro>
+            </#macro>
             <#include "member_author">
             <#include "success_color">,
             "description": "
-          <@safe_include "repostLeaderboard_rank_column"/> | <@safe_include "repostLeaderboard_name_column"/> | <@safe_include "repostLeaderboard_count_column"/>
+<@safe_include "repostLeaderboard_rank_column"/> | <@safe_include "repostLeaderboard_name_column"/> | <@safe_include "repostLeaderboard_count_column"/>
-         <#list entries as user>
+<#list entries as user>
-              <@userDisplay user=user />
+<@userDisplay user=user />
-          <#else>
+<#else>
-          <@safe_include "repostLeaderboard_no_reposts"/>
+<@safe_include "repostLeaderboard_no_reposts"/>
-         </#list>
+</#list>
 
-         <@safe_include "repostLeaderboard_caller_marker"/>:
+<@safe_include "repostLeaderboard_caller_marker"/>:
-         <#if userExecuting.count gt 0>
+<#if userExecuting.count gt 0>
-         <@userDisplay user=userExecuting />
+<@userDisplay user=userExecuting />
-         <#else>
+<#else>
-         <@safe_include "repostLeaderboard_no_reposts"/>
+<@safe_include "repostLeaderboard_no_reposts"/>
-         </#if>
+</#if>
-    "
+"
+        }
+    ]
 }

abstracto-modules/repost-detection/src/main/resources/en_US/commands/showRepostCheckChannels/showRepostCheckChannels_response_embed_en_US.ftl

@@ -1,10 +1,14 @@
 {
+    "embeds": [
+        {
             <#include "member_author">
             <#include "success_color">,
             "description": "
-  <#list repostCheckChannelGroups as group>
+<#list repostCheckChannelGroups as group>
-  <@safe_include "showRepostCheckChannels_response_embed_description"/>: ${group.channelGroup.channelGroup.groupName}(<#list group.channels as channel>${channel.channelRepr}<#sep>, <#else><@safe_include "showRepostCheckChannels_response_embed_no_channels"/></#list>)
+<@safe_include "showRepostCheckChannels_response_embed_description"/>: ${group.channelGroup.channelGroup.groupName}(<#list group.channels as channel>${channel.channelRepr}<#sep>, <#else><@safe_include "showRepostCheckChannels_response_embed_no_channels"/></#list>)
 
-  <#else><@safe_include "showRepostCheckChannels_response_embed_no_channel_groups"/></#list>
+<#else><@safe_include "showRepostCheckChannels_response_embed_no_channel_groups"/></#list>
-    "
+"
+        }
+    ]
 }

abstracto-modules/starboard/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "starStats_response_title"/>"
             },
@@ -8,41 +10,43 @@
                 {
                     "name": "<@safe_include "starStats_top_starred_field_title"/>",
                     "value": "
-                <#list topPosts as post><#assign post=post/>
+<#list topPosts as post><#assign post=post/>
-                <#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</#assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/><#else>
+<#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</#assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/><#else>
-                    <@safe_include "starStats_no_starred_messages"/>
+<@safe_include "starStats_no_starred_messages"/>
-                </#list>
+</#list>
-            "
+"
                 },
                 {
                     "name": "<@safe_include "starStats_top_starrer_field_title"/>",
                     "value": "
-                <#list starGiver as starrer><#assign starrer=starrer/>
+<#list starGiver as starrer><#assign starrer=starrer/>
-                    <#assign badge>${badgeEmotes[starrer?index]}</#assign><#assign count>${starrer.starCount}</#assign>
+<#assign badge>${badgeEmotes[starrer?index]}</#assign><#assign count>${starrer.starCount}</#assign>
-                    <#if starrer.member?has_content>
+<#if starrer.member?has_content>
-                    <#assign user>${starrer.member.asMention?json_string}</#assign> <@safe_include "starStats_starrer_entry"/>
+<#assign user>${starrer.member.asMention?json_string}</#assign> <@safe_include "starStats_starrer_entry"/>
-                    <#else>
+<#else>
-                        <#assign user>${starrer.user.userReference.id?c}</#assign> <@safe_include "starStats_starrer_entry_left_guild"/>
+<#assign user>${starrer.user.userReference.id?c}</#assign> <@safe_include "starStats_starrer_entry_left_guild"/>
-                    </#if>
+</#if>
-                 <#else>
+<#else>
-                     <@safe_include "starStats_no_starred_messages"/>
+<@safe_include "starStats_no_starred_messages"/>
-                </#list>
+</#list>
-            "
+"
                 },
                 {
                     "name": "<@safe_include "starStats_top_receiver_field_title"/>",
                     "value": "
-                <#list starReceiver as starred><#assign starred=starred/>
+<#list starReceiver as starred><#assign starred=starred/>
-                    <#assign badge>${badgeEmotes[starred?index]}</#assign><#assign count>${starred.starCount}</#assign>
+<#assign badge>${badgeEmotes[starred?index]}</#assign><#assign count>${starred.starCount}</#assign>
-                    <#if starred.member?has_content>
+<#if starred.member?has_content>
-                     <#assign user>${starred.member.asMention?json_string}</#assign> <@safe_include "starStats_receiver_entry"/>
+<#assign user>${starred.member.asMention?json_string}</#assign> <@safe_include "starStats_receiver_entry"/>
-                    <#else>
+<#else>
-                     <#assign user>${starred.user.userReference.id?c}</#assign> <@safe_include "starStats_receiver_entry_left_guild"/>
+<#assign user>${starred.user.userReference.id?c}</#assign> <@safe_include "starStats_receiver_entry_left_guild"/>
-                    </#if>
+</#if>
-                <#else>
+<#else>
-                   <@safe_include "starStats_no_starred_messages"/>
+<@safe_include "starStats_no_starred_messages"/>
-                </#list>
+</#list>
-             "
+"
+                }
+            ]
         }
     ]
 }

abstracto-modules/starboard/src/main/resources/en_US/commands/starStats/starStats_single_member_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "starStats_member_response_title"/>"
             },
@@ -11,11 +13,11 @@
                 {
                     "name": "<@safe_include "starStats_top_starred_field_title"/>",
                     "value": "
-                <#list topPosts as post><#assign post=post/>
+<#list topPosts as post><#assign post=post/>
-                <#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</#assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/><#else>
+<#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</#assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/><#else>
-                    <@safe_include "starStats_no_starred_messages"/>
+<@safe_include "starStats_no_starred_messages"/>
-                </#list>
+</#list>
-            "
+"
                 },
                 {
                     "name": "<@safe_include "starStats_member_received_stars_field_title"/>",
@@ -26,4 +28,6 @@
                     "value": "${givenStars}"
                 }
             ]
+        }
+    ]
 }

abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#if author??>
             <#include "user_author">
             <@user_author user=author/>
@@ -8,24 +10,14 @@
             <#include "abstracto_color">,
             <#if message.content?has_content || message.embeds?size gt 0>
             "description": "${message.content?json_string}
-   <#list message.embeds>
+<#list message.embeds>
-        <@safe_include "starboard_post_embed_embeds_name"/>:
+<@safe_include "starboard_post_embed_embeds_name"/>:
-        <#items as embed>
+<#items as embed>
-            <#if embed.description??> <@safe_include "starboard_post_embed_description"/>: ${embed.description?json_string} </#if> <#if embed.imageUrl?has_content> <@safe_include "starboard_post_embed_image_url"/>: ${embed.imageUrl} </#if>
+<#if embed.description??> <@safe_include "starboard_post_embed_description"/>: ${embed.description?json_string} </#if> <#if embed.imageUrl?has_content> <@safe_include "starboard_post_embed_image_url"/>: ${embed.imageUrl} </#if>
-        </#items>
+</#items>
-   </#list>
+</#list>
-   ",
+",
             </#if>
-  <#assign emote>${starLevelEmote}</#assign>
-  <#assign count>${starCount}</#assign>
-  <#assign messageId>${message.messageId?c}</#assign>
-  <#if channel?has_content>
-  <#assign channelMention>${channel.asMention?json_string}</#assign>
-  "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
-  <#else>
-  <#assign channelMention>${sourceChannelId?c}</#assign>
-  "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
-  </#if>,
             <#if message.attachments?size gt 0>
             "imageUrl": "${message.attachments[0].proxyUrl}",
             <#elseif message.attachments?size = 0 && message.embeds?size gt 0 && message.embeds[0].cachedThumbnail??>
@@ -44,4 +36,16 @@
                 }
             ],
             "timeStamp": "${message.timeCreated}"
+        }
+    ],
+    <#assign emote>${starLevelEmote}</#assign>
+    <#assign count>${starCount}</#assign>
+    <#assign messageId>${message.messageId?c}</#assign>
+    <#if channel?has_content>
+    <#assign channelMention>${channel.asMention?json_string}</#assign>
+    "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
+    <#else>
+    <#assign channelMention>${sourceChannelId?c}</#assign>
+    "additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
+    </#if>
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_animated_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/deletedEmoteStats/deletedEmoteStats_static_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_no_stats_available_response_embed_en_US.ftl

@@ -1,6 +1,10 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "downloadEmoteStats_no_stats_available_embed_title"/>"
             },
             <#include "warning_color">
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl

@@ -1,8 +1,8 @@
 <#include "format_instant">
 {
-<#assign guildName=guild.name>
+    <#assign guildName=guild.name>
-<#if statsSince?has_content>
+    <#if statsSince?has_content>
-<#assign sinceDate><@format_instant_long_date instant=statsSince/></#assign>
+    <#assign sinceDate><@format_instant_long_date instant=statsSince/></#assign>
-</#if>
+    </#if>
     "additionalMessage": "<@safe_include "downloadEmoteStats_response_embed_text"/>"
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStat/emoteStat_response_embed_en_US.ftl

@@ -1,4 +1,8 @@
 {
+    "embeds": [
+        {
             <#include "statistic_color">,
             "description": "<#if emote?has_content>${emote.asMention}<#else>${trackedEmote.emoteName}</#if>x${result.amount?c}"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_no_stats_available_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_static_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_animated_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/externalEmoteStats/externalEmoteStats_static_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showExternalTrackedEmote/showExternalTrackedEmote_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showExternalTrackedEmote_response_embed_title"/>"
             },
@@ -18,4 +20,6 @@
                 }
             ],
             "imageUrl": "${externalUrl}"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_animated_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_animated_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#if></#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_animated_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_deleted_animated_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list deletedAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_deleted_static_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_deleted_static_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list deletedStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_animated_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_external_animated_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list externalAnimatedEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_external_static_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_external_static_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list externalStaticEmotes as emote>`${emote.emoteName}:${emote.trackedEmoteId.id?c}`<#if !emote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_no_emotes_available_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/showTrackedEmotes/showTrackedEmotes_static_response_embed_en_US.ftl

@@ -1,7 +1,11 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "showTrackedEmotes_static_tracked_emotes_title"/>"
             },
             <#include "statistic_color">,
             "description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}<#if !emote.trackedEmote.trackingEnabled>(<#include "showTrackedEmotes_emote_tracking_disabled">)</#if><#sep> </#if></#list>"
+        }
+    ]
 }

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/syncTrackedEmotes/syncTrackedEmotes_result_response_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             "title": {
                 "title": "<@safe_include "syncTrackedEmotes_result_response_embed_title"/>"
             },
@@ -6,4 +8,6 @@
             <#assign emotesAdded=emotesAdded>
             <#assign emotesDeleted=emotesMarkedDeleted>
             "description": "<@safe_include "syncTrackedEmotes_result_response_description"/>"
+        }
+    ]
 }

abstracto-modules/suggestion/src/main/resources/en_US/commands/showSuggestion/suggestion_info_response_embed_en_US.ftl

@@ -1,6 +1,10 @@
 {
+    "embeds": [
+        {
             <#include "abstracto_color">,
             <#assign agreements=agreements>
             <#assign disagreements=disagreements>
             "description": "<@safe_include "suggestion_info_response_embed_description"/>"
+        }
+    ]
 }

abstracto-modules/suggestion/src/main/resources/en_US/commands/suggest/suggest_initial_embed_en_US.ftl

@@ -1,4 +1,6 @@
 {
+    "embeds": [
+        {
             <#include "user_author">
             <@user_author user=suggester/>,
             <#include "user_user_name">
@@ -9,8 +11,13 @@
             <#if message?? && message.attachments?size gt 0>
             "imageUrl": "${message.attachments[0].proxyUrl}",
             </#if>
+            "footer": {
+                "text": "<@safe_include "suggest_suggestion_id_footer"/>"
+            }
+        }
+    ]
     <#if useButtons>
-    "buttons": [
+    ,"buttons": [
         {
             "label": "<@safe_include "suggest_button_agree_label"/>",
             "id": "${agreeButtonModel.buttonId}",
@@ -35,9 +42,6 @@
                 "persistCallback": false
             }
         }
-    ],
+    ]
     </#if>
-  "footer": {
-    "text": "<@safe_include "suggest_suggestion_id_footer"/>"
-  }
 }