Turn links to posts into quote posts (#262)

* Turn links to posts into quote posts

* Fix lint
zio/stable
Paul Frazee 2023-03-03 16:30:33 -06:00 committed by GitHub
parent d74ff9c219
commit 8e22ce8e2a
3 changed files with 73 additions and 10 deletions

View File

@ -3,6 +3,7 @@ import {match as matchRoute} from 'view/routes'
import {convertBskyAppUrlIfNeeded, makeRecordUri} from '../strings/url-helpers' import {convertBskyAppUrlIfNeeded, makeRecordUri} from '../strings/url-helpers'
import {RootStoreModel} from 'state/index' import {RootStoreModel} from 'state/index'
import {PostThreadViewModel} from 'state/models/post-thread-view' import {PostThreadViewModel} from 'state/models/post-thread-view'
import {ComposerOptsQuote} from 'state/models/shell-ui'
import {Home} from 'view/screens/Home' import {Home} from 'view/screens/Home'
import {Search} from 'view/screens/Search' import {Search} from 'view/screens/Search'
@ -97,3 +98,32 @@ export async function extractBskyMeta(
return meta return meta
} }
export async function getPostAsQuote(
store: RootStoreModel,
url: string,
): Promise<ComposerOptsQuote> {
url = convertBskyAppUrlIfNeeded(url)
const [_0, user, _1, rkey] = url.split('/').filter(Boolean)
const threadUri = makeRecordUri(user, 'app.bsky.feed.post', rkey)
const threadView = new PostThreadViewModel(store, {
uri: threadUri,
depth: 0,
})
await threadView.setup()
if (!threadView.thread || threadView.notFound) {
throw new Error('Not found')
}
return {
uri: threadView.thread.post.uri,
cid: threadView.thread.post.cid,
text: threadView.thread.postRecord?.text || '',
indexedAt: threadView.thread.post.indexedAt,
author: {
handle: threadView.thread.post.author.handle,
displayName: threadView.thread.post.author.displayName,
avatar: threadView.thread.post.author.avatar,
},
}
}

View File

@ -66,6 +66,18 @@ export function isBskyAppUrl(url: string): boolean {
return url.startsWith('https://bsky.app/') return url.startsWith('https://bsky.app/')
} }
export function isBskyPostUrl(url: string): boolean {
if (isBskyAppUrl(url)) {
try {
const urlp = new URL(url)
return /profile\/(?<name>[^/]+)\/post\/(?<rkey>[^/]+)/i.test(
urlp.pathname,
)
} catch {}
}
return false
}
export function convertBskyAppUrlIfNeeded(url: string): string { export function convertBskyAppUrlIfNeeded(url: string): string {
if (isBskyAppUrl(url)) { if (isBskyAppUrl(url)) {
try { try {

View File

@ -36,10 +36,12 @@ import {s, colors, gradients} from 'lib/styles'
import {cleanError} from 'lib/strings/errors' import {cleanError} from 'lib/strings/errors'
import {detectLinkables, extractEntities} from 'lib/strings/rich-text-detection' import {detectLinkables, extractEntities} from 'lib/strings/rich-text-detection'
import {getLinkMeta} from 'lib/link-meta/link-meta' import {getLinkMeta} from 'lib/link-meta/link-meta'
import {getPostAsQuote} from 'lib/link-meta/bsky'
import {getImageDim, downloadAndResize} from 'lib/media/manip' import {getImageDim, downloadAndResize} from 'lib/media/manip'
import {PhotoCarouselPicker} from './photos/PhotoCarouselPicker' import {PhotoCarouselPicker} from './photos/PhotoCarouselPicker'
import {cropAndCompressFlow, pickImagesFlow} from '../../../lib/media/picker' import {cropAndCompressFlow, pickImagesFlow} from '../../../lib/media/picker'
import {getMentionAt, insertMentionAt} from 'lib/strings/mention-manip' import {getMentionAt, insertMentionAt} from 'lib/strings/mention-manip'
import {isBskyPostUrl} from 'lib/strings/url-helpers'
import {SelectedPhoto} from './SelectedPhoto' import {SelectedPhoto} from './SelectedPhoto'
import {usePalette} from 'lib/hooks/usePalette' import {usePalette} from 'lib/hooks/usePalette'
import { import {
@ -63,7 +65,7 @@ export const ComposePost = observer(function ComposePost({
imagesOpen, imagesOpen,
onPost, onPost,
onClose, onClose,
quote, quote: initQuote,
}: { }: {
replyTo?: ComposerOpts['replyTo'] replyTo?: ComposerOpts['replyTo']
imagesOpen?: ComposerOpts['imagesOpen'] imagesOpen?: ComposerOpts['imagesOpen']
@ -80,6 +82,9 @@ export const ComposePost = observer(function ComposePost({
const [processingState, setProcessingState] = useState('') const [processingState, setProcessingState] = useState('')
const [error, setError] = useState('') const [error, setError] = useState('')
const [text, setText] = useState('') const [text, setText] = useState('')
const [quote, setQuote] = useState<ComposerOpts['quote'] | undefined>(
initQuote,
)
const [extLink, setExtLink] = useState<apilib.ExternalEmbedDraft | undefined>( const [extLink, setExtLink] = useState<apilib.ExternalEmbedDraft | undefined>(
undefined, undefined,
) )
@ -121,16 +126,32 @@ export const ComposePost = observer(function ComposePost({
return cleanup return cleanup
} }
if (!extLink.meta) { if (!extLink.meta) {
getLinkMeta(store, extLink.uri).then(meta => { if (isBskyPostUrl(extLink.uri)) {
if (aborted) { getPostAsQuote(store, extLink.uri).then(
return newQuote => {
} if (aborted) {
setExtLink({ return
uri: extLink.uri, }
isLoading: !!meta.image, setQuote(newQuote)
meta, setExtLink(undefined)
},
err => {
store.log.error('Failed to fetch post for quote embedding', {err})
setExtLink(undefined)
},
)
} else {
getLinkMeta(store, extLink.uri).then(meta => {
if (aborted) {
return
}
setExtLink({
uri: extLink.uri,
isLoading: !!meta.image,
meta,
})
}) })
}) }
return cleanup return cleanup
} }
if (extLink.isLoading && extLink.meta?.image && !extLink.localThumb) { if (extLink.isLoading && extLink.meta?.image && !extLink.localThumb) {