From f829142ccd3eca9fec98526f4ec6d6ad62a45acf Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Fri, 5 Jun 2026 15:50:29 -0500
Subject: [PATCH] [Drafts] Always write embedGallery for image embeds

Stop writing the legacy `embedImages` shape when saving drafts. Both the
`images` (<=4) and `gallery` (>4) composer variants now serialize to
`embedGallery`, which stays well under the lexicon `maxLength` of 20.

The restore path still reads `embedImages` from older drafts for
backwards compat, merging both shapes and re-deriving the variant from
image count.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 src/view/com/composer/drafts/state/api.ts | 24 ++++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 817820effb..12ed4acf5a 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -111,20 +111,16 @@ async function postDraftToServerPost(
 
   // Add embeds
   if (post.embed.media) {
-    if (post.embed.media.type === 'images') {
-      draftPost.embedImages = serializeImages(
-        post.embed.media.images,
-        localRefPaths,
-      )
-    } else if (post.embed.media.type === 'gallery') {
+    // We always write the `embedGallery` shape for images now, including the
+    // legacy `images` variant (<=4 photos). We still read `embedImages` from
+    // older drafts for backwards compat - see `draftToPostDrafts`.
+    if (
+      post.embed.media.type === 'images' ||
+      post.embed.media.type === 'gallery'
+    ) {
       draftPost.embedGallery = {
         $type: 'app.bsky.draft.defs#draftEmbedGallery',
-        items: serializeImages(post.embed.media.images, localRefPaths).map(
-          img => ({
-            $type: 'app.bsky.draft.defs#draftEmbedImage' as const,
-            ...img,
-          }),
-        ),
+        items: serializeImages(post.embed.media.images, localRefPaths),
       }
     } else if (post.embed.media.type === 'video') {
       const video = await serializeVideo(post.embed.media.video, localRefPaths)
@@ -179,7 +175,7 @@ async function postDraftToServerPost(
 function serializeImages(
   images: ComposerImage[],
   localRefPaths: Map<string, string>,
-): AppBskyDraftDefs.DraftEmbedImage[] {
+): AppBskyDraftDefs.DraftEmbedGalleryItems {
   return images.map(image => {
     const sourcePath = image.transformed?.path || image.source.path
     // Reuse existing localRefPath if present (editing draft), otherwise generate new
@@ -194,7 +190,7 @@ function serializeImages(
     })
 
     return {
-      $type: 'app.bsky.draft.defs#draftEmbedImage',
+      $type: 'app.bsky.draft.defs#draftEmbedImage' as const,
       localRef: {
         $type: 'app.bsky.draft.defs#draftEmbedLocalRef',
         path: localRefPath,