Fix isPartOfLastBranchFromDepth assignment

.env.example

@@ -16,9 +16,6 @@ EXPO_PUBLIC_LOG_LEVEL=debug
 # Enable debug logs for specific logger instances
 EXPO_PUBLIC_LOG_DEBUG=session
 
-# Bluesky appview DID
-EXPO_PUBLIC_BLUESKY_PROXY_DID=
-
 # Chat service DID
 EXPO_PUBLIC_CHAT_PROXY_DID=
 

.eslintrc.js

@@ -34,7 +34,6 @@ module.exports = {
           'P',
           'Admonition',
           'Admonition.Admonition',
-          'Toast.Action',
           'AgeAssuranceAdmonition',
           'Span',
         ],
@@ -111,8 +110,6 @@ module.exports = {
     'bskyembed',
     'src/locale/locales/_build/',
     'src/locale/locales/**/*.js',
-    '*.e2e.ts',
-    '*.e2e.tsx',
   ],
   settings: {
     componentWrapperFunctions: ['observer'],

.github/workflows/pull-request-comment.yml

@@ -84,10 +84,10 @@ jobs:
               repo: context.repo.repo,
               pull_number: ${{ github.event.issue.number }}
             });
-
+            
             console.log(`PR HEAD SHA: ${pr.data.head.sha}`);
             console.log(`PR HEAD REF: ${pr.data.head.ref}`);
-
+            
             core.setOutput('head-sha', pr.data.head.sha);
             core.setOutput('head-ref', pr.data.head.ref);
 
@@ -188,15 +188,13 @@ jobs:
           header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
           number: ${{ github.event.issue.number }}
           message: |
-            Your requested OTA deployment was successful! You may now apply it by either scanning the QR code or opening the deep link below in your browser:
-
-            <img src="https://bsky-qr.vercel.app?channel=pull-request-${{ github.event.issue.number }}" width=300 height=300>
+            Your requested OTA deployment was successful! You may now apply it by opening the deep link below in your browser:
 
             `bluesky://intent/apply-ota?channel=pull-request-${{ github.event.issue.number }}`
             ---
-
             *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
 
+
       - name: 💬 Drop a comment
         uses: marocchino/sticky-pull-request-comment@v2
         if: failure()

.gitignore

@@ -58,7 +58,6 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
-Gemfile.lock
 
 # Testing
 coverage/

__e2e__/flows/composer-self-label.yml

@@ -3,26 +3,20 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 # Post an image with the porn label
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn: "Content warnings"
 - tapOn: "Porn"
 - tapOn:

__e2e__/flows/composer.yml

@@ -3,17 +3,13 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post text only"
@@ -25,10 +21,7 @@ appId: xyz.blueskyweb.app
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:
@@ -53,10 +46,7 @@ appId: xyz.blueskyweb.app
     id: "replyBtn"
 - inputText: "Reply with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:
@@ -83,10 +73,7 @@ appId: xyz.blueskyweb.app
     id: "quoteBtn"
 - inputText: "QP with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:

__e2e__/flows/create-account.yml

@@ -32,9 +32,6 @@ appId: xyz.blueskyweb.app
     text: "Not Now"
     optional: true
 - inputText: "e2e-test"
-- extendedWaitUntil:
-    visible:
-        id: "handleAvailableCheck"
 - tapOn:
     id: "nextBtn"
-- assertVisible: "Give your profile a face"
+

__e2e__/flows/curate-lists.yml

@@ -3,14 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows&posts"
+        SERVER_PATH: "?users&follows&posts"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 - tapOn:
     label: "Create a curate list"
@@ -78,8 +75,9 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "confirmBtn"
 
-- assertVisible:
-    id: "newUserListBtn"
+- tapOn:
+    label: "Create a new curatelist"
+    id: "e2eGotoLists"
 - tapOn:
     id: "newUserListBtn"
 - assertVisible:
@@ -148,7 +146,7 @@ appId: xyz.blueskyweb.app
 
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search for posts, users, or feeds"
 - inputText: "bob"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/mod-lists.yml

@@ -3,14 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows&labels"
+        SERVER_PATH: "?users&follows&labels"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 # create a modlist
 - tapOn:
@@ -31,17 +28,20 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Muted Users"
 - assertVisible: "Shhh"
 
-# DOES NOT WORK - THE BUTTON IS NOT ACCESSIBLE
-# IGNORING FOR NOW, FIX THE COMPONENTS IN THE NEXT RELEASE
-# BECAUSE THIS IS A LEGIT A11Y PROBLEM -sfn
-- tapOn: "Subscribe to this list"
+- tapOn:
+    label: "Dropdown"
+    point: "71%,9%"
+
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"
 
-- tapOn: "Subscribe to this list"
+- tapOn:
+      label: "Dropdown"
+      point: "71%,9%"
+
 - tapOn: "Block accounts"
 - tapOn: "Block list"
 - tapOn: "Unblock"
 
-  # the rest of the behaviors are tested in curate-lists.yml
+ # the rest of the behaviors are tested in curate-lists.yml

__e2e__/flows/onboarding-avatar-creator.yml

@@ -3,15 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - tapOn:
     id: "e2eStartOnboarding"
 - tapOn: "Open avatar creator"
@@ -25,12 +21,12 @@ appId: xyz.blueskyweb.app
 - tapOn: "Select the atom emoji as your avatar"
 - tapOn: "Done"
 - waitForAnimationToEnd
-- tapOn:
-    id: "onboardingContinue"
+- tapOn: "Continue to next step"
 - assertVisible: "What are your interests?"
 - tapOn:
-    id: "onboardingContinue"
+    label: "Tap on continue"
+    point: "50%,92%"
 - assertVisible: "You're ready to go!"
 - tapOn:
-    id: "onboardingFinish"
-- assertVisible: "Following"
+    label: "Tap on Lets go"
+    point: "50%,92%"

__e2e__/flows/onboarding.yml

@@ -3,15 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - tapOn:
     id: "e2eStartOnboarding"
 - tapOn: "Select an avatar"
@@ -22,12 +18,12 @@ appId: xyz.blueskyweb.app
 - waitForAnimationToEnd
 - tapOn: "Done"
 - waitForAnimationToEnd
-- tapOn:
-    id: "onboardingContinue"
+- tapOn: "Continue to next step"
 - assertVisible: "What are your interests?"
 - tapOn:
-    id: "onboardingContinue"
+    label: "Tap on continue"
+    point: "50%,92%"
 - assertVisible: "You're ready to go!"
 - tapOn:
-    id: "onboardingFinish"
-- assertVisible: "Following"
+    label: "Tap on Lets go"
+    point: "50%,92%"

__e2e__/flows/post-report-flow.yml

@@ -3,14 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows&posts"
+        SERVER_PATH: "?users&follows&posts"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 - tapOn:
     id: "postDropdownBtn"

__e2e__/flows/profile-screen.yml

@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&posts&feeds"
+        SERVER_PATH: "?users&posts&feeds"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
@@ -12,10 +12,10 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile
 - extendedWaitUntil:
     visible:
-      id: "bottomBarSearchBtn"
+        id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search for posts, users, or feeds"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
@@ -38,4 +38,4 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "profileHeaderDropdownBtn"
 - tapOn: "Unmute Account"
-- assertNotVisible: "Account Muted"
+- assertNotVisible: "Account Muted"

__e2e__/flows/search-screen.yml

@@ -3,22 +3,20 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
 
 # Navigate to another user profile via autocomplete
-- extendedWaitUntil:
-    visible:
-      id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- assertVisible: "Search for posts, users[,]? or feeds"
-- tapOn: "Search for posts, users[,]? or feeds"
+- assertVisible: "Search for posts, users, or feeds"
+- tapOn: "Search for posts, users, or feeds"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
 - assertVisible:
     id: "profileView"
+

__e2e__/flows/shared-prefs.yml

@@ -8,12 +8,8 @@ appId: xyz.blueskyweb.app
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - assertVisible:
-    id: "storybookBtn"
+      id: "storybookBtn"
 - tapOn:
     id: "storybookBtn"
 - tapOn:

__e2e__/flows/thread-muting.yml

@@ -3,16 +3,13 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows"
+        SERVER_PATH: "?users&follows"
 - runFlow:
     file: ../setupApp.yml
 
 # Login, create a thread, and log out
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - assertVisible:
     id: "composeFAB"
 - tapOn:
@@ -22,13 +19,8 @@ appId: xyz.blueskyweb.app
     id: "composerPublishBtn"
 
 # Login, reply to the thread, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInBob"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "replyBtn"
 - inputText: "Reply 1"
@@ -36,13 +28,8 @@ appId: xyz.blueskyweb.app
     id: "composerPublishBtn"
 
 # Login, confirm notification exists, mute thread, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarNotificationsBtn"
 - assertVisible:
@@ -52,17 +39,12 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "postDropdownBtn"
     childOf:
-      id: "postThreadItem-by-bob.test"
+        id: "postThreadItem-by-bob.test"
 - tapOn: "Mute thread"
 
 # Login, reply to the thread twice, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInBob"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarProfileBtn"
 - tapOn:
@@ -78,35 +60,24 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "composerPublishBtn"
 
-# Login, confirm notifications dont exist, unmute the thread, ~~confirm notifications exist~~
-# Mute thread behaviour no longer change old notifications after muting/unmuting a thread -sfn
-- tapOn:
-    id: "e2eSignOut"
+
+# Login, confirm notifications dont exist, unmute the thread, confirm notifications exist
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarNotificationsBtn"
-- assertVisible: ".*Reply 1.*"
-- assertNotVisible: ".*Reply 2.*"
-- assertNotVisible: ".*Reply 3.*"
-- assertVisible:
+- assertNotVisible:
     id: "feedItem-by-bob.test"
 - tapOn:
-    id: "feedItem-by-bob.test"
+    id: "bottomBarHomeBtn"
 - tapOn:
     id: "postDropdownBtn"
-    childOf:
-      id: "postThreadItem-by-bob.test"
 - tapOn: "Unmute thread"
 - tapOn:
     id: "bottomBarNotificationsBtn"
 - swipe:
     from:
-      id: "notifsFeed"
+        id: "notifsFeed"
     direction: DOWN
-- assertVisible: ".*Reply 1.*"
-- assertNotVisible: ".*Reply 2.*"
-- assertNotVisible: ".*Reply 3.*"
+- assertVisible:
+    id: "feedItem-by-bob.test"

__e2e__/mock-server.ts

@@ -1,7 +1,7 @@
 import {createServer as createHTTPServer} from 'node:http'
 import {parse} from 'node:url'
 
