From de7ec7403310b2030d0c9f33ecb9bbd07c5becbc Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 25 Jan 2026 00:03:06 +0100
Subject: [PATCH] [AB-xxx] fixing message embed and starboard post failing for
 embeds and component v2

---
 .../default/listener/message_embed_embed.ftl  | 53 +++++++++++--------
 .../default/listener/starboard_post_embed.ftl |  6 +--
 .../listener/message_embed_no_content.ftl     |  1 +
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl b/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
index 2a7becc7..bcc77faa 100644
--- a/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
+++ b/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
@@ -37,22 +37,29 @@
             </#if>
             <#list embeddedMessage.embeds as embed>
                 <#if embed.description?has_content>
-                ,{
-                    <#assign hasContent=true>
-                    "type": "section",
-                    "components": [
+                 <#if embeddedMessage.content?has_content>,</#if>
+                    <#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
+                        {
+                        <#assign hasContent=true>
+                            "accessory": {
+                                "type": "thumbnail",
+                                "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
+                            },
+                            "type": "section",
+                            "components": [
+                                {
+                                    "type": "textDisplay",
+                                    "content": "${embed.description?json_string}"
+                                }
+                            ]
+                        }
+                    <#else>
                         {
                             "type": "textDisplay",
                             "content": "${embed.description?json_string}"
                         }
-                    ]
-                    <#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
-                    ,"accessory": {
-                        "type": "thumbnail",
-                        "url": "${(embed.cachedImageInfo.proxyUrl)!embed.cachedThumbnail.proxyUrl}"
-                    }
                     </#if>
-                }
+                    <#assign hasContent=true>
                 <#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
                 || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
                     <#assign hasContent=true>
@@ -67,18 +74,18 @@
                 </#if>
             </#list>
             <#if embeddedMessage.attachments?size gt 0>
-            <#list embeddedMessage.attachments?filter(x -> x.width gt 0)>
-            ,{
-                <#assign hasContent=true>
-                "type": "mediaGallery",
-                "images": [
-                    <#items as attachment>
-                    {
-                        "url": "${attachment.proxyUrl}"
-                    }<#sep>,</#items>
-                ]
-            }</#list>
-        </#if>
+                <#list embeddedMessage.attachments?filter(x -> x.width gt 0)>
+                <#if hasContent>,</#if>{
+                    <#assign hasContent=true>
+                    "type": "mediaGallery",
+                    "images": [
+                        <#items as attachment>
+                        {
+                            "url": "${attachment.proxyUrl}"
+                        }<#sep>,</#items>
+                    ]
+                }</#list>
+            </#if>
         <#if hasContent==false>
             {
             "type": "textDisplay",
diff --git a/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl b/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
index 34bd7eb8..a46ddd46 100644
--- a/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
+++ b/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
@@ -47,7 +47,7 @@
             <#list message.embeds as embed>
                 <#if embed.description?has_content && !((embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content))>
                     <#assign hasContent=true>
-                    {
+                    <#if message.content?has_content>,</#if>{
                         "type": "textDisplay",
                         "content": "${embed.description?json_string}"
                     }
@@ -82,8 +82,8 @@
             </#list>
             <#if message.attachments?size gt 0>
             <#list message.attachments?filter(x -> x.width gt 0)>
-                <#assign hasContent=true>
-                ,{
+                <#if hasContent>,</#if><#assign hasContent=true>
+                {
                     "type": "mediaGallery",
                     "images": [
                     <#items as attachment>
diff --git a/translations/link-embed/src/main/resources/default/listener/message_embed_no_content.ftl b/translations/link-embed/src/main/resources/default/listener/message_embed_no_content.ftl
index e69de29b..dbe893c6 100644
--- a/translations/link-embed/src/main/resources/default/listener/message_embed_no_content.ftl
+++ b/translations/link-embed/src/main/resources/default/listener/message_embed_no_content.ftl
@@ -0,0 +1 @@
+No content.
\ No newline at end of file