diff options
| -rw-r--r-- | __tests__/lib/strings/url-helpers.test.ts | 7 | ||||
| -rw-r--r-- | src/components/Link.tsx | 6 | ||||
| -rw-r--r-- | src/lib/constants.ts | 1 | ||||
| -rw-r--r-- | src/lib/strings/url-helpers.ts | 20 |
4 files changed, 24 insertions, 10 deletions
diff --git a/__tests__/lib/strings/url-helpers.test.ts b/__tests__/lib/strings/url-helpers.test.ts index fb4b8f755..0b1b75028 100644 --- a/__tests__/lib/strings/url-helpers.test.ts +++ b/__tests__/lib/strings/url-helpers.test.ts @@ -1,10 +1,10 @@ -import {it, describe, expect} from '@jest/globals' +import {describe, expect, it} from '@jest/globals' import { - linkRequiresWarning, isPossiblyAUrl, - splitApexDomain, isTrustedUrl, + linkRequiresWarning, + splitApexDomain, } from '../../../src/lib/strings/url-helpers' describe('linkRequiresWarning', () => { @@ -170,6 +170,7 @@ describe('isTrustedUrl', () => { ['https://google.com', false], ['https://docs.google.com', false], ['https://google.com/#', false], + ['https://blueskywebxzendesk.com', false], ] it.each(cases)('given input uri %p, returns %p', (str, expected) => { diff --git a/src/components/Link.tsx b/src/components/Link.tsx index 65a015ba3..a2e952a6e 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -3,10 +3,12 @@ import {GestureResponderEvent} from 'react-native' import {sanitizeUrl} from '@braintree/sanitize-url' import {StackActions, useLinkProps} from '@react-navigation/native' +import {BSKY_DOWNLOAD_URL} from '#/lib/constants' import {AllNavigatorParams} from '#/lib/routes/types' import {shareUrl} from '#/lib/sharing' import { convertBskyAppUrlIfNeeded, + isBskyDownloadUrl, isExternalUrl, linkRequiresWarning, } from '#/lib/strings/url-helpers' @@ -125,7 +127,9 @@ export function useLink({ (event.metaKey || event.altKey || event.ctrlKey || event.shiftKey) const shouldOpenInNewTab = isMetaKey || isMiddleClick - if ( + if (isBskyDownloadUrl(href)) { + shareUrl(BSKY_DOWNLOAD_URL) + } else if ( shouldOpenInNewTab || href.startsWith('http') || href.startsWith('mailto') diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 3f8cf9472..d7bec1e18 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -10,6 +10,7 @@ const HELP_DESK_LANG = 'en-us' export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}` export const EMBED_SERVICE = 'https://embed.bsky.app' export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js` +export const BSKY_DOWNLOAD_URL = 'https://bsky.app/download' const BASE_FEEDBACK_FORM_URL = `${HELP_DESK_URL}/requests/new` export function FEEDBACK_FORM_URL({ diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 70a2b7069..2a20373a4 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -1,14 +1,15 @@ import {AtUri} from '@atproto/api' -import {BSKY_SERVICE} from 'lib/constants' -import TLDs from 'tlds' import psl from 'psl' +import TLDs from 'tlds' + +import {BSKY_SERVICE} from 'lib/constants' export const BSKY_APP_HOST = 'https://bsky.app' const BSKY_TRUSTED_HOSTS = [ - 'bsky.app', - 'bsky.social', - 'blueskyweb.xyz', - 'blueskyweb.zendesk.com', + 'bsky\\.app', + 'bsky\\.social', + 'blueskyweb\\.xyz', + 'blueskyweb\\.zendesk\\.com', ...(__DEV__ ? ['localhost:19006', 'localhost:8100'] : []), ] @@ -145,6 +146,13 @@ export function isBskyListUrl(url: string): boolean { return false } +export function isBskyDownloadUrl(url: string): boolean { + if (isExternalUrl(url)) { + return false + } + return url === '/download' || url.startsWith('/download?') +} + export function convertBskyAppUrlIfNeeded(url: string): string { if (isBskyAppUrl(url)) { try { |