+5 -3

src/lib/link-meta/link-meta.ts

··· 1 1 import {BskyAgent} from '@atproto/api' 2 2 - import {isBskyAppUrl} from '../strings/url-helpers' 3 3 - import {extractBskyMeta} from './bsky' 2 2 + 4 3 import {LINK_META_PROXY} from 'lib/constants' 5 4 import {getGiphyMetaUri} from 'lib/strings/embed-player' 5 5 + import {parseStarterPackUri} from 'lib/strings/starter-pack' 6 6 + import {isBskyAppUrl} from '../strings/url-helpers' 7 7 + import {extractBskyMeta} from './bsky' 6 8 7 9 export enum LikelyType { 8 10 HTML, ··· 28 30 url: string, 29 31 timeout = 15e3, 30 32 ): Promise<LinkMeta> { 31 31 - if (isBskyAppUrl(url)) { 33 33 + if (isBskyAppUrl(url) && !parseStarterPackUri(url)) { 32 34 return extractBskyMeta(agent, url) 33 35 } 34 36

+23

src/lib/link-meta/resolve-short-link.ts

··· 1 1 + import {logger} from '#/logger' 2 2 + import {startUriToStarterPackUri} from 'lib/strings/starter-pack' 3 3 + 4 4 + export async function resolveShortLink(shortLink: string) { 5 5 + const controller = new AbortController() 6 6 + const to = setTimeout(() => controller.abort(), 2e3) 7 7 + 8 8 + try { 9 9 + const res = await fetch(shortLink, { 10 10 + method: 'GET', 11 11 + signal: controller.signal, 12 12 + }) 13 13 + if (res.status !== 200) { 14 14 + return shortLink 15 15 + } 16 16 + return startUriToStarterPackUri(res.url) 17 17 + } catch (e: unknown) { 18 18 + logger.error('Failed to resolve short link', {safeMessage: e}) 19 19 + return null 20 20 + } finally { 21 21 + clearTimeout(to) 22 22 + } 23 23 + }

+4

src/lib/strings/starter-pack.ts

··· 99 99 }): string | null { 100 100 return new AtUri(`at://${did}/app.bsky.graph.starterpack/${rkey}`).toString() 101 101 } 102 102 + 103 103 + export function startUriToStarterPackUri(uri: string) { 104 104 + return uri.replace('/start/', '/starter-pack/') 105 105 + }

+11

src/lib/strings/url-helpers.ts

··· 2 2 import psl from 'psl' 3 3 import TLDs from 'tlds' 4 4 5 5 + import {logger} from '#/logger' 5 6 import {BSKY_SERVICE} from 'lib/constants' 6 7 import {isInvalidHandle} from 'lib/strings/handles' 7 8 ··· 285 286 const sanitizedPath = path.replace(BSKY_APP_HOST, '').replace(/^\/+/, '') 286 287 return `${BSKY_APP_HOST.replace(/\/$/, '')}/${sanitizedPath}` 287 288 } 289 289 + 290 290 + export function isShortLink(url: string): boolean { 291 291 + try { 292 292 + const urlp = new URL(url) 293 293 + return urlp.host === 'go.bsky.app' 294 294 + } catch (e) { 295 295 + logger.error('Failed to parse possible short link', {safeMessage: e}) 296 296 + return false 297 297 + } 298 298 + }

+13

src/view/com/composer/useExternalLinkFetch.ts

