From eaa373ddda819afec7de6ad6d05520e1f52047cb Mon Sep 17 00:00:00 2001
From: "xan.lol" <xan@xan.lol>
Date: Sat, 11 Apr 2026 12:45:03 -0700
Subject: [PATCH] fix: image cdn in LiveStatusDialog, website in profiles, &
 agent session?

also work towards URI support in profile website field (and masked links?)
---
 package.json                                  |  1 +
 .../liveNow/components/LiveStatusDialog.tsx   |  5 ++-
 src/lib/strings/website.ts                    | 36 ++++---------------
 .../Profile/Header/EditProfileDialog.tsx      |  4 +--
 src/state/session/agent.ts                    | 10 +++---
 yarn.lock                                     |  2 +-
 6 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 1436360a2..15dc1ba26 100644
--- a/package.json
+++ b/package.json
@@ -238,6 +238,7 @@
     "tlds": "^1.234.0",
     "tldts": "^6.1.46",
     "unicode-segmenter": "^0.14.5",
+    "uri-js": "^4.4.1",
     "zod": "^3.20.2"
   },
   "devDependencies": {
diff --git a/src/features/liveNow/components/LiveStatusDialog.tsx b/src/features/liveNow/components/LiveStatusDialog.tsx
index 2c70aa7a0..de2b23956 100644
--- a/src/features/liveNow/components/LiveStatusDialog.tsx
+++ b/src/features/liveNow/components/LiveStatusDialog.tsx
@@ -12,6 +12,8 @@ import {useOpenLink} from '#/lib/hooks/useOpenLink'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {toNiceDomain} from '#/lib/strings/url-helpers'
+import {useImageCdnHost} from '#/state/preferences'
+import {maybeModifyImageCdnHost} from '#/state/preferences/image-cdn-host'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {unstableCacheProfileView} from '#/state/queries/profile'
 import {android, atoms as a, platform, tokens, useTheme, web} from '#/alf'
@@ -123,6 +125,7 @@ export function LiveStatus({
   const t = useTheme()
   const queryClient = useQueryClient()
   const openLink = useOpenLink()
+  const imageCdnHost = useImageCdnHost()
   const moderationOpts = useModerationOpts()
   const reportDialogControl = useGlobalReportDialogControl()
   const dialogContext = Dialog.useDialogContext()
@@ -144,7 +147,7 @@ export function LiveStatus({
             ]),
           ]}>
           <Image
-            source={embed.external.thumb}
+            source={maybeModifyImageCdnHost(embed.external.thumb, imageCdnHost)}
             contentFit="cover"
             style={[a.absolute, a.inset_0]}
             accessibilityIgnoresInvertColors
diff --git a/src/lib/strings/website.ts b/src/lib/strings/website.ts
index 689a2e9ff..c7607869f 100644
--- a/src/lib/strings/website.ts
+++ b/src/lib/strings/website.ts
@@ -1,12 +1,13 @@
+import {sanitizeUrl} from '@braintree/sanitize-url'
+import * as URI from 'uri-js'
+
 export function sanitizeWebsiteForDisplay(website: string): string {
   return website.replace(/^https?:\/\//i, '').replace(/\/$/, '')
 }
 
 export function sanitizeWebsiteForLink(website: string): string {
-  const normalized = website.toLowerCase()
-  return !normalized.startsWith('javascript')
-    ? normalized
-    : `unsafe-${website}`
+  const trimmedWebsite = website.trim()
+  return sanitizeUrl(trimmedWebsite)
 }
 
 export function isValidWebsiteFormat(website: string): boolean {
@@ -16,29 +17,6 @@ export function isValidWebsiteFormat(website: string): boolean {
     return true
   }
 
-  const normalizedWebsite = trimmedWebsite.toLowerCase()
-
-  if ('https://'.startsWith(normalizedWebsite)) {
-    return true
-  }
-
-  if (!normalizedWebsite.match(/^https:\/\/.+/)) {
-    return false
-  }
-
-  const domainMatch = normalizedWebsite.match(/^https:\/\/([^/\s]+)/)
-  if (!domainMatch) {
-    return false
-  }
-
-  const domain = domainMatch[1]
-
-  // Check for valid domain structure:
-  // - Must contain at least one dot
-  // - Must have a valid TLD (at least 2 characters after the last dot)
-  // - Cannot be just a single word without extension
-  const domainPattern =
-    /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*\.[a-zA-Z]{2,}$/
-
-  return domainPattern.test(domain)
+  const parsedWebsite = URI.parse(trimmedWebsite)
+  return !parsedWebsite.error && !!parsedWebsite.scheme
 }
diff --git a/src/screens/Profile/Header/EditProfileDialog.tsx b/src/screens/Profile/Header/EditProfileDialog.tsx
index 3959f34cf..26e51f953 100644
--- a/src/screens/Profile/Header/EditProfileDialog.tsx
+++ b/src/screens/Profile/Header/EditProfileDialog.tsx
@@ -210,7 +210,7 @@ function DialogInner({
           displayName: displayName.trimEnd(),
           description: description.trimEnd(),
           pronouns: pronouns.trimEnd().toLowerCase(),
-          website: website.trimEnd().toLowerCase(),
+          website: website.trimEnd(),
         },
         newUserAvatar,
         newUserBanner,
@@ -543,7 +543,7 @@ function DialogInner({
                 {color: t.palette.negative_400},
               ]}>
               <Trans>
-                Website must be a valid URL (e.g., https://bsky.app)
+                Website must be a valid URI (e.g., https://bsky.app)
               </Trans>
             </Text>
           )}
diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts
index 982ecf0a8..3247cec2c 100644
--- a/src/state/session/agent.ts
+++ b/src/state/session/agent.ts
@@ -51,7 +51,7 @@ export function createPublicAgent() {
   const agent = new BskyAppAgent({service: PUBLIC_BSKY_SERVICE})
   const proxyDid =
     readCustomAppViewDidUri() || BLUESKY_PROXY_HEADER.get() || APPVIEW_DID_PROXY
-  agent.configureProxy(proxyDid)
+  agent.configureProxy(proxyDid as ProxyHeaderValue)
   return agent
 }
 
@@ -83,7 +83,7 @@ export async function createAgentAndResume(
 
   const proxyDid =
     readCustomAppViewDidUri() || BLUESKY_PROXY_HEADER.get() || APPVIEW_DID_PROXY
-  agent.configureProxy(proxyDid)
+  agent.configureProxy(proxyDid as ProxyHeaderValue)
 
   return agent.prepare({
     resolvers: [gates, moderation, aa],
@@ -124,7 +124,7 @@ export async function createAgentAndLogin(
 
   const proxyDid =
     readCustomAppViewDidUri() || BLUESKY_PROXY_HEADER.get() || APPVIEW_DID_PROXY
-  agent.configureProxy(proxyDid)
+  agent.configureProxy(proxyDid as ProxyHeaderValue)
 
   return agent.prepare({
     resolvers: [gates, moderation, aa],
@@ -295,7 +295,7 @@ export async function createAgentAndCreateAccount(
 
   const proxyDid =
     readCustomAppViewDidUri() || BLUESKY_PROXY_HEADER.get() || APPVIEW_DID_PROXY
-  agent.configureProxy(proxyDid)
+  agent.configureProxy(proxyDid as ProxyHeaderValue)
 
   return agent.prepare({
     resolvers: [gates, moderation, aa],
@@ -409,7 +409,7 @@ class BskyAppAgent extends BskyAgent {
     })
     const proxyDid = readCustomAppViewDidUri() || APPVIEW_DID_PROXY
     if (proxyDid) {
-      this.configureProxy(proxyDid)
+      this.configureProxy(proxyDid as ProxyHeaderValue)
     }
   }
 
diff --git a/yarn.lock b/yarn.lock
index 12e6df60d..07ccffa5d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16106,7 +16106,7 @@ update-check@1.5.3:
     registry-auth-token "3.3.2"
     registry-url "3.1.0"
 
-uri-js@^4.2.2:
+uri-js@^4.2.2, uri-js@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-- 
2.51.2