From c08fcbcbb0419d037c7418ba6cb8fcbe017e686f Mon Sep 17 00:00:00 2001 From: Hailey Date: Wed, 6 Mar 2024 11:38:44 -0800 Subject: [PATCH 1/2] fix internal links showing up as external pt2 --- src/lib/strings/url-helpers.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index ee88225ee7..650e8d84c0 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -152,14 +152,17 @@ export function linkRequiresWarning(uri: string, label: string) { try { urip = new URL(uri) } catch { + // If the uri started with a / we know it is internal. + if (uri.startsWith('/')) { + return false + } + return true } const host = urip.hostname.toLowerCase() - // Hosts that end with bsky.app or bsky.social should be trusted by default. if ( - uri.startsWith('/') || host.endsWith('bsky.app') || host.endsWith('bsky.social') || host.endsWith('blueskyweb.xyz') From aa6f8a0546add61bcbc3424edee81e5a746e4d5e Mon Sep 17 00:00:00 2001 From: Hailey Date: Wed, 6 Mar 2024 11:39:25 -0800 Subject: [PATCH 2/2] fix internal links showing up as external pt2 --- src/lib/strings/url-helpers.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 650e8d84c0..7729e4a382 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -148,15 +148,15 @@ export function feedUriToHref(url: string): string { export function linkRequiresWarning(uri: string, label: string) { const labelDomain = labelToDomain(label) + // If the uri started with a / we know it is internal. + if (uri.startsWith('/')) { + return false + } + let urip try { urip = new URL(uri) } catch { - // If the uri started with a / we know it is internal. - if (uri.startsWith('/')) { - return false - } - return true }