Update composer to preview external link cards (#52)
* Fetch external link metadata during compose so the user can preview and remove the embed * Add missing mocks * Update tests to match recent changeszio/stable
parent
27ee550d15
commit
6588961d2e
|
@ -0,0 +1 @@
|
||||||
|
export default {}
|
|
@ -311,6 +311,7 @@ export const mockedFeedStore = {
|
||||||
loadLatest: jest.fn(),
|
loadLatest: jest.fn(),
|
||||||
update: jest.fn(),
|
update: jest.fn(),
|
||||||
checkForLatest: jest.fn().mockRejectedValue('Error checking for latest'),
|
checkForLatest: jest.fn().mockRejectedValue('Error checking for latest'),
|
||||||
|
registerListeners: jest.fn().mockReturnValue(jest.fn()),
|
||||||
// unknown required because of the missing private methods: _xLoading, _xIdle, _pendingWork, _initialLoad, _loadLatest, _loadMore, _update, _replaceAll, _appendAll, _prependAll, _updateAll, _getFeed, loadMoreCursor, pollCursor, _loadPromise, _updatePromise, _loadLatestPromise, _loadMorePromise
|
// unknown required because of the missing private methods: _xLoading, _xIdle, _pendingWork, _initialLoad, _loadLatest, _loadMore, _update, _replaceAll, _appendAll, _prependAll, _updateAll, _getFeed, loadMoreCursor, pollCursor, _loadPromise, _updatePromise, _loadLatestPromise, _loadMorePromise
|
||||||
} as unknown as FeedModel
|
} as unknown as FeedModel
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ describe('downloadAndResize', () => {
|
||||||
100,
|
100,
|
||||||
100,
|
100,
|
||||||
'JPEG',
|
'JPEG',
|
||||||
1,
|
100,
|
||||||
undefined,
|
undefined,
|
||||||
undefined,
|
undefined,
|
||||||
undefined,
|
undefined,
|
||||||
|
|
|
@ -63,6 +63,7 @@ describe('ComposePost', () => {
|
||||||
mockedRootStore,
|
mockedRootStore,
|
||||||
'testing publish',
|
'testing publish',
|
||||||
'testUri',
|
'testUri',
|
||||||
|
undefined,
|
||||||
[],
|
[],
|
||||||
new Set<string>(),
|
new Set<string>(),
|
||||||
expect.anything(),
|
expect.anything(),
|
||||||
|
|
|
@ -96,7 +96,7 @@ export function extractEntities(
|
||||||
{
|
{
|
||||||
// links
|
// links
|
||||||
const re =
|
const re =
|
||||||
/(^|\s|\()((https?:\/\/[\S]+)|((?<domain>[a-z][a-z0-9]*(\.[a-z0-9]+)+)[\S]*))/gm
|
/(^|\s|\()((https?:\/\/[\S]+)|((?<domain>[a-z][a-z0-9]*(\.[a-z0-9]+)+)[\S]*))/gim
|
||||||
while ((match = re.exec(text))) {
|
while ((match = re.exec(text))) {
|
||||||
let value = match[2]
|
let value = match[2]
|
||||||
if (!value.startsWith('http')) {
|
if (!value.startsWith('http')) {
|
||||||
|
|
|
@ -15,7 +15,13 @@ import {RootStoreModel} from '../models/root-store'
|
||||||
import {extractEntities} from '../../lib/strings'
|
import {extractEntities} from '../../lib/strings'
|
||||||
import {isNetworkError} from '../../lib/errors'
|
import {isNetworkError} from '../../lib/errors'
|
||||||
import {downloadAndResize} from '../../lib/images'
|
import {downloadAndResize} from '../../lib/images'
|
||||||
import {getLikelyType, LikelyType, getLinkMeta} from '../../lib/link-meta'
|
import {
|
||||||
|
getLikelyType,
|
||||||
|
LikelyType,
|
||||||
|
getLinkMeta,
|
||||||
|
LinkMeta,
|
||||||
|
} from '../../lib/link-meta'
|
||||||
|
import {Image} from '../../lib/images'
|
||||||
|
|
||||||
const TIMEOUT = 10e3 // 10s
|
const TIMEOUT = 10e3 // 10s
|
||||||
|
|
||||||
|
@ -23,10 +29,18 @@ export function doPolyfill() {
|
||||||
AtpApi.xrpc.fetch = fetchHandler
|
AtpApi.xrpc.fetch = fetchHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ExternalEmbedDraft {
|
||||||
|
uri: string
|
||||||
|
isLoading: boolean
|
||||||
|
meta?: LinkMeta
|
||||||
|
localThumb?: Image
|
||||||
|
}
|
||||||
|
|
||||||
export async function post(
|
export async function post(
|
||||||
store: RootStoreModel,
|
store: RootStoreModel,
|
||||||
text: string,
|
text: string,
|
||||||
replyTo?: string,
|
replyTo?: string,
|
||||||
|
extLink?: ExternalEmbedDraft,
|
||||||
images?: string[],
|
images?: string[],
|
||||||
knownHandles?: Set<string>,
|
knownHandles?: Set<string>,
|
||||||
onStateChange?: (state: string) => void,
|
onStateChange?: (state: string) => void,
|
||||||
|
@ -67,68 +81,44 @@ export async function post(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!embed && entities) {
|
if (!embed && extLink) {
|
||||||
const link = entities.find(
|
let thumb
|
||||||
ent =>
|
if (extLink.localThumb) {
|
||||||
ent.type === 'link' &&
|
onStateChange?.(`Uploading link thumbnail...`)
|
||||||
getLikelyType(ent.value || '') === LikelyType.HTML,
|
let encoding
|
||||||
)
|
if (extLink.localThumb.path.endsWith('.png')) {
|
||||||
if (link) {
|
encoding = 'image/png'
|
||||||
try {
|
} else if (
|
||||||
onStateChange?.(`Fetching link metadata...`)
|
extLink.localThumb.path.endsWith('.jpeg') ||
|
||||||
let thumb
|
extLink.localThumb.path.endsWith('.jpg')
|
||||||
const linkMeta = await getLinkMeta(link.value)
|
) {
|
||||||
if (linkMeta.image) {
|
encoding = 'image/jpeg'
|
||||||
onStateChange?.(`Downloading link thumbnail...`)
|
} else {
|
||||||
const thumbLocal = await downloadAndResize({
|
store.log.warn(
|
||||||
uri: linkMeta.image,
|
'Unexpected image format for thumbnail, skipping',
|
||||||
width: 250,
|
extLink.localThumb.path,
|
||||||
height: 250,
|
)
|
||||||
mode: 'contain',
|
}
|
||||||
maxSize: 100000,
|
if (encoding) {
|
||||||
timeout: 15e3,
|
const thumbUploadRes = await store.api.com.atproto.blob.upload(
|
||||||
}).catch(() => undefined)
|
extLink.localThumb.path, // this will be special-cased by the fetch monkeypatch in /src/state/lib/api.ts
|
||||||
if (thumbLocal) {
|
{encoding},
|
||||||
onStateChange?.(`Uploading link thumbnail...`)
|
)
|
||||||
let encoding
|
thumb = {
|
||||||
if (thumbLocal.uri.endsWith('.png')) {
|
cid: thumbUploadRes.data.cid,
|
||||||
encoding = 'image/png'
|
mimeType: encoding,
|
||||||
} else if (
|
|
||||||
thumbLocal.uri.endsWith('.jpeg') ||
|
|
||||||
thumbLocal.uri.endsWith('.jpg')
|
|
||||||
) {
|
|
||||||
encoding = 'image/jpeg'
|
|
||||||
} else {
|
|
||||||
store.log.warn(
|
|
||||||
'Unexpected image format for thumbnail, skipping',
|
|
||||||
thumbLocal.uri,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (encoding) {
|
|
||||||
const thumbUploadRes = await store.api.com.atproto.blob.upload(
|
|
||||||
thumbLocal.uri, // this will be special-cased by the fetch monkeypatch in /src/state/lib/api.ts
|
|
||||||
{encoding},
|
|
||||||
)
|
|
||||||
thumb = {
|
|
||||||
cid: thumbUploadRes.data.cid,
|
|
||||||
mimeType: encoding,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
embed = {
|
|
||||||
$type: 'app.bsky.embed.external',
|
|
||||||
external: {
|
|
||||||
uri: link.value,
|
|
||||||
title: linkMeta.title || linkMeta.url,
|
|
||||||
description: linkMeta.description || '',
|
|
||||||
thumb,
|
|
||||||
},
|
|
||||||
} as AppBskyEmbedExternal.Main
|
|
||||||
} catch (e: any) {
|
|
||||||
store.log.warn(`Failed to fetch link meta for ${link.value}`, e)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
embed = {
|
||||||
|
$type: 'app.bsky.embed.external',
|
||||||
|
external: {
|
||||||
|
uri: extLink.uri,
|
||||||
|
title: extLink.meta?.title || '',
|
||||||
|
description: extLink.meta?.description || '',
|
||||||
|
thumb,
|
||||||
|
},
|
||||||
|
} as AppBskyEmbedExternal.Main
|
||||||
}
|
}
|
||||||
|
|
||||||
if (replyTo) {
|
if (replyTo) {
|
||||||
|
|
|
@ -16,6 +16,7 @@ import LinearGradient from 'react-native-linear-gradient'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
import {UserAutocompleteViewModel} from '../../../state/models/user-autocomplete-view'
|
import {UserAutocompleteViewModel} from '../../../state/models/user-autocomplete-view'
|
||||||
import {Autocomplete} from './Autocomplete'
|
import {Autocomplete} from './Autocomplete'
|
||||||
|
import {ExternalEmbed} from './ExternalEmbed'
|
||||||
import {Text} from '../util/text/Text'
|
import {Text} from '../util/text/Text'
|
||||||
import * as Toast from '../util/Toast'
|
import * as Toast from '../util/Toast'
|
||||||
// @ts-ignore no type definition -prf
|
// @ts-ignore no type definition -prf
|
||||||
|
@ -28,7 +29,9 @@ import {useStores} from '../../../state'
|
||||||
import * as apilib from '../../../state/lib/api'
|
import * as apilib from '../../../state/lib/api'
|
||||||
import {ComposerOpts} from '../../../state/models/shell-ui'
|
import {ComposerOpts} from '../../../state/models/shell-ui'
|
||||||
import {s, colors, gradients} from '../../lib/styles'
|
import {s, colors, gradients} from '../../lib/styles'
|
||||||
import {detectLinkables} from '../../../lib/strings'
|
import {detectLinkables, extractEntities} from '../../../lib/strings'
|
||||||
|
import {getLinkMeta} from '../../../lib/link-meta'
|
||||||
|
import {downloadAndResize} from '../../../lib/images'
|
||||||
import {UserLocalPhotosModel} from '../../../state/models/user-local-photos'
|
import {UserLocalPhotosModel} from '../../../state/models/user-local-photos'
|
||||||
import {PhotoCarouselPicker} from './PhotoCarouselPicker'
|
import {PhotoCarouselPicker} from './PhotoCarouselPicker'
|
||||||
import {SelectedPhoto} from './SelectedPhoto'
|
import {SelectedPhoto} from './SelectedPhoto'
|
||||||
|
@ -56,6 +59,10 @@ 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 [extLink, setExtLink] = useState<apilib.ExternalEmbedDraft | undefined>(
|
||||||
|
undefined,
|
||||||
|
)
|
||||||
|
const [attemptedExtLinks, setAttemptedExtLinks] = useState<string[]>([])
|
||||||
const [isSelectingPhotos, setIsSelectingPhotos] = useState(
|
const [isSelectingPhotos, setIsSelectingPhotos] = useState(
|
||||||
imagesOpen || false,
|
imagesOpen || false,
|
||||||
)
|
)
|
||||||
|
@ -71,11 +78,61 @@ export const ComposePost = observer(function ComposePost({
|
||||||
[store],
|
[store],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// initial setup
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
autocompleteView.setup()
|
autocompleteView.setup()
|
||||||
localPhotos.setup()
|
localPhotos.setup()
|
||||||
}, [autocompleteView, localPhotos])
|
}, [autocompleteView, localPhotos])
|
||||||
|
|
||||||
|
// external link metadata-fetch flow
|
||||||
|
useEffect(() => {
|
||||||
|
let aborted = false
|
||||||
|
const cleanup = () => {
|
||||||
|
aborted = true
|
||||||
|
}
|
||||||
|
if (!extLink) {
|
||||||
|
return cleanup
|
||||||
|
}
|
||||||
|
if (!extLink.meta) {
|
||||||
|
getLinkMeta(extLink.uri).then(meta => {
|
||||||
|
if (aborted) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setExtLink({
|
||||||
|
uri: extLink.uri,
|
||||||
|
isLoading: !!meta.image,
|
||||||
|
meta,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return cleanup
|
||||||
|
}
|
||||||
|
if (extLink.isLoading && extLink.meta?.image && !extLink.localThumb) {
|
||||||
|
downloadAndResize({
|
||||||
|
uri: extLink.meta.image,
|
||||||
|
width: 250,
|
||||||
|
height: 250,
|
||||||
|
mode: 'contain',
|
||||||
|
maxSize: 100000,
|
||||||
|
timeout: 15e3,
|
||||||
|
})
|
||||||
|
.catch(() => undefined)
|
||||||
|
.then(localThumb => {
|
||||||
|
setExtLink({
|
||||||
|
...extLink,
|
||||||
|
isLoading: false, // done
|
||||||
|
localThumb,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return cleanup
|
||||||
|
}
|
||||||
|
if (extLink.isLoading) {
|
||||||
|
setExtLink({
|
||||||
|
...extLink,
|
||||||
|
isLoading: false, // done
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [extLink])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// HACK
|
// HACK
|
||||||
// wait a moment before focusing the input to resolve some layout bugs with the keyboard-avoiding-view
|
// wait a moment before focusing the input to resolve some layout bugs with the keyboard-avoiding-view
|
||||||
|
@ -119,6 +176,22 @@ export const ComposePost = observer(function ComposePost({
|
||||||
} else {
|
} else {
|
||||||
autocompleteView.setActive(false)
|
autocompleteView.setActive(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!extLink && /\s$/.test(newText)) {
|
||||||
|
const ents = extractEntities(newText)
|
||||||
|
const entLink = ents
|
||||||
|
?.filter(
|
||||||
|
ent => ent.type === 'link' && !attemptedExtLinks.includes(ent.value),
|
||||||
|
)
|
||||||
|
.pop() // use last
|
||||||
|
if (entLink) {
|
||||||
|
setExtLink({
|
||||||
|
uri: entLink.value,
|
||||||
|
isLoading: true,
|
||||||
|
})
|
||||||
|
setAttemptedExtLinks([...attemptedExtLinks, entLink.value])
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const onPressCancel = () => {
|
const onPressCancel = () => {
|
||||||
onClose()
|
onClose()
|
||||||
|
@ -141,6 +214,7 @@ export const ComposePost = observer(function ComposePost({
|
||||||
store,
|
store,
|
||||||
text,
|
text,
|
||||||
replyTo?.uri,
|
replyTo?.uri,
|
||||||
|
extLink,
|
||||||
selectedPhotos,
|
selectedPhotos,
|
||||||
autocompleteView.knownHandles,
|
autocompleteView.knownHandles,
|
||||||
setProcessingState,
|
setProcessingState,
|
||||||
|
@ -297,6 +371,12 @@ export const ComposePost = observer(function ComposePost({
|
||||||
selectedPhotos={selectedPhotos}
|
selectedPhotos={selectedPhotos}
|
||||||
onSelectPhotos={onSelectPhotos}
|
onSelectPhotos={onSelectPhotos}
|
||||||
/>
|
/>
|
||||||
|
{!selectedPhotos.length && extLink && (
|
||||||
|
<ExternalEmbed
|
||||||
|
link={extLink}
|
||||||
|
onRemove={() => setExtLink(undefined)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
{isSelectingPhotos &&
|
{isSelectingPhotos &&
|
||||||
localPhotos.photos != null &&
|
localPhotos.photos != null &&
|
||||||
|
|
|
@ -0,0 +1,125 @@
|
||||||
|
import React from 'react'
|
||||||
|
import {
|
||||||
|
ActivityIndicator,
|
||||||
|
StyleSheet,
|
||||||
|
TouchableWithoutFeedback,
|
||||||
|
View,
|
||||||
|
} from 'react-native'
|
||||||
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
|
import {BlurView} from '@react-native-community/blur'
|
||||||
|
import LinearGradient from 'react-native-linear-gradient'
|
||||||
|
import {AutoSizedImage} from '../util/images/AutoSizedImage'
|
||||||
|
import {Text} from '../util/text/Text'
|
||||||
|
import {s, gradients} from '../../lib/styles'
|
||||||
|
import {usePalette} from '../../lib/hooks/usePalette'
|
||||||
|
import {ExternalEmbedDraft} from '../../../state/lib/api'
|
||||||
|
|
||||||
|
export const ExternalEmbed = ({
|
||||||
|
link,
|
||||||
|
onRemove,
|
||||||
|
}: {
|
||||||
|
link?: ExternalEmbedDraft
|
||||||
|
onRemove: () => void
|
||||||
|
}) => {
|
||||||
|
const pal = usePalette('default')
|
||||||
|
const palError = usePalette('error')
|
||||||
|
if (!link) {
|
||||||
|
return <View />
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<View style={[styles.outer, pal.view, pal.border]}>
|
||||||
|
{link.isLoading ? (
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.image,
|
||||||
|
styles.imageFallback,
|
||||||
|
{backgroundColor: pal.colors.backgroundLight},
|
||||||
|
]}>
|
||||||
|
<ActivityIndicator size="large" style={styles.spinner} />
|
||||||
|
</View>
|
||||||
|
) : link.localThumb ? (
|
||||||
|
<AutoSizedImage
|
||||||
|
uri={link.localThumb.path}
|
||||||
|
containerStyle={styles.image}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<LinearGradient
|
||||||
|
colors={[gradients.blueDark.start, gradients.blueDark.end]}
|
||||||
|
start={{x: 0, y: 0}}
|
||||||
|
end={{x: 1, y: 1}}
|
||||||
|
style={[styles.image, styles.imageFallback]}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<TouchableWithoutFeedback onPress={onRemove}>
|
||||||
|
<BlurView style={styles.removeBtn} blurType="dark">
|
||||||
|
<FontAwesomeIcon size={18} icon="xmark" style={s.white} />
|
||||||
|
</BlurView>
|
||||||
|
</TouchableWithoutFeedback>
|
||||||
|
<View style={styles.inner}>
|
||||||
|
{!!link.meta?.title && (
|
||||||
|
<Text type="sm-bold" numberOfLines={2} style={[pal.text]}>
|
||||||
|
{link.meta.title}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
<Text type="sm" numberOfLines={1} style={[pal.textLight, styles.uri]}>
|
||||||
|
{link.uri}
|
||||||
|
</Text>
|
||||||
|
{!!link.meta?.description && (
|
||||||
|
<Text
|
||||||
|
type="sm"
|
||||||
|
numberOfLines={2}
|
||||||
|
style={[pal.text, styles.description]}>
|
||||||
|
{link.meta.description}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
{!!link.meta?.error && (
|
||||||
|
<Text
|
||||||
|
type="sm"
|
||||||
|
numberOfLines={2}
|
||||||
|
style={[{color: palError.colors.background}, styles.description]}>
|
||||||
|
{link.meta.error}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
outer: {
|
||||||
|
borderWidth: 1,
|
||||||
|
borderRadius: 8,
|
||||||
|
marginTop: 20,
|
||||||
|
},
|
||||||
|
inner: {
|
||||||
|
padding: 10,
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
borderTopLeftRadius: 6,
|
||||||
|
borderTopRightRadius: 6,
|
||||||
|
width: '100%',
|
||||||
|
height: 200,
|
||||||
|
},
|
||||||
|
imageFallback: {
|
||||||
|
height: 160,
|
||||||
|
},
|
||||||
|
removeBtn: {
|
||||||
|
position: 'absolute',
|
||||||
|
top: 10,
|
||||||
|
right: 10,
|
||||||
|
width: 36,
|
||||||
|
height: 36,
|
||||||
|
borderRadius: 18,
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
},
|
||||||
|
spinner: {
|
||||||
|
marginTop: 60,
|
||||||
|
},
|
||||||
|
uri: {
|
||||||
|
marginTop: 2,
|
||||||
|
},
|
||||||
|
description: {
|
||||||
|
marginTop: 4,
|
||||||
|
},
|
||||||
|
})
|
|
@ -132,7 +132,7 @@ const styles = StyleSheet.create({
|
||||||
borderTopLeftRadius: 6,
|
borderTopLeftRadius: 6,
|
||||||
borderTopRightRadius: 6,
|
borderTopRightRadius: 6,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: 200,
|
maxHeight: 200,
|
||||||
},
|
},
|
||||||
extImageFallback: {
|
extImageFallback: {
|
||||||
height: 160,
|
height: 160,
|
||||||
|
|
Loading…
Reference in New Issue