··· 12 12 getPostAsQuote, 13 13 } from 'lib/link-meta/bsky' 14 14 import {getLinkMeta} from 'lib/link-meta/link-meta' 15 15 + import {resolveShortLink} from 'lib/link-meta/resolve-short-link' 15 16 import {downloadAndResize} from 'lib/media/manip' 16 17 import { 17 18 isBskyCustomFeedUrl, 18 19 isBskyListUrl, 19 20 isBskyPostUrl, 21 21 + isShortLink, 20 22 } from 'lib/strings/url-helpers' 21 23 import {ImageModel} from 'state/models/media/image' 22 24 import {ComposerOpts} from 'state/shell/composer' ··· 94 96 setExtLink(undefined) 95 97 }, 96 98 ) 99 99 + } else if (isShortLink(extLink.uri)) { 100 100 + if (isShortLink(extLink.uri)) { 101 101 + resolveShortLink(extLink.uri).then(res => { 102 102 + if (res && res !== extLink.uri) { 103 103 + setExtLink({ 104 104 + uri: res, 105 105 + isLoading: true, 106 106 + }) 107 107 + } 108 108 + }) 109 109 + } 97 110 } else { 98 111 getLinkMeta(agent, extLink.uri).then(meta => { 99 112 if (aborted) {

+47 -29

src/view/com/util/post-embeds/ExternalLinkEmbed.tsx

··· 2 2 import {StyleProp, View, ViewStyle} from 'react-native' 3 3 import {Image} from 'expo-image' 4 4 import {AppBskyEmbedExternal} from '@atproto/api' 5 5 + import {msg} from '@lingui/macro' 6 6 + import {useLingui} from '@lingui/react' 5 7 6 8 import {usePalette} from 'lib/hooks/usePalette' 7 9 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' 8 10 import {shareUrl} from 'lib/sharing' 9 11 import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player' 12 12 + import { 13 13 + getStarterPackOgCard, 14 14 + parseStarterPackUri, 15 15 + } from 'lib/strings/starter-pack' 10 16 import {toNiceDomain} from 'lib/strings/url-helpers' 11 17 import {isNative} from 'platform/detection' 12 18 import {useExternalEmbedsPrefs} from 'state/preferences' ··· 28 34 style?: StyleProp<ViewStyle> 29 35 hideAlt?: boolean 30 36 }) => { 37 37 + const {_} = useLingui() 31 38 const pal = usePalette('default') 32 39 const {isMobile} = useWebMediaQueries() 33 40 const externalEmbedPrefs = useExternalEmbedsPrefs() 34 41 42 42 + const starterPackParsed = parseStarterPackUri(link.uri) 43 43 + const imageUri = starterPackParsed 44 44 + ? getStarterPackOgCard(starterPackParsed.name, starterPackParsed.rkey) 45 45 + : link.thumb 46 46 + 35 47 const embedPlayerParams = React.useMemo(() => { 36 48 const params = parseEmbedPlayerFromUrl(link.uri) 37 49 ··· 47 59 return ( 48 60 <View style={[a.flex_col, a.rounded_sm, a.overflow_hidden, a.mt_sm]}> 49 61 <LinkWrapper link={link} onOpen={onOpen} style={style}> 50 50 - {link.thumb && !embedPlayerParams ? ( 62 62 + {imageUri && !embedPlayerParams ? ( 51 63 <Image 52 64 style={{ 53 65 aspectRatio: 1.91, 54 66 borderTopRightRadius: 6, 55 67 borderTopLeftRadius: 6, 56 68 }} 57 57 - source={{uri: link.thumb}} 69 69 + source={{uri: imageUri}} 58 70 accessibilityIgnoresInvertColors 71 71 + accessibilityLabel={starterPackParsed ? link.title : undefined} 72 72 + accessibilityHint={ 73 73 + starterPackParsed ? _(msg`Navigate to starter pack`) : undefined 74 74 + } 59 75 /> 60 76 ) : undefined} 61 77 {embedPlayerParams?.isGif ? ( ··· 63 79 ) : embedPlayerParams ? ( 64 80 <ExternalPlayer link={link} params={embedPlayerParams} /> 65 81 ) : undefined} 66 66 - <View 67 67 - style={[ 68 68 - a.flex_1, 69 69 - a.py_sm, 70 70 - { 71 71 - paddingHorizontal: isMobile ? 10 : 14, 72 72 - }, 73 73 - ]}> 74 74 - <Text 75 75 - type="sm" 76 76 - numberOfLines={1} 77 77 - style={[pal.textLight, {marginVertical: 2}]}> 78 78 - {toNiceDomain(link.uri)} 79 79 - </Text> 80 80 - 81 81 - {!embedPlayerParams?.isGif && !embedPlayerParams?.dimensions && ( 82 82 - <Text type="lg-bold" numberOfLines={3} style={[pal.text]}> 83 83 - {link.title || link.uri} 84 84 - </Text> 85 85 - )} 86 86 - {link.description ? ( 82 82 + {!starterPackParsed ? ( 83 83 + <View 84 84 + style={[ 85 85 + a.flex_1, 86 86 + a.py_sm, 87 87 + { 88 88 + paddingHorizontal: isMobile ? 10 : 14, 89 89 + }, 90 90 + ]}> 87 91 <Text 88 88 - type="md" 89 89 - numberOfLines={link.thumb ? 2 : 4} 90 90 - style={[pal.text, a.mt_xs]}> 91 91 - {link.description} 92 92 + type="sm" 93 93 + numberOfLines={1} 94 94 + style={[pal.textLight, {marginVertical: 2}]}> 95 95 + {toNiceDomain(link.uri)} 92 96 </Text> 93 93 - ) : undefined} 94 94 - </View> 97 97 + 98 98 + {!embedPlayerParams?.isGif && !embedPlayerParams?.dimensions && ( 99 99 + <Text type="lg-bold" numberOfLines={3} style={[pal.text]}> 100 100 + {link.title || link.uri} 101 101 + </Text> 102 102 + )} 103 103 + {link.description ? ( 104 104 + <Text 105 105 + type="md" 106 106 + numberOfLines={link.thumb ? 2 : 4} 107 107 + style={[pal.text, a.mt_xs]}> 108 108 + {link.description} 109 109 + </Text> 110 110 + ) : undefined} 111 111 + </View> 112 112 + ) : null} 95 113 </LinkWrapper> 96 114 </View> 97 115 )