-import {createServer, type TestPDS} from '../jest/test-pds'
+import {createServer, TestPDS} from '../jest/test-pds'
 
 async function main() {
   let server: TestPDS
@@ -181,10 +181,10 @@ async function main() {
             'warn-profile',
             'warn-posts',
             'muted-account',
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'blocking-account',
             'blockedby-account',
-            'mutual-block-acc',
+            'mutual-block-account',
           ]) {
             await server.mocker.createUser(user)
             await server.mocker.follow('alice', user)
@@ -411,16 +411,16 @@ async function main() {
           await server.mocker.addToMuteList(
             'alice',
             list,
-            server.mocker.users['muted-by-list-acc'].did,
+            server.mocker.users['muted-by-list-account'].did,
           )
-          await server.mocker.createPost('muted-by-list-acc', 'muted post')
+          await server.mocker.createPost('muted-by-list-account', 'muted post')
           await server.mocker.createQuotePost(
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'account quote post',
             anchorPost,
           )
           await server.mocker.createReply(
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'account reply',
             anchorPost,
           )
@@ -470,16 +470,16 @@ async function main() {
           )
 
           await server.mocker.createPost(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block post',
           )
           await server.mocker.createQuotePost(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block quote post',
             anchorPost,
           )
           await server.mocker.createReply(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block reply',
             anchorPost,
           )
@@ -488,15 +488,15 @@ async function main() {
               repo: server.mocker.users.alice.did,
             },
             {
-              subject: server.mocker.users['mutual-block-acc'].did,
+              subject: server.mocker.users['mutual-block-account'].did,
               createdAt: new Date().toISOString(),
             },
           )
           await server.mocker.users[
-            'mutual-block-acc'
+            'mutual-block-account'
           ].agent.app.bsky.graph.block.create(
             {
-              repo: server.mocker.users['mutual-block-acc'].did,
+              repo: server.mocker.users['mutual-block-account'].did,
             },
             {
               subject: server.mocker.users.alice.did,
@@ -509,16 +509,7 @@ async function main() {
         }
       }
       console.log('Ready')
-      return res
-        .writeHead(200, {
-          'content-type': 'application/json',
-        })
-        .end(
-          JSON.stringify({
-            pdsUrl: server.pdsUrl,
-            appviewDid: server.appviewDid,
-          }),
-        )
+      return res.writeHead(200).end(server.pdsUrl)
     } catch (e) {
       console.error('Error!', e)
       return res.writeHead(500).end()

__e2e__/setupApp.yml

@@ -11,8 +11,3 @@ appId: xyz.blueskyweb.app
 - swipe:
    from: "Bluesky"
    direction: DOWN
-- tapOn:
-   id: e2eProxyHeaderInput
-- inputText: ${output.result}
-- pressKey: Enter
-- hideKeyboard

__e2e__/setupServer.js

@@ -1,8 +1,5 @@
-// eslint-disable-next-line no-undef
-var res = http.post('http://localhost:1986/' + SERVER_PATH, {
+// eslint-disable-next-line
+http.post('http://localhost:1986/' + SERVER_PATH, {
   headers: {'Content-Type': 'text/plain'},
   body: '',
 })
-
-// eslint-disable-next-line no-undef
-output.result = json(res.body).appviewDid

app.config.js

@@ -43,7 +43,6 @@ module.exports = function (_config) {
       icon: './assets/app-icons/ios_icon_default_light.png',
       userInterfaceStyle: 'automatic',
       primaryColor: '#1083fe',
-      newArchEnabled: true,
       ios: {
         supportsTablet: false,
         bundleIdentifier: 'xyz.blueskyweb.app',
@@ -208,11 +207,13 @@ module.exports = function (_config) {
           {
             ios: {
               deploymentTarget: '15.1',
+              newArchEnabled: false,
             },
             android: {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
+              newArchEnabled: false,
             },
           },
         ],
@@ -302,11 +303,6 @@ module.exports = function (_config) {
               android: './assets/app-icons/android_icon_default_dark.png',
               prerendered: true,
             },
-            next: {
-              ios: './assets/app-icons/icon_default_next.png',
-              android: './assets/app-icons/icon_default_next.png',
-              prerendered: true,
-            },
 
             /**
              * Bluesky+ core set

bskyembed/package.json

@@ -6,25 +6,24 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "build-snippet": "tsc --project tsconfig.snippet.json",
-    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
-    "typecheck": "tsc --noEmit"
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src"
   },
   "dependencies": {
-    "@atproto/api": "^0.15.25",
-    "preact": "^10.4.8"
+    "@atproto/api": "0.13.6",
+    "@preact/preset-vite": "^2.8.2",
+    "@vitejs/plugin-legacy": "^5.3.2",
+    "preact": "^10.4.8",
+    "terser": "^5.30.3"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.10.2",
-    "@vitejs/plugin-legacy": "^7.0.0",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.19.0",
     "eslint-config-preact": "^1.3.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "vite": "^7.0.4",
-    "vite-tsconfig-paths": "^5.1.4"
+    "typescript": "^5.5.4",
+    "vite": "^5.2.8",
+    "vite-tsconfig-paths": "^4.3.2"
   }
 }

bskyembed/src/components/container.tsx

@@ -49,7 +49,7 @@ export function Container({
         }
       }}>
       {href && <Link href={href} />}
-      <div className="flex-1 px-4 pt-3 pb-2.5 max-w-full">{children}</div>
+      <div className="flex-1 px-4 pt-3 pb-2.5">{children}</div>
     </div>
   )
 }

bskyembed/src/components/embed.tsx

@@ -17,11 +17,8 @@ import infoIcon from '../../assets/circleInfo_stroke2_corner0_rounded.svg'
 import playIcon from '../../assets/play_filled_corner2_rounded.svg'
 import starterPackIcon from '../../assets/starterPack.svg'
 import {CONTENT_LABELS, labelsToInfo} from '../labels'
-import * as bsky from '../types/bsky'
-import {getRkey} from '../util/rkey'
-import {getVerificationState} from '../util/verification-state'
+import {getRkey} from '../utils'
 import {Link} from './link'
-import {VerificationCheck} from './verification-check'
 
 export function Embed({
   content,
@@ -78,35 +75,23 @@ export function Embed({
           CONTENT_LABELS.includes(label.val),
         )
 
-        const verification = getVerificationState({profile: record.author})
-
         return (
           <Link
             href={`/profile/${record.author.did}/post/${getRkey(record)}`}
             className="transition-colors hover:bg-neutral-100 dark:hover:bg-slate-700 border dark:border-slate-600 rounded-xl p-2 gap-1.5 w-full flex flex-col">
             <div className="flex gap-1.5 items-center">
-              <div className="w-4 h-4 rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
+              <div className="w-4 h-4 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
                 <img
-                  className="rounded-full"
                   src={record.author.avatar}
                   style={isAuthorLabeled ? {filter: 'blur(1.5px)'} : undefined}
                 />
               </div>
-              <div className="flex flex-1 items-center shrink min-w-0 min-h-0">
-                <p className="block text-sm shrink-0 font-bold max-w-[70%] line-clamp-1">
-                  {record.author.displayName?.trim() || record.author.handle}
-                </p>
-                {verification.isVerified && (
-                  <VerificationCheck
-                    className="ml-[3px] mt-px shrink-0 self-center"
-                    verifier={verification.role === 'verifier'}
-                    size={12}
-                  />
-                )}
-                <p className="block line-clamp-1 text-sm text-textLight dark:text-textDimmed shrink-[10] ml-1">
+              <p className="line-clamp-1 text-sm">
+                <span className="font-bold">{record.author.displayName}</span>
+                <span className="text-textLight dark:text-textDimmed ml-1">
                   @{record.author.handle}
-                </p>
-              </div>
+                </span>
+              </p>
             </div>
             {text && <p className="text-sm">{text}</p>}
             {record.embeds?.map(embed => (
@@ -419,12 +404,7 @@ function StarterPackEmbed({
 }: {
   content: AppBskyGraphDefs.StarterPackViewBasic
 }) {
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      content.record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!AppBskyGraphStarterpack.isRecord(content.record)) {
     return null
   }
 
@@ -463,9 +443,7 @@ function StarterPackEmbed({
 }
 
 // from #/lib/strings/starter-pack.ts
-function getStarterPackImage(
-  starterPack: AppBskyGraphDefs.StarterPackViewBasic,
-) {
+function getStarterPackImage(starterPack: AppBskyGraphDefs.StarterPackView) {
   const rkey = getRkey({uri: starterPack.uri})
   return `https://ogcard.cdn.bsky.app/start/${starterPack.creator.did}/${rkey}`
 }

bskyembed/src/components/post.tsx

@@ -11,15 +11,10 @@ import likeIcon from '../../assets/heart2_filled_stroke2_corner0_rounded.svg'
 import logo from '../../assets/logo.svg'
 import repostIcon from '../../assets/repost_stroke2_corner2_rounded.svg'
 import {CONTENT_LABELS} from '../labels'
-import * as bsky from '../types/bsky'
-import {niceDate} from '../util/nice-date'
-import {prettyNumber} from '../util/pretty-number'
-import {getRkey} from '../util/rkey'
-import {getVerificationState} from '../util/verification-state'
+import {getRkey, niceDate, prettyNumber} from '../utils'
 import {Container} from './container'
 import {Embed} from './embed'
 import {Link} from './link'
-import {VerificationCheck} from './verification-check'
 
 interface Props {
   thread: AppBskyFeedDefs.ThreadViewPost
@@ -33,25 +28,16 @@ export function Post({thread}: Props) {
   )
 
   let record: AppBskyFeedPost.Record | null = null
-  if (
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+  if (AppBskyFeedPost.isRecord(post.record)) {
     record = post.record
   }
 
-  const verification = getVerificationState({profile: post.author})
-
   const href = `/profile/${post.author.did}/post/${getRkey(post)}`
   return (
     <Container href={href}>
       <div className="flex-1 flex-col flex gap-2" lang={record?.langs?.[0]}>
-        <div className="flex gap-2.5 items-center cursor-pointer w-full max-w-full">
-          <Link
-            href={`/profile/${post.author.did}`}
-            className="rounded-full shrink-0">
+        <div className="flex gap-2.5 items-center cursor-pointer">
+          <Link href={`/profile/${post.author.did}`} className="rounded-full">
             <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
               <img
                 src={post.author.avatar}
@@ -59,27 +45,19 @@ export function Post({thread}: Props) {
               />
             </div>
           </Link>
-          <div className="flex flex-1 flex-col min-w-0">
-            <div className="flex flex-1 items-center">
-              <Link
-                href={`/profile/${post.author.did}`}
-                className="block font-bold text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 text-ellipsis decoration-2">
-                {post.author.displayName?.trim() || post.author.handle}
-              </Link>
-              {verification.isVerified && (
-                <VerificationCheck
-                  className="pl-[3px] mt-px shrink-0"
-                  verifier={verification.role === 'verifier'}
-                  size={15}
-                />
-              )}
-            </div>
+          <div>
             <Link
               href={`/profile/${post.author.did}`}
-              className="block text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
-              @{post.author.handle}
+              className="font-bold text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 decoration-2">
+              <p>{post.author.displayName}</p>
+            </Link>
+            <Link
+              href={`/profile/${post.author.did}`}
+              className="text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
+              <p>@{post.author.handle}</p>
             </Link>
           </div>
+          <div className="flex-1" />
           <Link
             href={href}
             className="transition-transform hover:scale-110 shrink-0 self-start">
@@ -155,7 +133,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
         <Link
           key={counter}
           href={segment.link.uri}
-          className="text-blue-500 hover:underline"
+          className="text-blue-400 hover:underline"
           disableTracking={
             !segment.link.uri.startsWith('https://bsky.app') &&
             !segment.link.uri.startsWith('https://go.bsky.app')

bskyembed/src/components/verification-check.tsx

@@ -1,56 +0,0 @@
-import {h} from 'preact'
-
-type IconProps = {
-  size: number
-  className?: string
-}
-
-export function VerificationCheck({
-  verifier,
-  ...rest
-}: {verifier: boolean} & IconProps) {
-  return verifier ? <VerifierCheck {...rest} /> : <VerifiedCheck {...rest} />
-}
-
-export function VerifiedCheck({size, className}: IconProps) {
-  return (
-    <svg
-      fill="none"
-      viewBox="0 0 24 24"
-      width={size}
-      height={size}
-      className={className}>
-      <circle cx="12" cy="12" r="11.5" fill="hsl(211, 99%, 53%)" />
-      <path
-        fill="#fff"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M17.659 8.175a1.361 1.361 0 0 1 0 1.925l-6.224 6.223a1.361 1.361 0 0 1-1.925 0L6.4 13.212a1.361 1.361 0 0 1 1.925-1.925l2.149 2.148 5.26-5.26a1.361 1.361 0 0 1 1.925 0Z"
-      />
-    </svg>
-  )
-}
-
-export function VerifierCheck({size, className}: IconProps) {
-  return (
-    <svg
-      fill="none"
-      viewBox="0 0 24 24"
-      width={size}
-      height={size}
-      className={className}>
-      <path
-        fill="hsl(211, 99%, 53%)"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M8.792 1.615a4.154 4.154 0 0 1 6.416 0 4.154 4.154 0 0 0 3.146 1.515 4.154 4.154 0 0 1 4 5.017 4.154 4.154 0 0 0 .777 3.404 4.154 4.154 0 0 1-1.427 6.255 4.153 4.153 0 0 0-2.177 2.73 4.154 4.154 0 0 1-5.781 2.784 4.154 4.154 0 0 0-3.492 0 4.154 4.154 0 0 1-5.78-2.784 4.154 4.154 0 0 0-2.178-2.73A4.154 4.154 0 0 1 .87 11.551a4.154 4.154 0 0 0 .776-3.404A4.154 4.154 0 0 1 5.646 3.13a4.154 4.154 0 0 0 3.146-1.515Z"
-      />
-      <path
-        fill="#fff"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M17.861 8.26a1.438 1.438 0 0 1 0 2.033l-6.571 6.571a1.437 1.437 0 0 1-2.033 0L5.97 13.58a1.438 1.438 0 0 1 2.033-2.033l2.27 2.269 5.554-5.555a1.437 1.437 0 0 1 2.033 0Z"
-      />
-    </svg>
-  )
-}

bskyembed/src/screens/landing.tsx

@@ -14,11 +14,9 @@ import {
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
-import * as bsky from '../types/bsky'
-import {niceDate} from '../util/nice-date'
+import {niceDate} from '../utils'
 
-const DEFAULT_POST =
-  'https://bsky.app/profile/did:plc:vjug55kidv6sye7ykr5faxxn/post/3jzn6g7ixgq2y'
+const DEFAULT_POST = 'https://bsky.app/profile/emilyliu.me/post/3jzn6g7ixgq2y'
 const DEFAULT_URI =
   'at://did:plc:vjug55kidv6sye7ykr5faxxn/app.bsky.feed.post/3jzn6g7ixgq2y'
 
@@ -224,12 +222,7 @@ function Snippet({
   const snippet = useMemo(() => {
     const record = thread.post.record
 
-    if (
-      !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        record,
-        AppBskyFeedPost.isRecord,
-      )
-    ) {
+    if (!AppBskyFeedPost.isRecord(record)) {
       return ''
     }
 

bskyembed/src/screens/post.tsx

@@ -8,7 +8,7 @@ import {applyTheme, initSystemColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
-import {getRkey} from '../util/rkey'
+import {getRkey} from '../utils'
 
 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')

bskyembed/src/types/bsky/index.ts

@@ -1,49 +0,0 @@
-import {ValidationResult} from '@atproto/lexicon'
-
-export * as profile from './profile'
-
-/**
- * Fast type checking without full schema validation, for use with data we
- * trust, or for non-critical path use cases. Why? Our SDK's `is*` identity
- * utils do not assert the type of the entire object, only the `$type` string.
- *
- * For full validation of the object schema, use the `validate` export from
- * this file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.dangerousIsType<AppBskyFeedPost.Record>(item, AppBskyFeedPost.isRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function dangerousIsType<R extends {$type?: string}>(
-  record: unknown,
-  identity: <V>(v: V) => v is V & {$type: NonNullable<R['$type']>},
-): record is R {
-  return identity(record)
-}
-
-/**
- * Fully validates the object schema, which has a performance cost.
- *
- * For faster checks with data we trust, like that from our app view, use the
- * `dangerousIsType` export from this same file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.validate(item, AppBskyFeedPost.validateRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function validate<R extends {$type?: string}>(
-  record: unknown,
-  validator: (v: unknown) => ValidationResult<R>,
-): record is R {
-  return validator(record).success
-}

bskyembed/src/types/bsky/profile.ts

@@ -1,10 +0,0 @@
-import {type AppBskyActorDefs, type ChatBskyActorDefs} from '@atproto/api'
-
-/**
- * Matches any profile view exported by our SDK
- */
-export type AnyProfileView =
-  | AppBskyActorDefs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileView
-  | AppBskyActorDefs.ProfileViewDetailed
-  | ChatBskyActorDefs.ProfileViewBasic

bskyembed/src/util/nice-date.ts

@@ -1,11 +0,0 @@
-export function niceDate(date: number | string | Date) {
-  const d = new Date(date)
-  return `${d.toLocaleDateString('en-us', {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-  })} at ${d.toLocaleTimeString(undefined, {
-    hour: 'numeric',
-    minute: '2-digit',
-  })}`
-}

bskyembed/src/util/parse-embed.ts

@@ -1,152 +0,0 @@
-/**
- * This file is a copy of what exists in the social-app
- */
-
-import {
-  AppBskyEmbedExternal,
-  AppBskyEmbedImages,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  AppBskyEmbedVideo,
-  AppBskyFeedDefs,
-  AppBskyGraphDefs,
-  AppBskyLabelerDefs,
-} from '@atproto/api'
-
-export type Embed =
-  | {
-      type: 'post'
-      view: AppBskyEmbedRecord.ViewRecord
-    }
-  | {
-      type: 'post_not_found'
-      view: AppBskyEmbedRecord.ViewNotFound
-    }
-  | {
-      type: 'post_blocked'
-      view: AppBskyEmbedRecord.ViewBlocked
-    }
-  | {
-      type: 'post_detached'
-      view: AppBskyEmbedRecord.ViewDetached
-    }
-  | {
-      type: 'feed'
-      view: AppBskyFeedDefs.GeneratorView
-    }
-  | {
-      type: 'list'
-      view: AppBskyGraphDefs.ListView
-    }
-  | {
-      type: 'labeler'
-      view: AppBskyLabelerDefs.LabelerView
-    }
-  | {
-      type: 'starter_pack'
-      view: AppBskyGraphDefs.StarterPackViewBasic
-    }
-  | {
-      type: 'images'
-      view: AppBskyEmbedImages.View
-    }
-  | {
-      type: 'link'
-      view: AppBskyEmbedExternal.View
-    }
-  | {
-      type: 'video'
-      view: AppBskyEmbedVideo.View
-    }
-  | {
-      type: 'post_with_media'
-      view: Embed
-      media: Embed
-    }
-  | {
-      type: 'unknown'
-      view: null
-    }
-
-export type EmbedType<T extends Embed['type']> = Extract<Embed, {type: T}>
-
-export function parseEmbedRecordView({record}: AppBskyEmbedRecord.View): Embed {
-  if (AppBskyEmbedRecord.isViewRecord(record)) {
-    return {
-      type: 'post',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewNotFound(record)) {
-    return {
-      type: 'post_not_found',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewBlocked(record)) {
-    return {
-      type: 'post_blocked',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewDetached(record)) {
-    return {
-      type: 'post_detached',
-      view: record,
-    }
-  } else if (AppBskyFeedDefs.isGeneratorView(record)) {
-    return {
-      type: 'feed',
-      view: record,
-    }
-  } else if (AppBskyGraphDefs.isListView(record)) {
-    return {
-      type: 'list',
-      view: record,
-    }
-  } else if (AppBskyLabelerDefs.isLabelerView(record)) {
-    return {
-      type: 'labeler',
-      view: record,
-    }
-  } else if (AppBskyGraphDefs.isStarterPackViewBasic(record)) {
-    return {
-      type: 'starter_pack',
-      view: record,
-    }
-  } else {
-    return {
-      type: 'unknown',
-      view: null,
-    }
-  }
-}
-
-export function parseEmbed(embed: AppBskyFeedDefs.PostView['embed']): Embed {
-  if (AppBskyEmbedImages.isView(embed)) {
-    return {
-      type: 'images',
-      view: embed,
-    }
-  } else if (AppBskyEmbedExternal.isView(embed)) {
-    return {
-      type: 'link',
-      view: embed,
-    }
-  } else if (AppBskyEmbedVideo.isView(embed)) {
-    return {
-      type: 'video',
-      view: embed,
-    }
-  } else if (AppBskyEmbedRecord.isView(embed)) {
-    return parseEmbedRecordView(embed)
-  } else if (AppBskyEmbedRecordWithMedia.isView(embed)) {
-    return {
-      type: 'post_with_media',
-      view: parseEmbedRecordView(embed.record),
-      media: parseEmbed(embed.media),
-    }
-  } else {
-    return {
-      type: 'unknown',
-      view: null,
-    }
-  }
-}

bskyembed/src/util/pretty-number.ts

@@ -1,9 +0,0 @@
-const formatter = new Intl.NumberFormat('en-US', {
-  notation: 'compact',
-  maximumFractionDigits: 1,
-  roundingMode: 'trunc',
-})
-
-export function prettyNumber(number: number) {
-  return formatter.format(number)
-}

bskyembed/src/util/rkey.ts

@@ -1,6 +0,0 @@
-import {AtUri} from '@atproto/api'
-
-export function getRkey({uri}: {uri: string}): string {
-  const at = new AtUri(uri)
-  return at.rkey
-}

bskyembed/src/util/verification-state.ts

@@ -1,31 +0,0 @@
-import * as bsky from '../types/bsky'
-
-export type VerificationState = {
-  role: 'default' | 'verifier'
-  isVerified: boolean
-}
-
-export function getVerificationState({
-  profile,
-}: {
-  profile?: bsky.profile.AnyProfileView
-}): VerificationState {
-  if (!profile || !profile.verification) {
-    return {
-      role: 'default',
-      isVerified: false,
-    }
-  }
-
-  const {verifiedStatus, trustedVerifierStatus} = profile.verification
-  const isVerifiedUser = ['valid', 'invalid'].includes(verifiedStatus)
-  const isVerifierUser = ['valid', 'invalid'].includes(trustedVerifierStatus)
-  const isVerified =
-    (isVerifiedUser && verifiedStatus === 'valid') ||
-    (isVerifierUser && trustedVerifierStatus === 'valid')
-
-  return {
-    role: isVerifierUser ? 'verifier' : 'default',
-    isVerified,
-  }
-}

bskyembed/src/utils.ts

@@ -0,0 +1,28 @@
+import {AtUri} from '@atproto/api'
+
+export function niceDate(date: number | string | Date) {
+  const d = new Date(date)
+  return `${d.toLocaleDateString('en-us', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })} at ${d.toLocaleTimeString(undefined, {
+    hour: 'numeric',
+    minute: '2-digit',
+  })}`
+}
+
+export function getRkey({uri}: {uri: string}): string {
+  const at = new AtUri(uri)
+  return at.rkey
+}
+
+const formatter = new Intl.NumberFormat('en-US', {
+  notation: 'compact',
+  maximumFractionDigits: 1,
+  roundingMode: 'trunc',
+})
+
+export function prettyNumber(number: number) {
+  return formatter.format(number)
+}

bskyembed/tsconfig.json

@@ -10,7 +10,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
@@ -19,5 +19,5 @@
     "jsxFragmentFactory": "Fragment",
     "downlevelIteration": true
   },
-  "include": ["src", "snippet", "vite.config.ts", "*.config.cjs", ".eslintrc.cjs"]
+  "include": ["src", "snippet", "vite.config.ts"]
 }

bskylink/locales/en.json

@@ -1,8 +0,0 @@
-{
-  "Potentially Dangerous Link": "Potentially Dangerous Link",
-  "Blocked Link": "Blocked Link",
-  "This link may be malicious. You should proceed at your own risk.": "This link may be malicious. You should proceed at your own risk.",
-  "This link has been identified as malicious and has blocked for your safety.": "This link has been identified as malicious and has blocked for your safety.",
-  "Continue Anyway": "Continue Anyway",
-  "Return to Bluesky": "Return to Bluesky"
-}

bskylink/locales/es.json

@@ -1,8 +0,0 @@
-{
-  "Potentially Dangerous Link": "Enlace Potencialmente Peligroso",
-  "Blocked Link": "Enlace Bloqueado",
-  "This link may be malicious. You should proceed at your own risk.": "Este enlace puede ser malicioso. Debes proceder bajo tu propio riesgo.",
-  "This link has been identified as malicious and has blocked for your safety.": "Este enlace ha sido identificado como malicioso y ha sido bloqueado por tu seguridad.",
-  "Continue Anyway": "Continuar de Todos Modos",
-  "Return to Bluesky": "Regresar a Bluesky"
-}

bskylink/locales/fr.json

@@ -1,8 +0,0 @@
-{
-  "Potentially Dangerous Link": "Lien potentiellement dangereux",
-  "Blocked Link": "Lien bloqué",
-  "This link may be malicious. You should proceed at your own risk.": "Ce lien est peut-être malveillant. Ne continuez qu’à vos risques et périls.",
-  "This link has been identified as malicious and has blocked for your safety.": "Ce lien a été identifié comme malveillant et a été bloqué pour votre sécurité.",
-  "Continue Anyway": "Continuer quand même",
-  "Return to Bluesky": "Retourner sur Bluesky"
-}

bskylink/package.json

@@ -8,28 +8,21 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@atproto/api": "^0.16.7",
-    "@atproto/common": "^0.4.11",
+    "@atproto/common": "^0.4.0",
     "@types/escape-html": "^1.0.4",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "escape-html": "^1.0.3",
     "express": "^4.19.2",
     "http-terminator": "^3.2.0",
-    "i18n": "^0.15.1",
     "kysely": "^0.27.3",
-    "lru-cache": "^11.1.0",
     "pg": "^8.12.0",
     "pino": "^9.2.0",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/i18n": "^0.13.12",
     "@types/pg": "^8.11.6",
-    "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   }
 }

bskylink/src/bin.ts

@@ -1,4 +1,5 @@
 import {Database, envToCfg, httpLogger, LinkService, readEnv} from './index.js'
+
 async function main() {
   const env = readEnv()
   const cfg = envToCfg(env)
@@ -10,13 +11,7 @@ async function main() {
     await migrateDb.migrateToLatestOrThrow()
     await migrateDb.close()
   }
-
   const link = await LinkService.create(cfg)
-
-  if (link.ctx.cfg.service.safelinkEnabled) {
-    link.ctx.safelinkClient.runFetchEvents()
-  }
-
   await link.start()
   httpLogger.info('link service is running')
   process.on('SIGTERM', async () => {

bskylink/src/cache/rule.ts

@@ -1,10 +0,0 @@
-import {type SafelinkRule} from '../db/schema'
-
-export const exampleRule: SafelinkRule = {
-  id: 1,
-  eventType: 'addRule',
-  url: 'https://malicious.example.com/phishing',
-  pattern: 'domain',
-  action: 'block',
-  createdAt: '2024-06-01T12:00:00Z',
-}

bskylink/src/cache/safelinkClient.ts

@@ -1,352 +0,0 @@
-import {
-  AtpAgent,
-  CredentialSession,
-  type ToolsOzoneSafelinkDefs,
-  type ToolsOzoneSafelinkQueryEvents,
-} from '@atproto/api'
-import {ExpiredTokenError} from '@atproto/api/dist/client/types/com/atproto/server/confirmEmail.js'
-import {MINUTE} from '@atproto/common'
-import {LRUCache} from 'lru-cache'
-
-import {type ServiceConfig} from '../config.js'
-import type Database from '../db/index.js'
-import {type SafelinkRule} from '../db/schema.js'
-import {redirectLogger} from '../logger.js'
-
-const SAFELINK_MIN_FETCH_INTERVAL = 1_000
-const SAFELINK_MAX_FETCH_INTERVAL = 10_000
-const SCHEME_REGEX = /^[a-zA-Z][a-zA-Z0-9+.-]*:/
-
-export class SafelinkClient {
-  private domainCache: LRUCache<string, SafelinkRule | 'ok'>
-  private urlCache: LRUCache<string, SafelinkRule | 'ok'>
-
-  private db: Database
-
-  private ozoneAgent: OzoneAgent
-
-  private cursor?: string
-
-  constructor({cfg, db}: {cfg: ServiceConfig; db: Database}) {
-    this.domainCache = new LRUCache<string, SafelinkRule | 'ok'>({
-      max: 10000,
-    })
-
-    this.urlCache = new LRUCache<string, SafelinkRule | 'ok'>({
-      max: 25000,
-    })
-
-    this.db = db
-
-    this.ozoneAgent = new OzoneAgent(
-      cfg.safelinkPdsUrl!,
-      cfg.safelinkAgentIdentifier!,
-      cfg.safelinkAgentPass!,
-    )
-  }
-
-  public async tryFindRule(link: string): Promise<SafelinkRule | 'ok'> {
-    let url: string
-    let domain: string
-    try {
-      url = SafelinkClient.normalizeUrl(link)
-      domain = SafelinkClient.normalizeDomain(link)
-    } catch (e) {
-      redirectLogger.error(
-        {error: e, inputUrl: link},
-        'failed to normalize looked up link',
-      )
-      // fail open
-      return 'ok'
-    }
-
-    // First, check if there is an existing URL rule. Note that even if the rule is 'ok', we still
-    // want to check for a blocking domain rule, so we will only return here if the url rule exists
-    // _and_ it is not 'ok'.
-    const urlRule = this.urlCache.get(url)
-    if (urlRule && urlRule !== 'ok') {
-      return urlRule
-    }
-
-    // If we find a domain rule of _any_ kind, including 'ok', we can now return that rule.
-    const domainRule = this.domainCache.get(domain)
-    if (domainRule) {
-      return domainRule
-    }
-
-    try {
-      const maybeUrlRule = await this.getRule(this.db, url, 'url')
-      this.urlCache.set(url, maybeUrlRule)
-      return maybeUrlRule
-    } catch (e) {
-      this.urlCache.set(url, 'ok')
-    }
-
-    try {
-      const maybeDomainRule = await this.getRule(this.db, domain, 'domain')
-      this.domainCache.set(domain, maybeDomainRule)
-      return maybeDomainRule
-    } catch (e) {
-      this.domainCache.set(domain, 'ok')
-    }
-
-    return 'ok'
-  }
-
-  private async getRule(
-    db: Database,
-    url: string,
-    pattern: ToolsOzoneSafelinkDefs.PatternType,
-  ): Promise<SafelinkRule> {
-    return db.db
-      .selectFrom('safelink_rule')
-      .selectAll()
-      .where('url', '=', url)
-      .where('pattern', '=', pattern)
-      .orderBy('createdAt', 'desc')
-      .executeTakeFirstOrThrow()
-  }
-
-  private async addRule(db: Database, rule: SafelinkRule) {
-    try {
-      if (rule.pattern === 'url') {
-        rule.url = SafelinkClient.normalizeUrl(rule.url)
-      } else if (rule.pattern === 'domain') {
-        rule.url = SafelinkClient.normalizeDomain(rule.url)
-      }
-    } catch (e) {
-      redirectLogger.error(
-        {error: e, inputUrl: rule.url},
-        'failed to normalize rule input URL',
-      )
-      return
-    }
-
-    db.db
-      .insertInto('safelink_rule')
-      .values({
-        id: rule.id,
-        eventType: rule.eventType,
-        url: rule.url,
-        pattern: rule.pattern,
-        action: rule.action,
-        createdAt: rule.createdAt,
-      })
-      .execute()
-      .catch(err => {
-        redirectLogger.error(
-          {error: err, rule},
-          'failed to add rule to database',
-        )
-      })
-
-    if (rule.pattern === 'domain') {
-      this.domainCache.delete(rule.url)
-    } else {
-      this.urlCache.delete(rule.url)
-    }
-  }
-
-  private async removeRule(db: Database, rule: SafelinkRule) {
-    try {
-      if (rule.pattern === 'url') {
-        rule.url = SafelinkClient.normalizeUrl(rule.url)
-      } else if (rule.pattern === 'domain') {
-        rule.url = SafelinkClient.normalizeDomain(rule.url)
-      }
-    } catch (e) {
-      redirectLogger.error(
-        {error: e, inputUrl: rule.url},
-        'failed to normalize rule input URL',
-      )
-      return
-    }
-
-    await db.db
-      .deleteFrom('safelink_rule')
-      .where('pattern', '=', 'domain')
-      .where('url', '=', rule.url)
-      .execute()
-      .catch(err => {
-        redirectLogger.error(
-          {error: err, rule},
-          'failed to remove rule from database',
-        )
-      })
-
-    if (rule.pattern === 'domain') {
-      this.domainCache.delete(rule.url)
-    } else {
-      this.urlCache.delete(rule.url)
-    }
-  }
-
-  public async runFetchEvents() {
-    let agent: AtpAgent
-    try {
-      agent = await this.ozoneAgent.getAgent()
-    } catch (err) {
-      redirectLogger.error({error: err}, 'error getting Ozone agent')
-      setTimeout(() => this.runFetchEvents(), SAFELINK_MAX_FETCH_INTERVAL)
-      return
-    }
-
-    let res: ToolsOzoneSafelinkQueryEvents.Response
-    try {
-      const cursor = await this.getCursor()
-      res = await agent.tools.ozone.safelink.queryEvents({
-        cursor,
-        limit: 100,
-        sortDirection: 'asc',
-      })
-    } catch (err) {
-      if (err instanceof ExpiredTokenError) {
-        redirectLogger.info('ozone agent had expired session, refreshing...')
-        await this.ozoneAgent.refreshSession()
-        setTimeout(() => this.runFetchEvents(), SAFELINK_MIN_FETCH_INTERVAL)
-        return
-      }
-
-      redirectLogger.error(
-        {error: err},
-        'error fetching safelink events from Ozone',
-      )
-      setTimeout(() => this.runFetchEvents(), SAFELINK_MAX_FETCH_INTERVAL)
-      return
-    }
-
-    if (res.data.events.length === 0) {
-      redirectLogger.info('received no new safelink events from ozone')
-      setTimeout(() => this.runFetchEvents(), SAFELINK_MAX_FETCH_INTERVAL)
-    } else {
-      await this.db.transaction(async db => {
-        for (const rule of res.data.events) {
-          switch (rule.eventType) {
-            case 'removeRule':
-              await this.removeRule(db, rule)
-              break
-            case 'addRule':
-            case 'updateRule':
-              await this.addRule(db, rule)
-              break
-            default:
-              redirectLogger.warn({rule}, 'received unknown rule event type')
-          }
-        }
-      })
-      if (res.data.cursor) {
-        redirectLogger.info(
-          {cursor: res.data.cursor},
-          'received new safelink events from Ozone',
-        )
-        await this.setCursor(res.data.cursor)
-      }
-      setTimeout(() => this.runFetchEvents(), SAFELINK_MIN_FETCH_INTERVAL)
-    }
-  }
-
-  private async getCursor() {
-    if (this.cursor === '') {
-      const res = await this.db.db
-        .selectFrom('safelink_cursor')
-        .selectAll()
-        .where('id', '=', 1)
-        .executeTakeFirst()
-      if (!res) {
-        return ''
-      }
-      this.cursor = res.cursor
-    }
-    return this.cursor
-  }
-
-  private async setCursor(cursor: string) {
-    const updatedAt = new Date()
-    try {
-      await this.db.db
-        .insertInto('safelink_cursor')
-        .values({
-          id: 1,
-          cursor,
-          updatedAt,
-        })
-        .onConflict(oc => oc.column('id').doUpdateSet({cursor, updatedAt}))
-        .execute()
-      this.cursor = cursor
-    } catch (err) {
-      redirectLogger.error({error: err}, 'failed to update safelink cursor')
-    }
-  }
-
-  private static normalizeUrl(input: string) {
-    if (!SCHEME_REGEX.test(input)) {
-      input = `https://${input}`
-    }
-    const u = new URL(input)
-    u.hash = ''
-    let normalized = u.href.replace(SCHEME_REGEX, '').toLowerCase()
-    if (normalized.endsWith('/')) {
-      normalized = normalized.substring(0, normalized.length - 1)
-    }
-    return normalized
-  }
-
-  private static normalizeDomain(input: string) {
-    if (!SCHEME_REGEX.test(input)) {
-      input = `https://${input}`
-    }
-    const u = new URL(input)
-    return u.host.toLowerCase()
-  }
-}
-
-export class OzoneAgent {
-  private identifier: string
-  private password: string
-
-  private session: CredentialSession
-  private agent: AtpAgent
-
-  private refreshAt = 0
-
-  constructor(pdsHost: string, identifier: string, password: string) {
-    this.identifier = identifier
-    this.password = password
-
-    this.session = new CredentialSession(new URL(pdsHost))
-    this.agent = new AtpAgent(this.session)
-  }
-
-  public async getAgent() {
-    if (!this.identifier && !this.password) {
-      throw new Error(
-        'OZONE_AGENT_HANDLE and OZONE_AGENT_PASS environment variables must be set',
-      )
-    }
-
-    if (!this.session.hasSession) {
-      redirectLogger.info('creating Ozone session')
-      await this.session.login({
-        identifier: this.identifier,
-        password: this.password,
-      })
-      redirectLogger.info('ozone session created successfully')
-      this.refreshAt = Date.now() + 50 * MINUTE
-    }
-
-    if (Date.now() <= this.refreshAt) {
-      await this.refreshSession()
-    }
-
-    return this.agent
-  }
-
-  public async refreshSession() {
-    try {
-      await this.session.refreshSession()
-      this.refreshAt = Date.now() + 50 * MINUTE
-    } catch (e) {
-      redirectLogger.error({error: e}, 'error refreshing session')
-    }
-  }
-}

bskylink/src/config.ts

@@ -1,4 +1,4 @@
-import {envBool, envInt, envList, envStr} from '@atproto/common'
+import {envInt, envList, envStr} from '@atproto/common'
 
 export type Config = {
   service: ServiceConfig
@@ -9,12 +9,7 @@ export type ServiceConfig = {
   port: number
   version?: string
   hostnames: string[]
-  hostnamesSet: Set<string>
   appHostname: string
-  safelinkEnabled: boolean
-  safelinkPdsUrl?: string
-  safelinkAgentIdentifier?: string
-  safelinkAgentPass?: string
 }
 
 export type DbConfig = {
@@ -41,10 +36,6 @@ export type Environment = {
   dbPostgresPoolSize?: number
   dbPostgresPoolMaxUses?: number
   dbPostgresPoolIdleTimeoutMs?: number
-  safelinkEnabled?: boolean
-  safelinkPdsUrl?: string
-  safelinkAgentIdentifier?: string
-  safelinkAgentPass?: string
 }
 
 export const readEnv = (): Environment => {
@@ -61,10 +52,6 @@ export const readEnv = (): Environment => {
     dbPostgresPoolIdleTimeoutMs: envInt(
       'LINK_DB_POSTGRES_POOL_IDLE_TIMEOUT_MS',
     ),
-    safelinkEnabled: envBool('LINK_SAFELINK_ENABLED'),
-    safelinkPdsUrl: envStr('LINK_SAFELINK_PDS_URL'),
-    safelinkAgentIdentifier: envStr('LINK_SAFELINK_AGENT_IDENTIFIER'),
-    safelinkAgentPass: envStr('LINK_SAFELINK_AGENT_PASS'),
   }
 }
 
@@ -73,12 +60,7 @@ export const envToCfg = (env: Environment): Config => {
     port: env.port ?? 3000,
     version: env.version,
     hostnames: env.hostnames,
-    hostnamesSet: new Set(env.hostnames),
-    appHostname: env.appHostname ?? 'bsky.app',
-    safelinkEnabled: env.safelinkEnabled ?? false,
-    safelinkPdsUrl: env.safelinkPdsUrl,
-    safelinkAgentIdentifier: env.safelinkAgentIdentifier,
-    safelinkAgentPass: env.safelinkAgentPass,
+    appHostname: env.appHostname || 'bsky.app',
   }
   if (!env.dbPostgresUrl) {
     throw new Error('Must configure postgres url (LINK_DB_POSTGRES_URL)')
@@ -93,7 +75,6 @@ export const envToCfg = (env: Environment): Config => {
       size: env.dbPostgresPoolSize ?? 10,
     },
   }
-
   return {
     service: serviceCfg,
     db: dbCfg,

bskylink/src/context.ts

@@ -1,5 +1,4 @@
-import {SafelinkClient} from './cache/safelinkClient.js'
-import {type Config} from './config.js'
+import {Config} from './config.js'
 import Database from './db/index.js'
 
 export type AppContextOptions = {
@@ -10,16 +9,11 @@ export type AppContextOptions = {
 export class AppContext {
   cfg: Config
   db: Database
-  safelinkClient: SafelinkClient
   abortController = new AbortController()
 
   constructor(private opts: AppContextOptions) {
     this.cfg = this.opts.cfg
     this.db = this.opts.db
-    this.safelinkClient = new SafelinkClient({
-      cfg: this.opts.cfg.service,
-      db: this.opts.db,
-    })
   }
 
   static async fromConfig(cfg: Config, overrides?: Partial<AppContextOptions>) {

bskylink/src/db/migrations/002-safelink.ts

@@ -1,34 +0,0 @@
-import {type Kysely, sql} from 'kysely'
-
-export async function up(db: Kysely<unknown>): Promise<void> {
-  await db.schema
-    .createTable('safelink_rule')
-    .addColumn('id', 'bigserial', col => col.primaryKey())
-    .addColumn('eventType', 'varchar', col => col.notNull())
-    .addColumn('url', 'varchar', col => col.notNull())
-    .addColumn('pattern', 'varchar', col => col.notNull())
-    .addColumn('action', 'varchar', col => col.notNull())
-    .addColumn('createdAt', 'timestamptz', col => col.notNull())
-    .execute()
-
-  await db.schema
-    .createTable('safelink_cursor')
-    .addColumn('id', 'bigserial', col => col.notNull())
-    .addColumn('cursor', 'varchar', col => col.notNull())
-    .addColumn('updatedAt', 'timestamptz', col => col.notNull())
-    .execute()
-
-  await db.schema
-    .createIndex('safelink_rule_url_pattern_created_at_idx')
-    .on('safelink_rule')
-    .expression(sql`"url", "pattern", "createdAt" DESC`)
-    .execute()
-}
-
-export async function down(db: Kysely<unknown>): Promise<void> {
-  await db.schema
-    .dropIndex('safelink_rule_url_pattern_created_at_idx')
-    .execute()
-  await db.schema.dropTable('safelink_rule').execute()
-  await db.schema.dropTable('safelink_cursor').execute()
-}

bskylink/src/db/migrations/003-safelink-cursor-constraint.ts

@@ -1,31 +0,0 @@
-import {type Kysely} from 'kysely'
-
-export async function up(
-  db: Kysely<{safelink_rule: {}; safelink_cursor: {}}>,
-): Promise<void> {
-  // Remove existing items from safelink_rule that were duplicated due to broken cursor
-  await db.deleteFrom(['safelink_rule']).execute()
-
-  // Delete the old cursor
-  await db.deleteFrom(['safelink_cursor']).execute()
-
-  await db.schema
-    .alterTable('safelink_cursor')
-    .addPrimaryKeyConstraint('pk_id', ['id'])
-    .execute()
-}
-
-export async function down(
-  db: Kysely<{safelink_rule: {}; safelink_cursor: {}}>,
-): Promise<void> {
-  // Remove any rules that were added
-  await db.deleteFrom(['safelink_rule']).execute()
-
-  // Delete the cursor
-  await db.deleteFrom(['safelink_cursor']).execute()
-
-  await db.schema
-    .alterTable('safelink_cursor')
-    .dropConstraint('pk_id')
-    .execute()
-}

bskylink/src/db/migrations/index.ts

@@ -1,9 +1,5 @@
 import * as init from './001-init.js'
-import * as safelink from './002-safelink.js'
-import * as safelinkCursorConstraint from './003-safelink-cursor-constraint.js'
 
 export default {
   '001': init,
-  '002': safelink,
-  '003': safelinkCursorConstraint,
 }

bskylink/src/db/schema.ts

@@ -1,10 +1,7 @@
-import {type ToolsOzoneSafelinkDefs} from '@atproto/api'
-import {type Selectable} from 'kysely'
+import {Selectable} from 'kysely'
 
 export type DbSchema = {
   link: Link
-  safelink_rule: SafelinkRule
-  safelink_cursor: SafelinkCursor
 }
 
 export interface Link {
@@ -17,21 +14,4 @@ export enum LinkType {
   StarterPack = 1,
 }
 
-export interface SafelinkRule {
-  id: number
-  eventType: ToolsOzoneSafelinkDefs.EventType
-  url: string
-  pattern: ToolsOzoneSafelinkDefs.PatternType
-  action: ToolsOzoneSafelinkDefs.ActionType
-  createdAt: string
-}
-
-export interface SafelinkCursor {
-  id: number
-  cursor: string
-  updatedAt: Date
-}
-
 export type LinkEntry = Selectable<Link>
-export type SafelinkRuleEntry = Selectable<SafelinkRule>
-export type SafelinkCursorEntry = Selectable<SafelinkCursor>

bskylink/src/html/linkRedirectContents.ts

@@ -1,21 +0,0 @@
-import escapeHTML from 'escape-html'
-
-export function linkRedirectContents(link: string): string {
-  return `
-    <html>
-      <head>
-        <meta http-equiv="refresh" content="0; URL='${escapeHTML(link)}'" />
-        <meta
-          http-equiv="Cache-Control"
-          content="no-store, no-cache, must-revalidate, max-age=0" />
-        <meta http-equiv="Pragma" content="no-cache" />
-        <meta http-equiv="Expires" content="0" />
-        <style>
-          :root {
-            color-scheme: light dark;
-          }
-        </style>
-      </head>
-    </html>
-  `
-}

bskylink/src/html/linkWarningContents.ts

@@ -1,44 +0,0 @@
-import escapeHTML from 'escape-html'
-import {type Request} from 'express'
-
-export function linkWarningContents(
-  req: Request,
-  opts: {
-    type: 'warn' | 'block'
-    link: string
-  },
-): string {
-  const continueButton =
-    opts.type === 'warn'
-      ? `<a class="button secondary" href="${escapeHTML(opts.link)}">${req.__('Continue Anyway')}</a>`
-      : ''
-
-  return `
-    <div class="warning-icon">⚠️</div>
-    <h1>
-      ${
-        opts.type === 'warn'
-          ? req.__('Potentially Dangerous Link')
-          : req.__('Blocked Link')
-      }
-    </h1>
-    <p class="warning-text">
-      ${
-        opts.type === 'warn'
-          ? req.__(
-              'This link may be malicious. You should proceed at your own risk.',
-            )
-          : req.__(
-              'This link has been identified as malicious and has blocked for your safety.',
-            )
-      }
-    </p>
-    <div class="blocked-site">
-      <p class="site-url">${escapeHTML(opts.link)}</p>
-    </div>
-    <div class="button-group">
-      ${continueButton}
-      <a class="button primary" href="https://bsky.app">${req.__('Return to Bluesky')}</a>
-    </div>
-  `
-}

bskylink/src/html/linkWarningLayout.ts

@@ -1,120 +0,0 @@
-import escapeHTML from 'escape-html'
-
-export function linkWarningLayout(
-  title: string,
-  containerContents: string,
-): string {
-  return `
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="UTF-8" />
-        <meta
-          http-equiv="Cache-Control"
-          content="no-store, no-cache, must-revalidate, max-age=0" />
-        <meta http-equiv="Pragma" content="no-cache" />
-        <meta http-equiv="Expires" content="0" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>${escapeHTML(title)}</title>
-        <style>
-          * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-          }
-          body {
-            font-family:
-              -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Arial,
-              sans-serif;
-            background-color: #ffffff;
-            min-height: 100vh;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            padding: 20px;
-          }
-          .container {
-            width: 100%;
-            max-width: 400px;
-            text-align: center;
-          }
-          .warning-icon {
-            font-size: 48px;
-            margin-bottom: 16px;
-          }
-          h1 {
-            font-size: 20px;
-            font-weight: 600;
-            margin-bottom: 12px;
-            color: #000000;
-          }
-          .warning-text {
-            font-size: 15px;
-            color: #536471;
-            line-height: 1.4;
-            margin-bottom: 24px;
-            padding: 0 20px;
-          }
-          .blocked-site {
-            background-color: #f7f9fa;
-            border-radius: 12px;
-            padding: 16px;
-            margin-bottom: 24px;
-            text-align: left;
-            word-break: break-all;
-          }
-          .site-name {
-            font-size: 16px;
-            font-weight: 500;
-            color: #000000;
-            margin-bottom: 4px;
-            word-break: break-word;
-            display: block;
-            text-align: center;
-          }
-          .site-url {
-            font-size: 14px;
-            color: #536471;
-            word-break: break-all;
-            display: block;
-            text-align: center;
-          }
-          .button {
-            border: none;
-            border-radius: 24px;
-            padding: 12px 32px;
-            font-size: 16px;
-            font-weight: 600;
-            cursor: pointer;
-            width: 100%;
-            max-width: 280px;
-            transition: background-color 0.2s;
-          }
-          .primary {
-            background-color: #1d9bf0;
-            color: white;
-          }
-          .secondary {
-          }
-          .back-button:hover {
-            background-color: #1a8cd8;
-          }
-          .back-button:active {
-            background-color: #1681c4;
-          }
-          @media (max-width: 480px) {
-            .warning-text {
-              padding: 0 10px;
-            }
-            .blocked-site {
-              padding: 8px;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <div class="container">${containerContents}</div>
-      </body>
-    </html>
-  `
-}

bskylink/src/i18n.ts

@@ -1,15 +0,0 @@
-import path from 'node:path'
-import {fileURLToPath} from 'node:url'
-
-import i18n from 'i18n'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-i18n.configure({
-  locales: ['en', 'es', 'fr'],
-  defaultLocale: 'en',
-  directory: path.join(__dirname, '../locales'),
-})
-
-export default i18n

bskylink/src/index.ts

@@ -7,7 +7,6 @@ import {createHttpTerminator, type HttpTerminator} from 'http-terminator'
 
 import {type Config} from './config.js'
 import {AppContext} from './context.js'
-import i18n from './i18n.js'
 import {default as routes, errorHandler} from './routes/index.js'
 
 export * from './config.js'
@@ -26,7 +25,6 @@ export class LinkService {
   static async create(cfg: Config): Promise<LinkService> {
     let app = express()
     app.use(cors())
-    app.use(i18n.init)
 
     const ctx = await AppContext.fromConfig(cfg)
     app = routes(ctx, app)

bskylink/src/logger.ts

@@ -1,15 +1,4 @@
 import {subsystemLogger} from '@atproto/common'
-import {type Logger} from 'pino'
 
-export const httpLogger: Logger = subsystemLogger('bskylink')
-export const dbLogger: Logger = subsystemLogger('bskylink:db')
-export const redirectLogger: Logger = subsystemLogger('bskylink:redirect')
-
-redirectLogger.info = (
-  orig =>
-  (...args: any[]) => {
-    const [msg, ...rest] = args
-    orig.apply(redirectLogger, [String(msg), ...rest])
-    console.log('[bskylink:redirect]', ...args)
-  }
-)(redirectLogger.info) as typeof redirectLogger.info
+export const httpLogger = subsystemLogger('bskylink')
+export const dbLogger = subsystemLogger('bskylink:db')

bskylink/src/routes/createShortLink.ts

@@ -1,9 +1,9 @@
 import assert from 'node:assert'
 
 import bodyParser from 'body-parser'
-import {type Express, type Request} from 'express'
+import {Express, Request} from 'express'
 
-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {LinkType} from '../db/schema.js'
 import {randomId} from '../util.js'
 import {handler} from './util.js'
@@ -83,21 +83,18 @@ const getUrl = (ctx: AppContext, req: Request, id: string) => {
         : `https://${req.headers.host}`
     return `${baseUrl}/${id}`
   }
-  const host = req.headers.host ?? ''
-  const baseUrl = ctx.cfg.service.hostnamesSet.has(host)
-    ? `https://${host}`
+  const baseUrl = ctx.cfg.service.hostnames.includes(req.headers.host)
+    ? `https://${req.headers.host}`
     : `https://${ctx.cfg.service.hostnames[0]}`
   return `${baseUrl}/${id}`
 }
 
 const normalizedPathFromParts = (parts: string[]): string => {
-  // When given ['path1', 'path2', 'te:fg'], output should be
-  // /path1/path2/te:fg
   return (
     '/' +
     parts
       .map(encodeURIComponent)
-      .map(part => part.replace(/%3A/g, ':')) // preserve colons
+      .map(part => part.replaceAll('%3A', ':')) // preserve colons
       .join('/')
   )
 }

bskylink/src/routes/redirect.ts

@@ -1,13 +1,10 @@
 import assert from 'node:assert'
 
 import {DAY, SECOND} from '@atproto/common'
+import escapeHTML from 'escape-html'
 import {type Express} from 'express'
 
 import {type AppContext} from '../context.js'
-import {linkRedirectContents} from '../html/linkRedirectContents.js'
-import {linkWarningContents} from '../html/linkWarningContents.js'
-import {linkWarningLayout} from '../html/linkWarningLayout.js'
-import {redirectLogger} from '../logger.js'
 import {handler} from './util.js'
 
 const INTERNAL_IP_REGEX = new RegExp(
@@ -42,54 +39,14 @@ export default function (ctx: AppContext, app: Express) {
         return res.status(302).end()
       }
 
-      // Default to a max age header
       res.setHeader('Cache-Control', `max-age=${(7 * DAY) / SECOND}`)
-      res.status(200)
       res.type('html')
+      res.status(200)
 
-      let html: string | undefined
-
-      if (ctx.cfg.service.safelinkEnabled) {
-        const rule = await ctx.safelinkClient.tryFindRule(link)
-        if (rule !== 'ok') {
-          switch (rule.action) {
-            case 'whitelist':
-              redirectLogger.info({rule}, 'Whitelist rule matched')
-              break
-            case 'block':
-              html = linkWarningLayout(
-                'Blocked Link Warning',
-                linkWarningContents(req, {
-                  type: 'block',
-                  link: url.href,
-                }),
-              )
-              res.setHeader('Cache-Control', 'no-store')
-              redirectLogger.info({rule}, 'Block rule matched')
-              break
-            case 'warn':
-              html = linkWarningLayout(
-                'Malicious Link Warning',
-                linkWarningContents(req, {
-                  type: 'warn',
-                  link: url.href,
-                }),
-              )
-              res.setHeader('Cache-Control', 'no-store')
-              redirectLogger.info({rule}, 'Warn rule matched')
-              break
-            default:
-              redirectLogger.warn({rule}, 'Unknown rule matched')
-          }
-        }
-      }
-
-      // If there is no html defined yet, we will create a redirect html
-      if (!html) {
-        html = linkRedirectContents(url.href)
-      }
-
-      return res.end(html)
+      const escaped = escapeHTML(url.href)
+      return res.send(
+        `<html><head><meta http-equiv="refresh" content="0; URL='${escaped}'" /><style>:root { color-scheme: light dark; }</style></head></html>`,
+      )
     }),
   )
 }

bskylink/tests/index.ts

@@ -1,9 +1,7 @@
 import assert from 'node:assert'
-import {type AddressInfo} from 'node:net'
+import {AddressInfo} from 'node:net'
 import {after, before, describe, it} from 'node:test'
 
-import {ToolsOzoneSafelinkDefs} from '@atproto/api'
-
 import {Database, envToCfg, LinkService, readEnv} from '../src/index.js'
 
 describe('link service', async () => {
@@ -17,10 +15,6 @@ describe('link service', async () => {
       appHostname: 'test.bsky.app',
       dbPostgresSchema: 'link_test',
       dbPostgresUrl: process.env.DB_POSTGRES_URL,
-      safelinkEnabled: true,
-      ozoneUrl: 'http://localhost:2583',
-      ozoneAgentHandle: 'mod-authority.test',
-      ozoneAgentPass: 'hunter2',
     })
     const migrateDb = Database.postgres({
       url: cfg.db.url,
@@ -32,85 +26,8 @@ describe('link service', async () => {
     await linkService.start()
     const {port} = linkService.server?.address() as AddressInfo
     baseUrl = `http://localhost:${port}`
-
-    // Ensure blocklist, whitelist, and safelink rules are set up
-    const now = new Date().toISOString()
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 1,
-      eventType: ToolsOzoneSafelinkDefs.ADDRULE,
-      url: 'https://en.wikipedia.org/wiki/Fight_Club',
-      pattern: ToolsOzoneSafelinkDefs.URL,
-      action: ToolsOzoneSafelinkDefs.WARN,
-      reason: ToolsOzoneSafelinkDefs.SPAM,
-      createdBy: 'did:example:admin',
-      createdAt: now,
-      comment: 'Do not talk about Fight Club',
-    })
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 2,
-      eventType: ToolsOzoneSafelinkDefs.ADDRULE,
-      url: 'https://gist.github.com/MattIPv4/045239bc27b16b2bcf7a3a9a4648c08a',
-      pattern: ToolsOzoneSafelinkDefs.URL,
-      action: ToolsOzoneSafelinkDefs.BLOCK,
-      reason: ToolsOzoneSafelinkDefs.SPAM,
-      createdBy: 'did:example:admin',
-      createdAt: now,
-      comment: 'All Bs',
-    })
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 3,
-      eventType: ToolsOzoneSafelinkDefs.ADDRULE,
-      url: 'https://en.wikipedia.org',
-      pattern: ToolsOzoneSafelinkDefs.DOMAIN,
-      action: ToolsOzoneSafelinkDefs.WHITELIST,
-      reason: ToolsOzoneSafelinkDefs.NONE,
-      createdBy: 'did:example:admin',
-      createdAt: now,
-      comment: 'Whitelisting the knowledge base of the internet',
-    })
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 4,
-      eventType: ToolsOzoneSafelinkDefs.ADDRULE,
-      url: 'https://www.instagram.com/teamseshbones/?hl=en',
-      pattern: ToolsOzoneSafelinkDefs.URL,
-      action: ToolsOzoneSafelinkDefs.BLOCK,
-      reason: ToolsOzoneSafelinkDefs.SPAM,
-      createdBy: 'did:example:admin',
-      createdAt: now,
-      comment: 'BONES has been erroneously blocked for the sake of this test',
-    })
-    const later = new Date(Date.now() + 1000).toISOString()
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 5,
-      eventType: ToolsOzoneSafelinkDefs.REMOVERULE,
-      url: 'https://www.instagram.com/teamseshbones/?hl=en',
-      pattern: ToolsOzoneSafelinkDefs.URL,
-      action: ToolsOzoneSafelinkDefs.REMOVERULE,
-      reason: ToolsOzoneSafelinkDefs.NONE,
-      createdBy: 'did:example:admin',
-      createdAt: later,
-      comment:
-        'BONES has been resurrected to bring good music to the world once again',
-    })
-    linkService.ctx.cfg.eventCache.smartUpdate({
-      $type: 'tools.ozone.safelink.defs#event',
-      id: 6,
-      eventType: ToolsOzoneSafelinkDefs.ADDRULE,
-      url: 'https://www.leagueoflegends.com/en-us/',
-      pattern: ToolsOzoneSafelinkDefs.URL,
-      action: ToolsOzoneSafelinkDefs.WARN,
-      reason: ToolsOzoneSafelinkDefs.SPAM,
-      createdBy: 'did:example:admin',
-      createdAt: now,
-      comment:
-        'Could be quite the mistake to get into this addicting game, but we will warn instead of block',
-    })
   })
+
   after(async () => {
     await linkService?.destroy()
   })
@@ -159,80 +76,6 @@ describe('link service', async () => {
     assert.strictEqual(json.message, 'Link not found')
   })
 
-  it('League of Legends warned', async () => {
-    const urlToRedirect = 'https://www.leagueoflegends.com/en-us/'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    // League of Legends is set to WARN, not BLOCK, so expect a warning (blocked-site div present)
-    assert.match(
-      html,
-      /Warning: Malicious Link/,
-      'Expected warning not found in HTML',
-    )
-  })
-
-  it('Wikipedia whitelisted, url restricted. Redirect safely since wikipedia is whitelisted', async () => {
-    const urlToRedirect = 'https://en.wikipedia.org/wiki/Fight_Club'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(html, /meta http-equiv="refresh"/)
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    // Wikipedia domain is whitelisted, so no blocked-site div should be present
-    assert.doesNotMatch(html, /"blocked-site"/)
-  })
-
-  it('Unsafe redirect with block rule, due to the content of webpage.', async () => {
-    const urlToRedirect =
-      'https://gist.github.com/MattIPv4/045239bc27b16b2bcf7a3a9a4648c08a'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    assert.match(
-      html,
-      /"blocked-site"/,
-      'Expected blocked-site div not found in HTML',
-    )
-  })
-
-  it('Rule adjustment, safe redirect, 200 response for Instagram Account of teamsesh Bones', async () => {
-    // Retrieve the latest event after all updates
-    const result = linkService.ctx.cfg.eventCache.smartGet(
-      'https://www.instagram.com/teamseshbones/?hl=en',
-    )
-    assert(result, 'Expected event not found in eventCache')
-    assert.strictEqual(result.eventType, ToolsOzoneSafelinkDefs.REMOVERULE)
-    const urlToRedirect = 'https://www.instagram.com/teamseshbones/?hl=en'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(html, /meta http-equiv="refresh"/)
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-  })
-
   async function getRedirect(link: string): Promise<[number, string]> {
     const url = new URL(link)
     const base = new URL(baseUrl)
@@ -278,83 +121,3 @@ describe('link service', async () => {
     return payload.url
   }
 })
-
-describe('link service no safelink', async () => {
-  let linkService: LinkService
-  let baseUrl: string
-  before(async () => {
-    const env = readEnv()
-    const cfg = envToCfg({
-      ...env,
-      hostnames: ['test.bsky.link'],
-      appHostname: 'test.bsky.app',
-      dbPostgresSchema: 'link_test',
-      dbPostgresUrl: process.env.DB_POSTGRES_URL,
-      safelinkEnabled: false,
-      ozoneUrl: 'http://localhost:2583',
-      ozoneAgentHandle: 'mod-authority.test',
-      ozoneAgentPass: 'hunter2',
-    })
-    const migrateDb = Database.postgres({
-      url: cfg.db.url,
-      schema: cfg.db.schema,
-    })
-    await migrateDb.migrateToLatestOrThrow()
-    await migrateDb.close()
-    linkService = await LinkService.create(cfg)
-    await linkService.start()
-    const {port} = linkService.server?.address() as AddressInfo
-    baseUrl = `http://localhost:${port}`
-  })
-  after(async () => {
-    await linkService?.destroy()
-  })
-  it('Wikipedia whitelisted, url restricted. Safelink is disabled, so redirect is always safe', async () => {
-    const urlToRedirect = 'https://en.wikipedia.org/wiki/Fight_Club'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(html, /meta http-equiv="refresh"/)
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    // No blocked-site div, always safe
-    assert.doesNotMatch(html, /"blocked-site"/)
-  })
-
-  it('Unsafe redirect with block rule, but safelink is disabled so redirect is always safe', async () => {
-    const urlToRedirect =
-      'https://gist.github.com/MattIPv4/045239bc27b16b2bcf7a3a9a4648c08a'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(html, /meta http-equiv="refresh"/)
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    // No blocked-site div, always safe
-    assert.doesNotMatch(html, /"blocked-site"/)
-  })
-
-  it('Rule adjustment, safe redirect, safelink is disabled so always safe', async () => {
-    const urlToRedirect = 'https://www.instagram.com/teamseshbones/?hl=en'
-    const url = new URL(`${baseUrl}/redirect`)
-    url.searchParams.set('u', urlToRedirect)
-    const res = await fetch(url, {redirect: 'manual'})
-    assert.strictEqual(res.status, 200)
-    const html = await res.text()
-    assert.match(html, /meta http-equiv="refresh"/)
-    assert.match(
-      html,
-      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
-    )
-    // No blocked-site div, always safe
-    assert.doesNotMatch(html, /"blocked-site"/)
-  })
-})

bskylink/tsconfig.json

@@ -1,19 +1,10 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
-}
-
+    "compilerOptions": {
+      "module": "NodeNext",
+      "esModuleInterop": true,
+      "moduleResolution": "NodeNext",
+      "outDir": "dist",
+      "lib": ["ES2021.String"]
+    },
+    "include": ["./src/index.ts", "./src/bin.ts"]
+  }

bskylink/yarn.lock

@@ -2,65 +2,27 @@
 # yarn lockfile v1
 
 
-"@atproto/api@^0.16.7":
-  version "0.16.7"
-  resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.16.7.tgz#eb0c520dbdaf74ba6f5ad7f9c6afe2d1389b8a0a"
-  integrity sha512-EdVWkEgaEQm1LEiiP1fW/XXXpMNmtvT5c9+cZVRiwYc4rTB66WIJJWqmaMT/tB7nccMkFjr6FtwObq5LewWfgw==
-  dependencies:
-    "@atproto/common-web" "^0.4.2"
-    "@atproto/lexicon" "^0.5.0"
-    "@atproto/syntax" "^0.4.1"
-    "@atproto/xrpc" "^0.7.4"
-    await-lock "^2.2.2"
-    multiformats "^9.9.0"
-    tlds "^1.234.0"
-    zod "^3.23.8"
-
-"@atproto/common-web@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.4.2.tgz#6e3add6939da93d3dfbc8f87e26dc4f57fad7259"
-  integrity sha512-vrXwGNoFGogodjQvJDxAeP3QbGtawgZute2ed1XdRO0wMixLk3qewtikZm06H259QDJVu6voKC5mubml+WgQUw==
+"@atproto/common-web@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.3.0.tgz#36da8c2c31d8cf8a140c3c8f03223319bf4430bb"
+  integrity sha512-67VnV6JJyX+ZWyjV7xFQMypAgDmjVaR9ZCuU/QW+mqlqI7fex2uL4Fv+7/jHadgzhuJHVd6OHOvNn0wR5WZYtA==
   dependencies:
     graphemer "^1.4.0"
     multiformats "^9.9.0"
     uint8arrays "3.0.0"
-    zod "^3.23.8"
+    zod "^3.21.4"
 
-"@atproto/common@^0.4.11":
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/@atproto/common/-/common-0.4.11.tgz#9291b7c26f8b3507e280f7ecbdf1695ab5ea62f6"
-  integrity sha512-Knv0viYXNMfCdIE7jLUiWJKnnMfEwg+vz2epJQi8WOjqtqCFb3W/3Jn72ZiuovIfpdm13MaOiny6w2NErUQC6g==
+"@atproto/common@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@atproto/common/-/common-0.4.0.tgz#d77696c7eb545426df727837d9ee333b429fe7ef"
+  integrity sha512-yOXuPlCjT/OK9j+neIGYn9wkxx/AlxQSucysAF0xgwu0Ji8jAtKBf9Jv6R5ObYAjAD/kVUvEYumle+Yq/R9/7g==
   dependencies:
-    "@atproto/common-web" "^0.4.2"
+    "@atproto/common-web" "^0.3.0"
     "@ipld/dag-cbor" "^7.0.3"
     cbor-x "^1.5.1"
     iso-datestring-validator "^2.2.2"
     multiformats "^9.9.0"
-    pino "^8.21.0"
-
-"@atproto/lexicon@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@atproto/lexicon/-/lexicon-0.5.0.tgz#4d2be425361f9ac7f9754b8a1ccba29ddf0b9460"
-  integrity sha512-3aAzEAy9EAPs3CxznzMhEcqDd7m3vz1eze/ya9/ThbB7yleqJIhz5GY2q76tCCwHPhn5qDDMhlA9kKV6fG23gA==
-  dependencies:
-    "@atproto/common-web" "^0.4.2"
-    "@atproto/syntax" "^0.4.1"
-    iso-datestring-validator "^2.2.2"
-    multiformats "^9.9.0"
-    zod "^3.23.8"
-
-"@atproto/syntax@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.4.1.tgz#f77bc610ae0914449ff3f4731861e3da429915f5"
-  integrity sha512-CJdImtLAiFO+0z3BWTtxwk6aY5w4t8orHTMVJgkf++QRJWTxPbIFko/0hrkADB7n2EruDxDSeAgfUGehpH6ngw==
-
-"@atproto/xrpc@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@atproto/xrpc/-/xrpc-0.7.4.tgz#030342548797c1f344968c457a8659dbb60a2d60"
-  integrity sha512-sDi68+QE1XHegTaNAndlX41Gp827pouSzSs8CyAwhrqZdsJUxE3P7TMtrA0z+zAjvxVyvzscRc0TsN/fGUGrhw==
-  dependencies:
-    "@atproto/lexicon" "^0.5.0"
-    zod "^3.23.8"
+    pino "^8.15.0"
 
 "@cbor-extract/cbor-extract-darwin-arm64@2.2.0":
   version "2.2.0"
@@ -92,13 +54,6 @@
   resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-win32-x64/-/cbor-extract-win32-x64-2.2.0.tgz#4b3f07af047f984c082de34b116e765cb9af975f"
   integrity sha512-l2M+Z8DO2vbvADOBNLbbh9y5ST1RY5sqkWOg/58GkUPBYou/cuNZ68SGQ644f1CvZ8kcOxyZtw06+dxWHIoN/w==
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
 "@ipld/dag-cbor@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-7.0.3.tgz#aa31b28afb11a807c3d627828a344e5521ac4a1e"
@@ -107,95 +62,6 @@
     cborg "^1.6.0"
     multiformats "^9.5.4"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
-  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
-
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@messageformat/core@^3.0.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.4.0.tgz#2814c23383dec7bddf535d54f2a03e410165ca9f"
-  integrity sha512-NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==
-  dependencies:
-    "@messageformat/date-skeleton" "^1.0.0"
-    "@messageformat/number-skeleton" "^1.0.0"
-    "@messageformat/parser" "^5.1.0"
-    "@messageformat/runtime" "^3.0.1"
-    make-plural "^7.0.0"
-    safe-identifier "^0.4.1"
-
-"@messageformat/date-skeleton@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz#3bad068cbf5873d14592cfc7a73dd4d8615e2739"
-  integrity sha512-rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==
-
-"@messageformat/number-skeleton@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz#e7c245c41a1b2722bc59dad68f4d454f761bc9b4"
-  integrity sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==
-
-"@messageformat/parser@^5.1.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.1.tgz#ca7d6c18e9f3f6b6bc984a465dac16da00106055"
-  integrity sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==
-  dependencies:
-    moo "^0.5.1"
-
-"@messageformat/runtime@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@messageformat/runtime/-/runtime-3.0.1.tgz#94d1f6c43265c28ef7aed98ecfcc0968c6c849ac"
-  integrity sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==
-  dependencies:
-    make-plural "^7.0.0"
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
-  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
-"@types/body-parser@*", "@types/body-parser@^1.19.5":
-  version "1.19.6"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.6.tgz#1859bebb8fd7dac9918a45d54c1971ab8b5af474"
-  integrity sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
-  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
-  dependencies:
-    "@types/node" "*"
-
 "@types/cors@^2.8.17":
   version "2.8.17"
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b"
@@ -208,41 +74,6 @@
   resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.4.tgz#dc7c166b76c7b03b27e32f80edf01d91eb5d9af2"
   integrity sha512-qZ72SFTgUAZ5a7Tj6kf2SHLetiH5S6f8G5frB2SPQ3EyF02kxdyBFf4Tz4banE3xCgGnKgWLt//a6VuYHKYJTg==
 
-"@types/express-serve-static-core@^4.17.33":
-  version "4.19.6"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
-  integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@^4.17.21":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
-  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/http-errors@*":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.5.tgz#5b749ab2b16ba113423feb1a64a95dcd30398472"
-  integrity sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==
-
-"@types/i18n@^0.13.12":
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/@types/i18n/-/i18n-0.13.12.tgz#b457715766c63d8ffdfc51dd4fc1f72728e9d38f"
-  integrity sha512-iAd2QjKh+0ToBXocmCS3m38GskiaGzmSV1MTQz2GaOraqSqBiLf46J7u3EGINl+st+Uk4lO3OL7QyIjTJlrWIg==
-
-"@types/mime@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
-  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-
 "@types/node@*":
   version "20.14.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
@@ -259,33 +90,6 @@
     pg-protocol "*"
     pg-types "^4.0.1"
 
-"@types/qs@*":
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
-  integrity sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==
-
-"@types/range-parser@*":
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
-  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
-
-"@types/send@*":
-  version "0.17.5"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.5.tgz#d991d4f2b16f2b1ef497131f00a9114290791e74"
-  integrity sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-static@*":
-  version "1.15.8"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
-  integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
-  dependencies:
-    "@types/http-errors" "*"
-    "@types/node" "*"
-    "@types/send" "*"
-
 abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -301,23 +105,6 @@ accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-walk@^8.1.1:
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7"
-  integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==
-  dependencies:
-    acorn "^8.11.0"
-
-acorn@^8.11.0, acorn@^8.4.1:
-  version "8.15.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
-  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -328,11 +115,6 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
-await-lock@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.2.2.tgz#a95a9b269bfd2f69d22b17a321686f551152bcef"
-  integrity sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw==
-
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -441,11 +223,6 @@ cors@^2.8.5:
     object-assign "^4"
     vary "^1"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -453,13 +230,6 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^4.3.3:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
-  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
-  dependencies:
-    ms "^2.1.3"
-
 define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
@@ -489,11 +259,6 @@ detect-libc@^2.0.1:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
   integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -681,18 +446,6 @@ http-terminator@^3.2.0:
     roarr "^7.0.4"
     type-fest "^2.3.3"
 
-i18n@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.15.1.tgz#68fb8993c461cc440bc2485d82f72019f2b92de8"
-  integrity sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==
-  dependencies:
-    "@messageformat/core" "^3.0.0"
-    debug "^4.3.3"
-    fast-printf "^1.6.9"
-    make-plural "^7.0.0"
-    math-interval-parser "^2.0.1"
-    mustache "^4.2.0"
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -725,26 +478,6 @@ kysely@^0.27.3:
   resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.3.tgz#6cc6c757040500b43c4ac596cdbb12be400ee276"
   integrity sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA==
 
-lru-cache@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.1.0.tgz#afafb060607108132dbc1cf8ae661afb69486117"
-  integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-plural@^7.0.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.4.0.tgz#fa6990dd550dea4de6b20163f74e5ed83d8a8d6d"
-  integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==
-
-math-interval-parser@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz#e22cd6d15a0a7f4c03aec560db76513da615bed4"
-  integrity sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -777,17 +510,12 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-moo@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
-  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.3, ms@^2.1.3:
+ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -802,11 +530,6 @@ multiformats@^9.4.2, multiformats@^9.5.4, multiformats@^9.9.0:
   resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37"
   integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==
 
-mustache@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
-  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
-
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -967,7 +690,7 @@ pino-std-serializers@^7.0.0:
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b"
   integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==
 
-pino@^8.21.0:
+pino@^8.15.0:
   version "8.21.0"
   resolved "https://registry.yarnpkg.com/pino/-/pino-8.21.0.tgz#e1207f3675a2722940d62da79a7a55a98409f00d"
   integrity sha512-ip4qdzjkAyDDZklUaZkcRFb2iA118H9SgRh8yzTkSQK8HilsOJF7rSY8HoW5+I0M46AZgX/pxbprf2vvzQCE0Q==
@@ -1125,11 +848,6 @@ safe-buffer@5.2.1, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-identifier@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
-  integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
-
 safe-stable-stringify@^2.3.1, safe-stable-stringify@^2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
@@ -1246,35 +964,11 @@ thread-stream@^3.0.0:
   dependencies:
     real-require "^0.2.0"
 
-tlds@^1.234.0:
-  version "1.260.0"
-  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.260.0.tgz#666c2584cf627b4296e888b799ec341be42821ac"
-  integrity sha512-78+28EWBhCEE7qlyaHA9OR3IPvbCLiDh3Ckla593TksfFc9vfTsgvH7eS+dr3o9qr31gwGbogcI16yN91PoRjQ==
-
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-ts-node@^10.9.2:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 type-fest@^2.3.3:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
@@ -1322,11 +1016,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -1337,12 +1026,7 @@ xtend@^4.0.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-zod@^3.23.8:
-  version "3.25.76"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34"
-  integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==
+zod@^3.21.4:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==

bskyweb/cmd/bskyweb/filters.go

@@ -1,28 +0,0 @@
-package main
-
-import (
-	"net/url"
-
-	"github.com/flosch/pongo2/v6"
-)
-
-func init() {
-	pongo2.RegisterFilter("canonicalize_url", filterCanonicalizeURL)
-}
-
-func filterCanonicalizeURL(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
-	urlStr := in.String()
-
-	parsedURL, err := url.Parse(urlStr)
-	if err != nil {
-		// If parsing fails, return the original URL
-		return in, nil
-	}
-
-	// Remove query parameters and fragment
-	parsedURL.RawQuery = ""
-	parsedURL.Fragment = ""
-
-	// Return the cleaned URL
-	return pongo2.AsValue(parsedURL.String()), nil
-}

bskyweb/cmd/bskyweb/filters_test.go

@@ -1,61 +0,0 @@
-package main
-
-import (
-	"testing"
-
-	"github.com/flosch/pongo2/v6"
-)
-
-func TestCanonicalizeURLFilter(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "clean URL",
-			input:    "https://bsky.app/profile/user",
-			expected: "https://bsky.app/profile/user",
-		},
-		{
-			name:     "URL with query params",
-			input:    "https://bsky.app/profile/user?utm_source=test",
-			expected: "https://bsky.app/profile/user",
-		},
-		{
-			name:     "URL with multiple params",
-			input:    "https://bsky.app/profile/user?utm_source=twitter&utm_campaign=test",
-			expected: "https://bsky.app/profile/user",
-		},
-		{
-			name:     "URL with fragment",
-			input:    "https://bsky.app/profile/user#section",
-			expected: "https://bsky.app/profile/user",
-		},
-		{
-			name:     "URL with both params and fragment",
-			input:    "https://bsky.app/profile/user?param=1#section",
-			expected: "https://bsky.app/profile/user",
-		},
-		{
-			name:     "malformed URL",
-			input:    "not-a-url",
-			expected: "not-a-url", // Should return original on error
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			inputValue := pongo2.AsValue(tt.input)
-			result, err := filterCanonicalizeURL(inputValue, nil)
-			if err != nil {
-				t.Errorf("filterCanonicalizeURL() error = %v", err)
-				return
-			}
-
-			if result.String() != tt.expected {
-				t.Errorf("filterCanonicalizeURL() = %v, want %v", result.String(), tt.expected)
-			}
-		})
-	}
-}

bskyweb/cmd/bskyweb/server.go

@@ -606,10 +606,10 @@ type IPCCRequest struct {
 type IPCCResponse struct {
 	CC               string `json:"countryCode"`
 	AgeRestrictedGeo bool   `json:"isAgeRestrictedGeo,omitempty"`
-	AgeBlockedGeo    bool   `json:"isAgeBlockedGeo,omitempty"`
 }
 
-// This product includes GeoLite2 Data created by MaxMind, available from https://www.maxmind.com.
+// IP address data is powered by IPinfo
+// https://ipinfo.io
 func (srv *Server) WebIpCC(c echo.Context) error {
 	realIP := c.RealIP()
 	addr, err := netip.ParseAddr(realIP)

bskyweb/templates/base.html

@@ -95,7 +95,6 @@
   <meta name="application-name" content="Bluesky">
   <meta name="generator" content="bskyweb">
   <meta property="og:site_name" content="Bluesky Social" />
-  <meta name="twitter:site" content="@bluesky" />
   <link type="application/activity+json" href="" />
 
   {% block html_head_extra -%}{%- endblock %}

bskyweb/templates/home.html

@@ -12,11 +12,11 @@
 
   <meta property="og:url" content="https://bsky.app" />
   <meta name="twitter:url" content="https://bsky.app" />
-  <link rel="canonical" href="https://bsky.app" />
 
   <meta property="og:image" content="https://bsky.app/static/social-card-default-gradient.png" />
   <meta property="twitter:image" content="https://bsky.app/static/social-card-default-gradient.png"  />
 
+  <meta name="twitter:site" content="@bluesky" />
   <meta name="twitter:card" content="summary_large_image" />
 {%- endblock %}
 

bskyweb/templates/post.html

@@ -14,7 +14,6 @@
   <meta property="profile:username" content="{{ profileView.Handle }}">
   {%- if requestURI %}
   <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
   {% endif -%}
   {%- if postView.Author.DisplayName %}
   <meta property="og:title" content="{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})">
@@ -24,18 +23,15 @@
   {%- if postText %}
   <meta name="description" content="{{ postText }}">
   <meta property="og:description" content="{{ postText }}">
-  <meta property="twitter:description" content="{{ postText }}">
   {% endif -%}
   {%- if imgThumbUrls %}
   {% for imgThumbUrl in imgThumbUrls %}
   <meta property="og:image" content="{{ imgThumbUrl }}">
-  <meta property="twitter:image" content="{{ imgThumbUrl }}">
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
   {%- elif postView.Author.Avatar %}
+  {# Don't use avatar image in cards; usually looks bad #}
   <meta name="twitter:card" content="summary">
-  <meta property="og:image" content="{{ postView.Author.Avatar }}">
-  <meta property="twitter:image" content="{{ postView.Author.Avatar }}">
   {% endif %}
   <meta name="twitter:label1" content="Posted At">
   <meta name="twitter:value1" content="{{ postView.IndexedAt }}">

bskyweb/templates/profile.html

@@ -15,7 +15,6 @@
   <meta property="profile:username" content="{{ profileView.Handle }}">
   {%- if requestURI %}
   <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
   {% endif -%}
   {%- if profileView.DisplayName %}
   <meta property="og:title" content="{{ profileView.DisplayName }} (@{{ profileView.Handle }})">

jest/test-pds.ts

@@ -1,5 +1,5 @@
 import {AtUri, BskyAgent} from '@atproto/api'
-import {type TestBsky, TestNetwork} from '@atproto/dev-env'
+import {TestBsky, TestNetwork} from '@atproto/dev-env'
 import fs from 'fs'
 import net from 'net'
 import path from 'path'
@@ -13,7 +13,6 @@ export interface TestUser {
 }
 
 export interface TestPDS {
-  appviewDid: string
   pdsUrl: string
   mocker: Mocker
   close: () => Promise<void>
@@ -113,7 +112,6 @@ export async function createServer(
   )
 
   return {
-    appviewDid: testNet.bsky.serverDid,
     pdsUrl,
     mocker: new Mocker(testNet, pdsUrl, pic),
     async close() {

package.json

@@ -21,7 +21,7 @@
   "scripts": {
     "prepare": "is-ci || husky install",
     "postinstall": "patch-package && yarn intl:compile-if-needed",
-    "prebuild": "EXPO_NO_GIT_STATUS=1 expo prebuild --clean",
+    "prebuild": "expo prebuild --clean",
     "android": "expo run:android",
     "android:prod": "expo run:android --variant release",
     "android:profile": "BSKY_PROFILE=1 expo run:android --variant release",
@@ -90,16 +90,17 @@
     "@haileyok/bluesky-video": "0.3.2",
     "@ipld/dag-cbor": "^9.2.0",
     "@lingui/react": "^4.14.1",
+    "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input",
     "@miblanchard/react-native-slider": "^2.6.0",
-    "@mozzius/expo-dynamic-app-icon": "^1.7.1",
-    "@react-native-async-storage/async-storage": "2.2.0",
+    "@mozzius/expo-dynamic-app-icon": "1.5.0",
+    "@react-native-async-storage/async-storage": "2.1.2",
     "@react-native-menu/menu": "^1.2.3",
-    "@react-native-picker/picker": "2.11.1",
+    "@react-native-picker/picker": "2.11.0",
     "@react-navigation/bottom-tabs": "^7.3.13",
     "@react-navigation/drawer": "^7.3.12",
     "@react-navigation/native": "^7.1.9",
     "@react-navigation/native-stack": "^7.3.13",
-    "@sentry/react-native": "~6.20.0",
+    "@sentry/react-native": "~6.14.0",
     "@tanstack/query-async-storage-persister": "^5.25.0",
     "@tanstack/react-query": "^5.8.1",
     "@tanstack/react-query-persist-client": "^5.25.0",
@@ -131,35 +132,35 @@
     "emoji-mart": "^5.5.2",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
-    "expo": "^54.0.0-preview.11",
-    "expo-application": "~7.0.4",
-    "expo-blur": "~15.0.4",
-    "expo-build-properties": "~1.0.5",
-    "expo-camera": "~17.0.4",
-    "expo-clipboard": "~8.0.4",
-    "expo-dev-client": "~6.0.6",
-    "expo-device": "~8.0.4",
-    "expo-file-system": "~19.0.6",
-    "expo-font": "~14.0.5",
-    "expo-haptics": "~15.0.4",
-    "expo-image": "~3.0.4",
+    "expo": "53.0.11",
+    "expo-application": "~6.1.4",
+    "expo-blur": "~14.1.5",
+    "expo-build-properties": "~0.14.6",
+    "expo-camera": "~16.1.8",
+    "expo-clipboard": "~7.1.4",
+    "expo-dev-client": "~5.2.0",
+    "expo-device": "~7.1.4",
+    "expo-file-system": "~18.1.10",
+    "expo-font": "~13.3.1",
+    "expo-haptics": "~14.1.4",
+    "expo-image": "^2.4.0",
     "expo-image-crop-tool": "^0.1.8",
-    "expo-image-manipulator": "~14.0.4",
-    "expo-image-picker": "17.0.5",
-    "expo-intent-launcher": "~13.0.4",
-    "expo-linear-gradient": "~15.0.4",
-    "expo-linking": "~8.0.5",
-    "expo-localization": "~17.0.4",
-    "expo-media-library": "~18.0.4",
-    "expo-notifications": "~0.32.6",
-    "expo-screen-orientation": "~9.0.4",
-    "expo-sharing": "~14.0.4",
-    "expo-splash-screen": "~31.0.6",
-    "expo-system-ui": "~6.0.4",
-    "expo-task-manager": "~14.0.4",
-    "expo-updates": "~29.0.6",
-    "expo-video": "~3.0.7",
-    "expo-web-browser": "~15.0.4",
+    "expo-image-manipulator": "~13.1.7",
+    "expo-image-picker": "~16.1.4",
+    "expo-intent-launcher": "^12.1.5",
+    "expo-linear-gradient": "~14.1.5",
+    "expo-linking": "~7.1.5",
+    "expo-localization": "~16.1.5",
+    "expo-media-library": "~17.1.7",
+    "expo-notifications": "~0.31.3",
+    "expo-screen-orientation": "~8.1.7",
+    "expo-sharing": "~13.1.5",
+    "expo-splash-screen": "~0.30.9",
+    "expo-system-ui": "~5.0.8",
+    "expo-task-manager": "~13.1.5",
+    "expo-updates": "~0.28.14",
+    "expo-video": "~2.2.1",
+    "expo-web-browser": "~14.1.6",
     "fast-text-encoding": "^1.0.6",
     "history": "^5.3.0",
     "hls.js": "^1.6.2",
@@ -178,36 +179,36 @@
     "postinstall-postinstall": "^2.1.0",
     "psl": "^1.9.0",
     "radix-ui": "^1.2.0",
-    "react": "19.1.0",
+    "react": "19.0.0",
     "react-compiler-runtime": "^19.1.0-rc.1",
-    "react-dom": "19.1.0",
+    "react-dom": "19.0.0",
     "react-image-crop": "^11.0.7",
     "react-is": "19",
     "react-keyed-flatten-children": "^5.0.0",
-    "react-native": "^0.81.1",
+    "react-native": "^0.79.3",
     "react-native-compressor": "^1.11.0",
-    "react-native-date-picker": "^5.0.13",
+    "react-native-date-picker": "^5.0.12",
     "react-native-device-attest": "^0.1.6",
     "react-native-drawer-layout": "^4.1.8",
     "react-native-edge-to-edge": "^1.6.0",
-    "react-native-gesture-handler": "~2.28.0",
+    "react-native-gesture-handler": "2.25.0",
     "react-native-get-random-values": "~1.11.0",
     "react-native-ios-context-menu": "^1.15.3",
-    "react-native-keyboard-controller": "1.18.5",
+    "react-native-keyboard-controller": "^1.17.5",
     "react-native-mmkv": "^2.12.2",
-    "react-native-pager-view": "6.9.1",
+    "react-native-pager-view": "6.8.0",
     "react-native-progress": "bluesky-social/react-native-progress",
     "react-native-qrcode-styled": "^0.3.3",
-    "react-native-reanimated": "~3.19.1",
+    "react-native-reanimated": "~3.17.5",
     "react-native-root-siblings": "^5.0.1",
-    "react-native-safe-area-context": "~5.6.0",
-    "react-native-screens": "~4.15.4",
-    "react-native-svg": "15.12.1",
+    "react-native-safe-area-context": "5.4.0",
+    "react-native-screens": "^4.11.1",
+    "react-native-svg": "15.12.0",
     "react-native-uitextview": "^1.4.0",
     "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.3",
     "react-native-view-shot": "^4.0.3",
-    "react-native-web": "^0.21.0",
+    "react-native-web": "~0.20.0",
     "react-native-web-webview": "^1.0.2",
     "react-native-webview": "^13.13.5",
     "react-remove-scroll-bar": "^2.3.8",
@@ -223,17 +224,17 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.167",
+    "@atproto/dev-env": "^0.3.160",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",
-    "@expo/config-plugins": "~11.0.5",
+    "@expo/config-plugins": "~10.0.2",
     "@lingui/cli": "^4.14.1",
     "@lingui/macro": "^4.14.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@react-native/babel-preset": "0.81.1",
-    "@react-native/eslint-config": "^0.81.1",
-    "@react-native/typescript-config": "^0.81.1",
+    "@react-native/babel-preset": "0.79.3",
+    "@react-native/eslint-config": "^0.79.3",
+    "@react-native/typescript-config": "^0.79.3",
     "@sentry/webpack-plugin": "^3.2.2",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "^13.2.0",
@@ -243,7 +244,7 @@
     "@types/lodash.isequal": "^4.5.6",
     "@types/lodash.shuffle": "^4.2.7",
     "@types/psl": "^1.1.1",
-    "@types/react-dom": "~19.1.7",
+    "@types/react-dom": "^19.1.2",
     "@types/react-responsive": "^8.0.5",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
@@ -251,7 +252,7 @@
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "^19.1.0-rc.1",
-    "babel-preset-expo": "~14.0.4",
+    "babel-preset-expo": "~13.1.11",
     "eslint": "^8.19.0",
     "eslint-plugin-bsky-internal": "link:./eslint",
     "eslint-plugin-ft-flow": "^2.0.3",
@@ -265,7 +266,7 @@
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "jest": "^29.7.0",
-    "jest-expo": "~54.0.5",
+    "jest-expo": "~53.0.7",
     "jest-junit": "^16.0.0",
     "lint-staged": "^13.2.3",
     "lockfile-lint": "^4.14.0",
@@ -275,13 +276,13 @@
     "react-refresh": "^0.14.0",
     "svgo": "^3.3.2",
     "ts-node": "^10.9.1",
-    "typescript": "~5.9.2",
+    "typescript": "~5.8.3",
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "resolutions": {
     "@expo/image-utils": "0.6.3",
-    "@react-native/babel-preset": "0.81.1",
-    "@react-native/normalize-colors": "0.81.1",
+    "@react-native/babel-preset": "0.79.3",
+    "@react-native/normalize-colors": "0.79.3",
     "@types/react": "^18",
     "**/expo-constants": "17.0.3",
     "**/expo-device": "7.1.4",

patches/expo-image-picker+16.1.4.patch

@@ -0,0 +1,38 @@
+diff --git a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/MediaHandler.kt b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/MediaHandler.kt
+index c863fb8..cde8859 100644
+--- a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/MediaHandler.kt
++++ b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/MediaHandler.kt
+@@ -101,16 +101,30 @@ internal class MediaHandler(
+       val fileData = getAdditionalFileData(sourceUri)
+       val mimeType = getType(context.contentResolver, sourceUri)
+ 
++      // Extract basic metadata
++      var width = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)
++      var height = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)
++      val rotation = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)
++
++      // Android returns the encoded width/height which do not take the display rotation into
++      // account. For videos recorded in portrait mode the encoded dimensions are often landscape
++      // (e.g. 1920x1080) paired with a 90°/270° rotation flag.  iOS adjusts these values before
++      // reporting them, so to keep the behaviour consistent across platforms we swap the width
++      // and height when the rotation indicates the video should be displayed in portrait.
++      if (rotation % 180 != 0) {
++        width = height.also { height = width }
++      }
++
+       return ImagePickerAsset(
+         type = MediaType.VIDEO,
+         uri = outputUri.toString(),
+-        width = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH),
+-        height = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT),
++        width = width,
++        height = height,
+         fileName = fileData?.fileName,
+         fileSize = fileData?.fileSize,
+         mimeType = mimeType,
+         duration = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_DURATION),
+-        rotation = metadataRetriever.extractInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION),
++        rotation = rotation,
+         assetId = sourceUri.getMediaStoreAssetId()
+       )
+     } catch (cause: FailedToExtractVideoMetadataException) {

patches/expo-image-picker+16.1.4.patch.md

@@ -0,0 +1,5 @@
+# Expo Image Picker patch
+
+Cherry-picked https://github.com/expo/expo/pull/37849
+
+Remove when we update to a version that includes this commit.

patches/expo-media-library+17.1.7.patch

@@ -0,0 +1,19 @@
+diff --git a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
+index f1255e8..a9b49e5 100644
+--- a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
++++ b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
+@@ -112,11 +112,9 @@ class MediaLibraryModule : Module() {
+     }
+ 
+     AsyncFunction("createAssetAsync") { localUri: String, albumId: String?, promise: Promise ->
+-      throwUnlessPermissionsGranted {
+-        withModuleScope(promise) {
+-          CreateAssetWithAlbumId(context, localUri, promise, true, albumId)
+-            .execute()
+-        }
++      withModuleScope(promise) {
++        CreateAssetWithAlbumId(context, localUri, promise, true, albumId)
++          .execute()
+       }
+     }
+ 

patches/expo-media-library+18.0.4.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-index 2dc1db2..ee844e8 100644
---- a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-+++ b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-@@ -105,7 +105,7 @@ class MediaLibraryModule : Module() {
-     }
- 
-     AsyncFunction("createAssetAsync") Coroutine { localUri: String, albumId: String? ->
--      requireSystemPermissions()
-+      // requireSystemPermissions()
-       return@Coroutine createAssetWithAlbumId(context, localUri, true, albumId)
-     }
- 

patches/react-native+0.79.3.patch

@@ -0,0 +1,136 @@
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
+index 914a249..0deac55 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
+@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
+  */
+ @interface RCTPullToRefreshViewComponentView : RCTViewComponentView <RCTCustomPullToRefreshViewProtocol>
+ 
++- (void)beginRefreshingProgrammatically;
++
+ @end
+ 
+ NS_ASSUME_NONNULL_END
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+index d029337..0f63ea3 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+@@ -1003,6 +1003,11 @@ - (void)_adjustForMaintainVisibleContentPosition
+   }
+ }
+ 
+++ (BOOL)shouldBeRecycled
++{
++  return NO;
++}
++
+ @end
+ 
+ Class<RCTComponentViewProtocol> RCTScrollViewCls(void)
+diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
+index e9b330f..ec5f58c 100644
+--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
++++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
+@@ -15,5 +15,8 @@
+ @property (nonatomic, copy) NSString *title;
+ @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
+ @property (nonatomic, weak) UIScrollView *scrollView;
++@property (nonatomic, copy) UIColor *customTintColor;
++
++- (void)forwarderBeginRefreshing;
+ 
+ @end
+diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
+index 53bfd04..ff1b1ed 100644
+--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
++++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
+@@ -23,6 +23,7 @@ @implementation RCTRefreshControl {
+   UIColor *_titleColor;
+   CGFloat _progressViewOffset;
+   BOOL _hasMovedToWindow;
++  UIColor *_customTintColor;
+ }
+ 
+ - (instancetype)init
+@@ -58,6 +59,12 @@ - (void)layoutSubviews
+   _isInitialRender = false;
+ }
+ 
++- (void)didMoveToSuperview
++{
++  [super didMoveToSuperview];
++  [self setTintColor:_customTintColor];
++}
++
+ - (void)didMoveToWindow
+ {
+   [super didMoveToWindow];
+@@ -221,4 +228,50 @@ - (void)refreshControlValueChanged
+   }
+ }
+ 
++// Fix for https://github.com/facebook/react-native/issues/43388
++// A bug in iOS 17.4 causes the haptic to not play when refreshing if the tintColor
++// is set before the refresh control gets added to the scrollview. We'll call this
++// function whenever the superview changes. We'll also call it if the value of customTintColor
++// changes.
++- (void)setTintColor:(UIColor *)tintColor
++{
++  if ([self.superview isKindOfClass:[UIScrollView class]] && self.tintColor != tintColor) {
++    [super setTintColor:tintColor];
++  }
++}
++
++// This method is used by Bluesky's ExpoScrollForwarder. This allows other React Native
++// libraries to perform a refresh of a scrollview and access the refresh control's onRefresh
++// function.
++- (void)forwarderBeginRefreshing
++{
++  _refreshingProgrammatically = NO;
++
++  [self sizeToFit];
++
++  if (!self.scrollView) {
++    return;
++  }
++
++  UIScrollView *scrollView = (UIScrollView *)self.scrollView;
++
++  [UIView animateWithDuration:0.3
++    delay:0
++    options:UIViewAnimationOptionBeginFromCurrentState
++    animations:^(void) {
++      // Whenever we call this method, the scrollview will always be at a position of
++      // -130 or less. Scrolling back to -65 simulates the default behavior of RCTRefreshControl
++      [scrollView setContentOffset:CGPointMake(0, -65)];
++    }
++    completion:^(__unused BOOL finished) {
++      [super beginRefreshing];
++      [self setCurrentRefreshingState:super.refreshing];
++
++      if (self->_onRefresh) {
++        self->_onRefresh(nil);
++      }
++    }
++  ];
++}
++
+ @end
+diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
+index 40aaf9c..1c60164 100644
+--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
++++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
+@@ -22,11 +22,12 @@ - (UIView *)view
+ 
+ RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
+-RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
+ RCT_EXPORT_VIEW_PROPERTY(title, NSString)
+ RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
+ RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, CGFloat)
+ 
++RCT_REMAP_VIEW_PROPERTY(tintColor, customTintColor, UIColor)
++
+ RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
+ {
+   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {

patches/react-native-date-picker+5.0.13.patch

@@ -1,17 +0,0 @@
-diff --git a/node_modules/react-native-date-picker/ios/RNDatePicker.h b/node_modules/react-native-date-picker/ios/RNDatePicker.h
-index 480746e..470dc3a 100644
---- a/node_modules/react-native-date-picker/ios/RNDatePicker.h
-+++ b/node_modules/react-native-date-picker/ios/RNDatePicker.h
-@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_END
- #else
- #import "DatePicker.h"
- #import <UIKit/UIKit.h>
-+#include <string>
- 
- @interface RNDatePicker : DatePicker
- 
-@@ -22,4 +23,3 @@ NS_ASSUME_NONNULL_END
- @end
- 
- #endif
--