e5b700a3d2
When loading a GIF from a draft, the URL was being corrupted with double query strings like: `?ww=498&hh=498?hh=498&ww=498` This happened because: 1. serializeGif() adds ?ww=X&hh=Y&alt=Z to the Tenor URL 2. parseGifFromUrl() returned the full URL including our params 3. resolveGif() in resolve.ts then appends MORE params via string concatenation, creating a second ? Fix: Strip our custom params (ww, hh, alt) from the URL in parseGifFromUrl() before returning it, so the reconstructed GIF has a clean base URL. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
485 lines
13 KiB
TypeScript
485 lines
13 KiB
TypeScript
/**
|
|
* Type converters for Draft API - convert between ComposerState and server Draft types.
|
|
*/
|
|
import {type AppBskyDraftDefs} from '@atproto/api'
|
|
import {nanoid} from 'nanoid/non-secure'
|
|
|
|
import {type ComposerImage} from '#/state/gallery'
|
|
import {type Gif} from '#/state/queries/tenor'
|
|
import {
|
|
type ComposerState,
|
|
type EmbedDraft,
|
|
type PostDraft,
|
|
} from '#/view/com/composer/state/composer'
|
|
import {type VideoState} from '#/view/com/composer/state/video'
|
|
import {type DraftPostDisplay, type DraftSummary} from './schema'
|
|
|
|
const TENOR_HOSTNAME = 'media.tenor.com'
|
|
|
|
/**
|
|
* Convert ComposerState to server Draft format for saving.
|
|
* Returns both the draft and a map of localRef paths to their source paths.
|
|
*/
|
|
export function composerStateToDraft(state: ComposerState): {
|
|
draft: AppBskyDraftDefs.Draft
|
|
localRefPaths: Map<string, string>
|
|
} {
|
|
const localRefPaths = new Map<string, string>()
|
|
|
|
const posts: AppBskyDraftDefs.DraftPost[] = state.thread.posts.map(post => {
|
|
return postDraftToServerPost(post, localRefPaths)
|
|
})
|
|
|
|
// Convert threadgate settings to server format
|
|
const threadgateAllow: AppBskyDraftDefs.Draft['threadgateAllow'] = []
|
|
for (const setting of state.thread.threadgate) {
|
|
if (setting.type === 'mention') {
|
|
threadgateAllow.push({
|
|
$type: 'app.bsky.feed.threadgate#mentionRule' as const,
|
|
})
|
|
} else if (setting.type === 'following') {
|
|
threadgateAllow.push({
|
|
$type: 'app.bsky.feed.threadgate#followingRule' as const,
|
|
})
|
|
} else if (setting.type === 'followers') {
|
|
threadgateAllow.push({
|
|
$type: 'app.bsky.feed.threadgate#followerRule' as const,
|
|
})
|
|
} else if (setting.type === 'list') {
|
|
threadgateAllow.push({
|
|
$type: 'app.bsky.feed.threadgate#listRule' as const,
|
|
list: setting.list,
|
|
})
|
|
}
|
|
}
|
|
|
|
const draft: AppBskyDraftDefs.Draft = {
|
|
$type: 'app.bsky.draft.defs#draft',
|
|
posts,
|
|
threadgateAllow: threadgateAllow.length > 0 ? threadgateAllow : undefined,
|
|
// TODO: Add postgate embedding rules if needed
|
|
}
|
|
|
|
return {draft, localRefPaths}
|
|
}
|
|
|
|
/**
|
|
* Convert a single PostDraft to server DraftPost format.
|
|
*/
|
|
function postDraftToServerPost(
|
|
post: PostDraft,
|
|
localRefPaths: Map<string, string>,
|
|
): AppBskyDraftDefs.DraftPost {
|
|
const draftPost: AppBskyDraftDefs.DraftPost = {
|
|
$type: 'app.bsky.draft.defs#draftPost',
|
|
text: post.richtext.text,
|
|
}
|
|
|
|
// Add labels if present
|
|
if (post.labels.length > 0) {
|
|
draftPost.labels = {
|
|
$type: 'com.atproto.label.defs#selfLabels',
|
|
values: post.labels.map(label => ({val: label})),
|
|
}
|
|
}
|
|
|
|
// 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 === 'video') {
|
|
const video = serializeVideo(post.embed.media.video, localRefPaths)
|
|
if (video) {
|
|
draftPost.embedVideos = [video]
|
|
}
|
|
} else if (post.embed.media.type === 'gif') {
|
|
const external = serializeGif(post.embed.media)
|
|
if (external) {
|
|
draftPost.embedExternals = [external]
|
|
}
|
|
}
|
|
}
|
|
|
|
// Add quote record embed
|
|
if (post.embed.quote) {
|
|
draftPost.embedRecords = [
|
|
{
|
|
$type: 'app.bsky.draft.defs#draftEmbedRecord',
|
|
record: {
|
|
uri: post.embed.quote.uri,
|
|
cid: '', // We don't have the CID at draft time
|
|
},
|
|
},
|
|
]
|
|
}
|
|
|
|
// Add external link embed (only if no media, otherwise it's ignored)
|
|
if (post.embed.link && !post.embed.media) {
|
|
draftPost.embedExternals = [
|
|
{
|
|
$type: 'app.bsky.draft.defs#draftEmbedExternal',
|
|
uri: post.embed.link.uri,
|
|
},
|
|
]
|
|
}
|
|
|
|
return draftPost
|
|
}
|
|
|
|
/**
|
|
* Serialize images to server format with localRef paths.
|
|
*/
|
|
function serializeImages(
|
|
images: ComposerImage[],
|
|
localRefPaths: Map<string, string>,
|
|
): AppBskyDraftDefs.DraftEmbedImage[] {
|
|
return images.map(image => {
|
|
const sourcePath = image.transformed?.path || image.source.path
|
|
// Use a unique key for the localRef path
|
|
const localRefPath = `image:${nanoid()}`
|
|
localRefPaths.set(localRefPath, sourcePath)
|
|
|
|
return {
|
|
$type: 'app.bsky.draft.defs#draftEmbedImage',
|
|
localRef: {
|
|
$type: 'app.bsky.draft.defs#draftEmbedLocalRef',
|
|
path: localRefPath,
|
|
},
|
|
alt: image.alt || undefined,
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Serialize video to server format with localRef path.
|
|
*/
|
|
function serializeVideo(
|
|
videoState: VideoState,
|
|
localRefPaths: Map<string, string>,
|
|
): AppBskyDraftDefs.DraftEmbedVideo | undefined {
|
|
// Only save videos that have been compressed (have a video file)
|
|
if (!videoState.video) {
|
|
return undefined
|
|
}
|
|
|
|
const localRefPath = `video:${nanoid()}`
|
|
localRefPaths.set(localRefPath, videoState.video.uri)
|
|
|
|
return {
|
|
$type: 'app.bsky.draft.defs#draftEmbedVideo',
|
|
localRef: {
|
|
$type: 'app.bsky.draft.defs#draftEmbedLocalRef',
|
|
path: localRefPath,
|
|
},
|
|
alt: videoState.altText || undefined,
|
|
// TODO: Add captions if needed
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Serialize GIF to server format as external embed.
|
|
* URL format: https://media.tenor.com/{id}/{filename}.gif?hh=HEIGHT&ww=WIDTH&alt=ALT_TEXT
|
|
*/
|
|
function serializeGif(gifMedia: {
|
|
type: 'gif'
|
|
gif: Gif
|
|
alt: string
|
|
}): AppBskyDraftDefs.DraftEmbedExternal | undefined {
|
|
const gif = gifMedia.gif
|
|
const gifFormat = gif.media_formats.gif || gif.media_formats.tinygif
|
|
|
|
if (!gifFormat?.url) {
|
|
return undefined
|
|
}
|
|
|
|
// Build URL with dimensions and alt text in query params
|
|
const url = new URL(gifFormat.url)
|
|
if (gifFormat.dims) {
|
|
url.searchParams.set('ww', String(gifFormat.dims[0]))
|
|
url.searchParams.set('hh', String(gifFormat.dims[1]))
|
|
}
|
|
// Store alt text if present
|
|
if (gifMedia.alt) {
|
|
url.searchParams.set('alt', gifMedia.alt)
|
|
}
|
|
|
|
return {
|
|
$type: 'app.bsky.draft.defs#draftEmbedExternal',
|
|
uri: url.toString(),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Convert server DraftView to DraftSummary for list display.
|
|
* Also checks which media files exist locally.
|
|
*/
|
|
export function draftViewToSummary(
|
|
view: AppBskyDraftDefs.DraftView,
|
|
localMediaExists: (path: string) => boolean,
|
|
): DraftSummary {
|
|
const firstPost = view.draft.posts[0]
|
|
const previewText = firstPost?.text?.slice(0, 100) || ''
|
|
|
|
let mediaCount = 0
|
|
let hasMedia = false
|
|
let hasMissingMedia = false
|
|
|
|
const posts: DraftPostDisplay[] = view.draft.posts.map((post, index) => {
|
|
const images: DraftPostDisplay['images'] = []
|
|
const videos: DraftPostDisplay['video'][] = []
|
|
let gif: DraftPostDisplay['gif']
|
|
|
|
// Process images
|
|
if (post.embedImages) {
|
|
for (const img of post.embedImages) {
|
|
mediaCount++
|
|
hasMedia = true
|
|
const exists = localMediaExists(img.localRef.path)
|
|
if (!exists) {
|
|
hasMissingMedia = true
|
|
}
|
|
images.push({
|
|
localPath: img.localRef.path,
|
|
altText: img.alt || '',
|
|
exists,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Process videos
|
|
if (post.embedVideos) {
|
|
for (const vid of post.embedVideos) {
|
|
mediaCount++
|
|
hasMedia = true
|
|
const exists = localMediaExists(vid.localRef.path)
|
|
if (!exists) {
|
|
hasMissingMedia = true
|
|
}
|
|
videos.push({
|
|
localPath: vid.localRef.path,
|
|
altText: vid.alt || '',
|
|
exists,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Process externals (check for GIFs)
|
|
if (post.embedExternals) {
|
|
for (const ext of post.embedExternals) {
|
|
const gifData = parseGifFromUrl(ext.uri)
|
|
if (gifData) {
|
|
mediaCount++
|
|
hasMedia = true
|
|
gif = gifData
|
|
}
|
|
}
|
|
}
|
|
|
|
return {
|
|
id: `post-${index}`,
|
|
text: post.text || '',
|
|
images: images.length > 0 ? images : undefined,
|
|
video: videos[0], // Only one video per post
|
|
gif,
|
|
}
|
|
})
|
|
|
|
return {
|
|
id: view.id,
|
|
previewText,
|
|
hasMedia,
|
|
hasMissingMedia,
|
|
mediaCount,
|
|
postCount: view.draft.posts.length,
|
|
isReply: false, // Reply drafts not supported
|
|
updatedAt: view.updatedAt,
|
|
posts,
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parse GIF data from a Tenor URL.
|
|
* URL format: https://media.tenor.com/{id}/{filename}.gif?hh=HEIGHT&ww=WIDTH&alt=ALT_TEXT
|
|
*/
|
|
function parseGifFromUrl(
|
|
uri: string,
|
|
): {url: string; width: number; height: number; alt: string} | undefined {
|
|
try {
|
|
const url = new URL(uri)
|
|
if (url.hostname !== TENOR_HOSTNAME) {
|
|
return undefined
|
|
}
|
|
|
|
const height = parseInt(url.searchParams.get('hh') || '', 10)
|
|
const width = parseInt(url.searchParams.get('ww') || '', 10)
|
|
const alt = url.searchParams.get('alt') || ''
|
|
|
|
if (!height || !width) {
|
|
return undefined
|
|
}
|
|
|
|
// Strip our custom params to get clean base URL
|
|
// This prevents double query strings when resolveGif() adds params again
|
|
url.searchParams.delete('ww')
|
|
url.searchParams.delete('hh')
|
|
url.searchParams.delete('alt')
|
|
|
|
return {url: url.toString(), width, height, alt}
|
|
} catch {
|
|
return undefined
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Convert server Draft back to composer-compatible format for restoration.
|
|
* Returns partial state that can be merged with initial composer state.
|
|
*/
|
|
export function draftToComposerPosts(
|
|
draft: AppBskyDraftDefs.Draft,
|
|
loadedMedia: Map<string, string>,
|
|
): PostDraft[] {
|
|
// Import these dynamically to avoid circular dependencies
|
|
const {RichText} = require('@atproto/api')
|
|
|
|
return draft.posts.map((post, index) => {
|
|
const richtext = new RichText({text: post.text || ''})
|
|
|
|
const embed: EmbedDraft = {
|
|
quote: undefined,
|
|
link: undefined,
|
|
media: undefined,
|
|
}
|
|
|
|
// Restore images
|
|
if (post.embedImages && post.embedImages.length > 0) {
|
|
const images: ComposerImage[] = []
|
|
for (const img of post.embedImages) {
|
|
const path = loadedMedia.get(img.localRef.path)
|
|
if (path) {
|
|
images.push({
|
|
alt: img.alt || '',
|
|
source: {
|
|
id: nanoid(),
|
|
path,
|
|
width: 0, // Will be recalculated when loaded
|
|
height: 0,
|
|
mime: 'image/jpeg', // Default, will be detected
|
|
},
|
|
})
|
|
}
|
|
}
|
|
if (images.length > 0) {
|
|
embed.media = {type: 'images', images}
|
|
}
|
|
}
|
|
|
|
// Restore GIF from external embed
|
|
if (post.embedExternals) {
|
|
for (const ext of post.embedExternals) {
|
|
const gifData = parseGifFromUrl(ext.uri)
|
|
if (gifData) {
|
|
// Reconstruct a Gif object with all required properties
|
|
const mediaObject = {
|
|
url: gifData.url,
|
|
dims: [gifData.width, gifData.height] as [number, number],
|
|
duration: 0,
|
|
size: 0,
|
|
}
|
|
embed.media = {
|
|
type: 'gif',
|
|
gif: {
|
|
id: '',
|
|
created: 0,
|
|
hasaudio: false,
|
|
hascaption: false,
|
|
flags: '',
|
|
tags: [],
|
|
title: '',
|
|
content_description: gifData.alt || '',
|
|
itemurl: '',
|
|
url: gifData.url, // Required for useResolveGifQuery
|
|
media_formats: {
|
|
gif: mediaObject,
|
|
tinygif: mediaObject,
|
|
preview: mediaObject,
|
|
},
|
|
} as Gif,
|
|
alt: gifData.alt,
|
|
}
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// Restore quote embed
|
|
if (post.embedRecords && post.embedRecords.length > 0) {
|
|
const record = post.embedRecords[0]
|
|
embed.quote = {type: 'link', uri: record.record.uri}
|
|
}
|
|
|
|
// Restore link embed (only if not a GIF)
|
|
if (post.embedExternals && !embed.media) {
|
|
for (const ext of post.embedExternals) {
|
|
const gifData = parseGifFromUrl(ext.uri)
|
|
if (!gifData) {
|
|
embed.link = {type: 'link', uri: ext.uri}
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// Parse labels
|
|
const labels: string[] = []
|
|
if (post.labels && 'values' in post.labels) {
|
|
for (const val of (post.labels as {values: {val: string}[]}).values) {
|
|
labels.push(val.val)
|
|
}
|
|
}
|
|
|
|
return {
|
|
id: `draft-post-${index}`,
|
|
richtext,
|
|
shortenedGraphemeLength: richtext.graphemeLength,
|
|
labels,
|
|
embed,
|
|
} as PostDraft
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Convert server threadgate rules back to UI settings.
|
|
*/
|
|
export function threadgateToUISettings(
|
|
threadgateAllow?: AppBskyDraftDefs.Draft['threadgateAllow'],
|
|
): Array<{type: string; list?: string}> {
|
|
if (!threadgateAllow) {
|
|
return []
|
|
}
|
|
|
|
return threadgateAllow
|
|
.map(rule => {
|
|
if ('$type' in rule) {
|
|
if (rule.$type === 'app.bsky.feed.threadgate#mentionRule') {
|
|
return {type: 'mention'}
|
|
}
|
|
if (rule.$type === 'app.bsky.feed.threadgate#followingRule') {
|
|
return {type: 'following'}
|
|
}
|
|
if (rule.$type === 'app.bsky.feed.threadgate#followerRule') {
|
|
return {type: 'followers'}
|
|
}
|
|
if (
|
|
rule.$type === 'app.bsky.feed.threadgate#listRule' &&
|
|
'list' in rule
|
|
) {
|
|
return {type: 'list', list: (rule as {list: string}).list}
|
|
}
|
|
}
|
|
return null
|
|
})
|
|
.filter((s): s is {type: string; list?: string} => s !== null)
|
|
}
|