Fall back to v16 picker

.env.example

@@ -33,9 +33,3 @@ EXPO_PUBLIC_SENTRY_DSN=
 
 # Bitdrift API key. If undefined, Bitdrift will be disabled.
 EXPO_PUBLIC_BITDRIFT_API_KEY=
-
-# bapp-config web worker URL
-BAPP_CONFIG_DEV_URL=
-
-# Dev-only passthrough value for bapp-config web worker
-BAPP_CONFIG_DEV_BYPASS_SECRET=

.github/workflows/build-and-push-link-aws.yaml

@@ -1,11 +1,6 @@
 name: build-and-push-link-aws
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - 'bskylink/**'
-      - 'Dockerfile.bskylink'
-      - '.github/workflows/build-and-push-link-aws.yaml'
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -50,7 +45,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           file: ./Dockerfile.bskylink
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-and-push-ogcard-aws.yaml

@@ -1,11 +1,6 @@
 name: build-and-push-ogcard-aws
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - 'bskyogcard/**'
-      - 'Dockerfile.bskyogcard'
-      - '.github/workflows/build-and-push-ogcard-aws.yaml'
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -50,7 +45,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           file: ./Dockerfile.bskyogcard
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-submit-ios.yml

@@ -53,12 +53,12 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "16.4"
+          xcode-version: '16.4'
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:
-          version: 1.16.2
+          version: 1.14.3
 
       - name: 💾 Cache Pods
         uses: actions/cache@v3

.github/workflows/bundle-deploy-eas-update.yml

@@ -192,12 +192,12 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "16.2"
+          xcode-version: '16.2'
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:
-          version: 1.16.2
+          version: 1.14.3
 
       - name: 💾 Cache Pods
         uses: actions/cache@v3
@@ -293,8 +293,8 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: ⚙️ Install dependencies
         run: yarn install
@@ -332,7 +332,7 @@ jobs:
         id: timestamp
         uses: nanzm/get-time-action@master
         with:
-          format: "MM-DD-HH-mm-ss"
+          format: 'MM-DD-HH-mm-ss'
 
       - name: 🚀 Upload Artifact
         id: upload-artifact

.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()

Dockerfile.bskyogcard

@@ -26,9 +26,8 @@ COPY --from=build /app /app
 RUN mkdir /app/data && chown node /app/data
 
 VOLUME /app/data
-EXPOSE 3000 3001
+EXPOSE 3000
 ENV CARD_PORT=3000
-ENV CARD_METRICS_PORT=3001
 ENV NODE_ENV=production
 # potential perf issues w/ io_uring on this version of node
 ENV UV_USE_IO_URING=0

__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,17 +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"
-- tapOn:
-    label: "NUX, if applicable"
-    text: "Close"
-    optional: true
-- waitForAnimationToEnd
-- 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,17 +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"
-- tapOn:
-    label: "NUX, if applicable"
-    text: "Close"
-    optional: true
-- waitForAnimationToEnd
-- 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

@@ -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,

__e2e__/setupServer.js

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

__tests__/lib/images.test.ts

@@ -1,4 +1,4 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system/legacy'
+import {createDownloadResumable, deleteAsync} from 'expo-file-system'
 import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
 
 import {

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: false,
       ios: {
         supportsTablet: false,
         bundleIdentifier: 'xyz.blueskyweb.app',
@@ -103,7 +102,6 @@ module.exports = function (_config) {
             'zh-Hans',
             'zh-Hant',
           ],
-          UIDesignRequiresCompatibility: true,
         },
         associatedDomains: ASSOCIATED_DOMAINS,
         entitlements: {
@@ -209,12 +207,13 @@ module.exports = function (_config) {
           {
             ios: {
               deploymentTarget: '15.1',
-              buildReactNativeFromSource: true,
+              newArchEnabled: false,
             },
             android: {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
+              newArchEnabled: false,
             },
           },
         ],
@@ -361,7 +360,6 @@ module.exports = function (_config) {
           },
         ],
         ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
-        ['expo-location'],
       ].filter(Boolean),
       extra: {
         eas: {

assets/icons/bookmark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9.7 16.895a4 4 0 0 1 4.6 0l3.7 2.6V6.5a2 2 0 0 0-2-2H8a2 2 0 0 0-2 2v12.995l3.7-2.6Zm10.3 2.6c0 1.62-1.825 2.567-3.15 1.636l-3.7-2.6a2 2 0 0 0-2.3 0l-3.7 2.6C5.825 22.062 4 21.115 4 19.495V6.5a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v12.995Z"/></svg>

assets/icons/bookmarkDeleteLarge.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#405168" d="M14.2 2.625c.834 0 1.482 0 2.001.042.523.043.949.131 1.331.326a3.38 3.38 0 0 1 1.475 1.475c.195.382.283.807.326 1.33.042.52.042 1.168.042 2.002v11.09c0 .495 0 .893-.027 1.199-.028.301-.087.585-.26.809-.249.323-.63.518-1.037.533-.282.01-.547-.107-.808-.26-.265-.154-.588-.385-.991-.673l-3.54-2.528c-.36-.258-.461-.322-.559-.347a.6.6 0 0 0-.306 0c-.098.025-.199.09-.559.347l-3.54 2.528c-.403.288-.726.519-.991.674-.261.152-.526.269-.808.259a1.38 1.38 0 0 1-1.038-.534c-.172-.223-.231-.507-.259-.808a7 7 0 0 1-.024-.528l-.003-.67V7.8c0-.834 0-1.482.042-2.001.043-.523.13-.949.325-1.331a3.38 3.38 0 0 1 1.476-1.475c.382-.195.808-.283 1.33-.326.52-.042 1.168-.042 2.002-.042h4.4Zm-4.4.75c-.846 0-1.458 0-1.94.04-.477.039-.792.114-1.051.246A2.63 2.63 0 0 0 5.66 4.81c-.132.259-.208.574-.247 1.051-.04.482-.039 1.094-.039 1.94v11.09l.003.658c.003.186.01.34.021.473.025.267.07.37.106.418a.63.63 0 0 0 .472.243c.059.002.168-.022.4-.158.23-.133.52-.34.935-.636l3.54-2.529c.308-.22.543-.396.81-.464.222-.056.454-.056.676 0 .267.068.5.244.81.464l3.54 2.529c.414.296.704.503.933.636.233.137.343.16.402.158a.63.63 0 0 0 .472-.243c.036-.048.081-.15.106-.419.024-.263.024-.62.024-1.13V7.8c0-.846 0-1.458-.04-1.94-.039-.477-.114-.792-.246-1.051A2.63 2.63 0 0 0 17.19 3.66c-.259-.132-.575-.207-1.051-.246-.482-.04-1.094-.04-1.94-.04H9.8Zm4.056 4.238a.375.375 0 0 1 .53.53L12.53 10l1.857 1.856a.375.375 0 0 1-.53.53L12 10.53l-1.856 1.857a.375.375 0 0 1-.53-.53L11.47 10 9.613 8.144a.375.375 0 0 1 .53-.53L12 9.47l1.856-1.857Z"/></svg>

assets/icons/bookmarkFilled.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#006AFF" d="M16 2.5a4 4 0 0 1 4 4v12.995c0 1.62-1.825 2.567-3.15 1.636l-3.7-2.6a2 2 0 0 0-2.3 0l-3.7 2.6C5.825 22.062 4 21.115 4 19.495V6.5a4 4 0 0 1 4-4h8Z"/></svg>

assets/icons/pinLocationFilled_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.591 21.806h.002l.001-.002.006-.004.018-.014a10 10 0 0 0 .304-.235 26 26 0 0 0 3.333-3.196C18.048 16.29 20 13.305 20 10a8 8 0 1 0-16 0c0 3.305 1.952 6.29 3.745 8.355a26 26 0 0 0 3.333 3.196 16 16 0 0 0 .304.235l.018.014.006.004.002.002a1 1 0 0 0 1.183 0Zm-.593-9.306a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" clip-rule="evenodd"/></svg>

assets/icons/pinLocation_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a8 8 0 0 1 8 8c0 3.305-1.953 6.29-3.745 8.355a26 26 0 0 1-3.333 3.197q-.152.12-.237.184l-.067.05-.018.014-.005.004-.002.002h-.001c-.003-.004-.042-.055-.592-.806l.592.807a1 1 0 0 1-1.184 0v-.001l-.003-.002-.005-.004-.018-.014-.067-.05a24 24 0 0 1-1.066-.877 26 26 0 0 1-2.504-2.503C5.953 16.29 4 13.305 4 10a8 8 0 0 1 8-8Zm0 2a6 6 0 0 0-6 6c0 2.56 1.547 5.076 3.255 7.044A24 24 0 0 0 12 19.723a24 24 0 0 0 2.745-2.679C16.453 15.076 18 12.56 18 10a6 6 0 0 0-6-6Zm-.002 2.5a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm0 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Z"/></svg>

assets/icons/reply.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" d="M20.002 7a2 2 0 0 0-2-2h-12a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h2a1 1 0 0 1 1 1v1.918l3.375-2.7a1 1 0 0 1 .625-.218h5a2 2 0 0 0 2-2V7Zm2 8a4 4 0 0 1-4 4h-4.648l-4.727 3.781A1.001 1.001 0 0 1 7.002 22v-3h-1a4 4 0 0 1-4-4V7a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v8Z"/></svg>

assets/icons/replyFiled.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" d="M22.002 15a4 4 0 0 1-4 4h-4.648l-4.727 3.781A1.001 1.001 0 0 1 7.002 22v-3h-1a4 4 0 0 1-4-4V7a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v8Z"/></svg>

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,62 +1,24 @@
 import {Database, envToCfg, httpLogger, LinkService, readEnv} from './index.js'
 
 async function main() {
-  try {
-    httpLogger.info('Starting blink service')
-
-    const env = readEnv()
-    const cfg = envToCfg(env)
-
-    httpLogger.info(
-      {
-        port: cfg.service.port,
-        safelinkEnabled: cfg.service.safelinkEnabled,
-        hasDbUrl: !!cfg.db.url,
-        hasDbMigrationUrl: !!cfg.db.migrationUrl,
-      },
-      'Configuration loaded',
-    )
-
-    if (cfg.db.migrationUrl) {
-      httpLogger.info('Running database migrations')
-      const migrateDb = Database.postgres({
-        url: cfg.db.migrationUrl,
-        schema: cfg.db.schema,
-      })
-      await migrateDb.migrateToLatestOrThrow()
-      await migrateDb.close()
-      httpLogger.info('Database migrations completed')
-    }
-
-    httpLogger.info('Creating LinkService')
-    const link = await LinkService.create(cfg)
-
-    if (link.ctx.cfg.service.safelinkEnabled) {
-      httpLogger.info('Starting Safelink client')
-      link.ctx.safelinkClient.runFetchEvents()
-    }
-
-    await link.start()
-    httpLogger.info('Link service is running')
-
-    process.on('SIGTERM', async () => {
-      httpLogger.info('Link service is stopping')
-      await link.destroy()
-      httpLogger.info('Link service is stopped')
+  const env = readEnv()
+  const cfg = envToCfg(env)
+  if (cfg.db.migrationUrl) {
+    const migrateDb = Database.postgres({
+      url: cfg.db.migrationUrl,
+      schema: cfg.db.schema,
     })
-  } catch (error) {
-    httpLogger.error(
-      {
-        error: String(error),
-        stack: error instanceof Error ? error.stack : undefined,
-      },
-      'Failed to start blink service',
-    )
-    process.exit(1)
+    await migrateDb.migrateToLatestOrThrow()
+    await migrateDb.close()
   }
+  const link = await LinkService.create(cfg)
+  await link.start()
+  httpLogger.info('link service is running')
+  process.on('SIGTERM', async () => {
+    httpLogger.info('link service is stopping')
+    await link.destroy()
+    httpLogger.info('link service is stopped')
+  })
 }
 
-main().catch(error => {
-  console.error('Unhandled startup error:', error)
-  process.exit(1)
-})
+main()

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/index.ts

@@ -34,16 +34,6 @@ export class Database {
 
   static postgres(opts: PgOptions): Database {
     const {schema, url, txLockNonce} = opts
-    log.info(
-      {
-        schema,
-        poolSize: opts.poolSize,
-        poolMaxUses: opts.poolMaxUses,
-        poolIdleTimeoutMs: opts.poolIdleTimeoutMs,
-      },
-      'Creating database connection',
-    )
-
     const pool =
       opts.pool ??
       new Pg.Pool({

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==

bskyogcard/package.json

@@ -14,16 +14,13 @@
     "@atproto/common": "^0.4.0",
     "@resvg/resvg-js": "^2.6.2",
     "express": "^4.19.2",
-    "express-prom-bundle": "^7.0.0",
     "http-terminator": "^3.2.0",
     "pino": "^9.2.0",
-    "prom-client": "^15.1.3",
     "react": "^18.3.1",
     "satori": "^0.10.13",
     "twemoji": "^14.0.2"
   },
   "devDependencies": {
-    "@types/express": "^4.17.21",
     "@types/node": "^20.14.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"

bskyogcard/src/config.ts

@@ -6,7 +6,6 @@ export type Config = {
 
 export type ServiceConfig = {
   port: number
-  metricsPort: number
   version?: string
   appviewUrl: string
   originVerify?: string
@@ -14,7 +13,6 @@ export type ServiceConfig = {
 
 export type Environment = {
   port?: number
-  metricsPort?: number
   version?: string
   appviewUrl?: string
   originVerify?: string
@@ -23,7 +21,6 @@ export type Environment = {
 export const readEnv = (): Environment => {
   return {
     port: envInt('CARD_PORT'),
-    metricsPort: envInt('CARD_METRICS_PORT'),
     version: envStr('CARD_VERSION'),
     appviewUrl: envStr('CARD_APPVIEW_URL'),
     originVerify: envStr('CARD_ORIGIN_VERIFY'),
@@ -33,7 +30,6 @@ export const readEnv = (): Environment => {
 export const envToCfg = (env: Environment): Config => {
   const serviceCfg: ServiceConfig = {
     port: env.port ?? 3000,
-    metricsPort: env.metricsPort ?? 3001,
     version: env.version,
     appviewUrl: env.appviewUrl ?? 'https://api.bsky.app',
     originVerify: env.originVerify,

bskyogcard/src/index.ts

@@ -2,9 +2,7 @@ import events from 'node:events'
 import type http from 'node:http'
 
 import express from 'express'
-import promBundle from 'express-prom-bundle'
 import {createHttpTerminator, type HttpTerminator} from 'http-terminator'
-import {register} from 'prom-client'
 
 import {type Config} from './config.js'
 import {AppContext} from './context.js'
@@ -15,9 +13,7 @@ export * from './logger.js'
 
 export class CardService {
   public server?: http.Server
-  public metricsServer?: http.Server
   private terminator?: HttpTerminator
-  private metricsTerminator?: HttpTerminator
 
   constructor(
     public app: express.Application,
@@ -28,30 +24,6 @@ export class CardService {
     let app = express()
 
     const ctx = await AppContext.fromConfig(cfg)
-
-    // Add Prometheus middleware for automatic HTTP instrumentation
-    const metricsMiddleware = promBundle({
-      includeMethod: true,
-      includePath: true,
-      includeStatusCode: true,
-      includeUp: true,
-      promClient: {
-        collectDefaultMetrics: {},
-      },
-
-      autoregister: false,
-      normalizePath: req => {
-        // If we have a matched route, use its path (with :params) instead of the full URL path
-        if (req.route) {
-          return req.route.path
-        }
-
-        // Group all unmatched paths together to reduce cardinality
-        return '<unmatched>'
-      },
-    })
-    app.use(metricsMiddleware)
-
     app = routes(ctx, app)
     app.use(errorHandler)
 
@@ -59,49 +31,14 @@ export class CardService {
   }
 
   async start() {
-    // Start main application server
     this.server = this.app.listen(this.ctx.cfg.service.port)
     this.server.keepAliveTimeout = 90000
-    this.terminator = createHttpTerminator({
-      server: this.server,
-      gracefulTerminationTimeout: 15000, // 15s timeout for in-flight requests
-    })
+    this.terminator = createHttpTerminator({server: this.server})
     await events.once(this.server, 'listening')
-
-    // Start separate metrics server
-    const metricsApp = express()
-    metricsApp.get('/metrics', async (_req, res) => {
-      res.set('Content-Type', register.contentType)
-      res.end(await register.metrics())
-    })
-
-    this.metricsServer = metricsApp.listen(this.ctx.cfg.service.metricsPort)
-    this.metricsTerminator = createHttpTerminator({
-      server: this.metricsServer,
-      gracefulTerminationTimeout: 2000, // 2s timeout for metrics server
-    })
-    await events.once(this.metricsServer, 'listening')
   }
 
   async destroy() {
-    const startTime = Date.now()
-
     this.ctx.abortController.abort()
-
-    const shutdownPromises = []
-
-    if (this.terminator) {
-      shutdownPromises.push(this.terminator.terminate())
-    }
-
-    if (this.metricsTerminator) {
-      shutdownPromises.push(this.metricsTerminator.terminate())
-    }
-
-    await Promise.all(shutdownPromises)
-
-    const elapsed = Date.now() - startTime
-    const {httpLogger} = await import('./logger.js')
-    httpLogger.info(`Graceful shutdown completed in ${elapsed}ms`)
+    await this.terminator?.terminate()
   }
 }

bskyogcard/yarn.lock

@@ -123,11 +123,6 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@opentelemetry/api@^1.4.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
-  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
-
 "@resvg/resvg-js-android-arm-eabi@2.6.2":
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe"
@@ -234,58 +229,6 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/body-parser@*":
-  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/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/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 "24.5.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446"
-  integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==
-  dependencies:
-    undici-types "~7.12.0"
-
 "@types/node@^20.14.3":
   version "20.14.3"
   resolved "https://registry.npmjs.org/@types/node/-/node-20.14.3.tgz"
@@ -293,33 +236,6 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@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.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
@@ -372,11 +288,6 @@ base64-js@^1.3.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bintrees@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8"
-  integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==
-
 body-parser@1.20.2:
   version "1.20.2"
   resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
@@ -395,24 +306,6 @@ body-parser@1.20.2:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@1.20.3:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
-  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.13.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 boolean@^3.1.4:
   version "3.2.0"
   resolved "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz"
@@ -431,14 +324,6 @@ bytes@3.1.2:
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
 call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"
@@ -450,14 +335,6 @@ call-bind@^1.0.7:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.1"
 
-call-bound@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    get-intrinsic "^1.3.0"
-
 camelize@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz"
@@ -516,11 +393,6 @@ cookie@0.6.0:
   resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz"
   integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
-cookie@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
-  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -591,15 +463,6 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
@@ -615,11 +478,6 @@ encodeurl@~1.0.2:
   resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encodeurl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
-  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
-
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"
@@ -627,23 +485,11 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
-
 es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-  dependencies:
-    es-errors "^1.3.0"
-
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
@@ -664,53 +510,6 @@ events@^3.3.0:
   resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-express-prom-bundle@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-7.0.2.tgz#73a83b9033639dae81c78906a9df78844f3c93fa"
-  integrity sha512-ffFV4HGHvCKnkNJFqm42sYztRJE5mLgOj8MpGey1HOatuFhtcwXoBD2m5gca7ZbcyjkIf7lOH5ZdrhlrBf0sGw==
-  dependencies:
-    "@types/express" "^4.17.21"
-    express "^4.18.2"
-    on-finished "^2.3.0"
-    url-value-parser "^2.0.0"
-
-express@^4.18.2:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
-  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.3"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.7.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.3.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.3"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.12"
-    proxy-addr "~2.0.7"
-    qs "6.13.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.19.0"
-    serve-static "1.16.2"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 express@^4.19.2:
   version "4.19.2"
   resolved "https://registry.npmjs.org/express/-/express-4.19.2.tgz"
@@ -778,19 +577,6 @@ finalhandler@1.2.0:
     statuses "2.0.1"
     unpipe "~1.0.0"
 
-finalhandler@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
-  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
@@ -826,30 +612,6 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
-get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
@@ -857,11 +619,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
-
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -889,12 +646,7 @@ has-symbols@^1.0.3:
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
-
-hasown@^2.0.0, hasown@^2.0.2:
+hasown@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -995,11 +747,6 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
@@ -1010,11 +757,6 @@ merge-descriptors@1.0.1:
   resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
   integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
-merge-descriptors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
-  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
@@ -1069,17 +811,12 @@ object-inspect@^1.13.1:
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"
   integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
-object-inspect@^1.13.3:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
-
 on-exit-leak-free@^2.1.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz"
   integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==
 
-on-finished@2.4.1, on-finished@^2.3.0:
+on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -1123,11 +860,6 @@ parseurl@~1.3.3:
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-path-to-regexp@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
@@ -1200,14 +932,6 @@ process@^0.11.10:
   resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-prom-client@^15.1.3:
-  version "15.1.3"
-  resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2"
-  integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==
-  dependencies:
-    "@opentelemetry/api" "^1.4.0"
-    tdigest "^0.1.1"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
@@ -1223,13 +947,6 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
-  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
-  dependencies:
-    side-channel "^1.0.6"
-
 quick-format-unescaped@^4.0.3:
   version "4.0.4"
   resolved "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz"
@@ -1337,25 +1054,6 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-send@0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
-  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
 serve-static@1.15.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
@@ -1366,16 +1064,6 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
-serve-static@1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
-  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
-  dependencies:
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.19.0"
-
 set-function-length@^1.2.1:
   version "1.2.2"
   resolved "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"
@@ -1393,35 +1081,6 @@ setprototypeof@1.2.0:
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-
-side-channel-map@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-
-side-channel-weakmap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-    side-channel-map "^1.0.1"
-
 side-channel@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz"
@@ -1432,17 +1091,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-side-channel@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
-    side-channel-map "^1.0.1"
-    side-channel-weakmap "^1.0.2"
-
 sonic-boom@^3.7.0:
   version "3.8.1"
   resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.1.tgz"
@@ -1479,13 +1127,6 @@ string_decoder@^1.3.0:
   dependencies:
     safe-buffer "~5.2.0"
 
-tdigest@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced"
-  integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==
-  dependencies:
-    bintrees "1.0.2"
-
 thread-stream@^2.6.0:
   version "2.7.0"
   resolved "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz"
@@ -1579,11 +1220,6 @@ undici-types@~5.26.4:
   resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici-types@~7.12.0:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb"
-  integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==
-
 unicode-trie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz"
@@ -1602,11 +1238,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-url-value-parser@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.2.0.tgz#f38ae8cd24604ec69bc219d66929ddbbd93a2b32"
-  integrity sha512-yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==
-
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"

bskyweb/cmd/bskyweb/server.go

@@ -313,7 +313,7 @@ func serve(cctx *cli.Context) error {
 	e.GET("/profile/:handleOrDID/known-followers", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/search", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/lists/:rkey", server.WebGeneric)
-	e.GET("/profile/:handleOrDID/feed/:rkey", server.WebFeed)
+	e.GET("/profile/:handleOrDID/feed/:rkey", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/feed/:rkey/liked-by", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/labeler/liked-by", server.WebGeneric)
 
@@ -331,9 +331,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/starter-pack-short/:code", server.WebGeneric)
 	e.GET("/start/:handleOrDID/:rkey", server.WebStarterPack)
 
-	// bookmarks
-	e.GET("/saved", server.WebGeneric)
-
 	// ipcc
 	e.GET("/ipcc", server.WebIpCC)
 
@@ -394,7 +391,6 @@ func (srv *Server) Shutdown() error {
 func (srv *Server) NewTemplateContext() pongo2.Context {
 	return pongo2.Context{
 		"staticCDNHost": srv.cfg.staticCDNHost,
-		"favicon":       fmt.Sprintf("%s/static/favicon.png", srv.cfg.staticCDNHost),
 	}
 }
 
@@ -489,26 +485,20 @@ func (srv *Server) WebPost(c echo.Context) error {
 		}
 	}
 
-	req := c.Request()
 	if !unauthedViewingOkay {
-		// Provide minimal OpenGraph data for auth-required posts
-		data["requestURI"] = fmt.Sprintf("https://%s%s", req.Host, req.URL.Path)
-		data["requiresAuth"] = true
-		data["profileHandle"] = pv.Handle
-		if pv.DisplayName != nil {
-			data["profileDisplayName"] = *pv.DisplayName
-		}
 		return c.Render(http.StatusOK, "post.html", data)
 	}
+	did := pv.Did
+	data["did"] = did
 
 	// then fetch the post thread (with extra context)
-	uri := fmt.Sprintf("at://%s/app.bsky.feed.post/%s", pv.Did, rkey)
+	uri := fmt.Sprintf("at://%s/app.bsky.feed.post/%s", did, rkey)
 	tpv, err := appbsky.FeedGetPostThread(ctx, srv.xrpcc, 1, 0, uri)
 	if err != nil {
 		log.Warnf("failed to fetch post: %s\t%v", uri, err)
 		return c.Render(http.StatusOK, "post.html", data)
 	}
-
+	req := c.Request()
 	postView := tpv.Thread.FeedDefs_ThreadViewPost.Post
 	data["postView"] = postView
 	data["requestURI"] = fmt.Sprintf("https://%s%s", req.Host, req.URL.Path)
@@ -600,70 +590,16 @@ func (srv *Server) WebProfile(c echo.Context) error {
 			unauthedViewingOkay = false
 		}
 	}
-
+	if !unauthedViewingOkay {
+		return c.Render(http.StatusOK, "profile.html", data)
+	}
 	req := c.Request()
 	data["profileView"] = pv
 	data["requestURI"] = fmt.Sprintf("https://%s%s", req.Host, req.URL.Path)
 	data["requestHost"] = req.Host
-
-	if !unauthedViewingOkay {
-		data["requiresAuth"] = true
-	}
-
 	return c.Render(http.StatusOK, "profile.html", data)
 }
 
-func (srv *Server) WebFeed(c echo.Context) error {
-	ctx := c.Request().Context()
-	data := srv.NewTemplateContext()
-
-	// sanity check arguments. don't 4xx, just let app handle if not expected format
-	rkeyParam := c.Param("rkey")
-	rkey, err := syntax.ParseRecordKey(rkeyParam)
-	if err != nil {
-		return c.Render(http.StatusOK, "feed.html", data)
-	}
-	handleOrDIDParam := c.Param("handleOrDID")
-	handleOrDID, err := syntax.ParseAtIdentifier(handleOrDIDParam)
-	if err != nil {
-		return c.Render(http.StatusOK, "feed.html", data)
-	}
-
-	identifier := handleOrDID.Normalize().String()
-
-	// requires two fetches: first fetch profile to get DID
-	pv, err := appbsky.ActorGetProfile(ctx, srv.xrpcc, identifier)
-	if err != nil {
-		log.Warnf("failed to fetch profile for: %s\t%v", identifier, err)
-		return c.Render(http.StatusOK, "feed.html", data)
-	}
-	unauthedViewingOkay := true
-	for _, label := range pv.Labels {
-		if label.Src == pv.Did && label.Val == "!no-unauthenticated" {
-			unauthedViewingOkay = false
-		}
-	}
-
-	if !unauthedViewingOkay {
-		return c.Render(http.StatusOK, "feed.html", data)
-	}
-	did := pv.Did
-	data["did"] = did
-
-	// then fetch the feed generator
-	feedURI := fmt.Sprintf("at://%s/app.bsky.feed.generator/%s", did, rkey)
-	fgv, err := appbsky.FeedGetFeedGenerator(ctx, srv.xrpcc, feedURI)
-	if err != nil {
-		log.Warnf("failed to fetch feed generator: %s\t%v", feedURI, err)
-		return c.Render(http.StatusOK, "feed.html", data)
-	}
-	req := c.Request()
-	data["feedView"] = fgv.View
-	data["requestURI"] = fmt.Sprintf("https://%s%s", req.Host, req.URL.Path)
-
-	return c.Render(http.StatusOK, "feed.html", data)
-}
-
 type IPCCRequest struct {
 	IP string `json:"ip"`
 }

bskyweb/templates/base.html

@@ -94,8 +94,7 @@
   <meta name="theme-color">
   <meta name="application-name" content="Bluesky">
   <meta name="generator" content="bskyweb">
-  <meta property="og:site_name" content="Bluesky Social">
-  <meta property="og:logo" content="{{ favicon }}">
+  <meta property="og:site_name" content="Bluesky Social" />
   <meta name="twitter:site" content="@bluesky" />
   <link type="application/activity+json" href="" />
 

bskyweb/templates/feed.html

@@ -1,54 +0,0 @@
-{% extends "base.html" %}
-
-{% block head_title %}
-{%- if feedView -%}
-  {{ feedView.DisplayName }} by @{{ feedView.Creator.Handle }} | Bluesky Feed
-{%- else -%}
-  Bluesky
-{%- endif -%}
-{% endblock %}
-
-{% block html_head_extra -%}
-{%- if feedView -%}
-  <meta property="og:site_name" content="Bluesky Social">
-  <meta property="og:type" content="website">
-  {%- if requestURI %}
-  <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
-  {% endif -%}
-
-  {%- if feedView.DisplayName %}
-  <meta property="og:title" content="{{ feedView.DisplayName }} by @{{ feedView.Creator.Handle }}">
-  {% else %}
-  <meta property="og:title" content="Feed by @{{ feedView.Creator.Handle }}">
-  {% endif -%}
-
-  {%- if feedView.Description %}
-  <meta name="description" content="{{ feedView.Description }}">
-  <meta property="og:description" content="{{ feedView.Description }}">
-  <meta property="twitter:description" content="{{ feedView.Description }}">
-  {% endif -%}
-
-  {%- if feedView.Avatar %}
-  <meta property="og:image" content="{{ feedView.Avatar }}">
-  <meta property="twitter:image" content="{{ feedView.Avatar }}">
-  <meta name="twitter:card" content="summary">
-  {% endif %}
-
-  <meta name="twitter:label1" content="Created by">
-  <meta name="twitter:value1" content="@{{ feedView.Creator.Handle }}">
-
-  <link rel="alternate" href="{{ feedView.Uri }}" />
-{% endif -%}
-{%- endblock %}
-
-{% block noscript_extra -%}
-{%- if feedView -%}
-<div id="bsky_feed_summary">
-  <h3>Feed</h3>
-  <p id="bsky_feed_name">{{ feedView.DisplayName }}</p>
-  <p id="bsky_feed_creator">{{ feedView.Creator.Handle }}</p>
-  <p id="bsky_feed_description">{{ feedView.Description }}</p>
-</div>
-{% endif -%}
-{%- endblock %}

bskyweb/templates/post.html

@@ -3,8 +3,6 @@
 {% block head_title %}
 {%- if postView -%}
   @{{ postView.Author.Handle }} on Bluesky
-{%- elif requiresAuth and profileHandle -%}
-  @{{ profileHandle }} on Bluesky
 {%- else -%}
   Bluesky
 {%- endif -%}
@@ -13,7 +11,7 @@
 {% block html_head_extra -%}
 {%- if postView -%}
   <meta property="og:type" content="article">
-  <meta property="profile:username" content="{{ postView.Author.Handle }}">
+  <meta property="profile:username" content="{{ profileView.Handle }}">
   {%- if requestURI %}
   <meta property="og:url" content="{{ requestURI }}">
   <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
@@ -34,79 +32,17 @@
   <meta property="twitter:image" content="{{ imgThumbUrl }}">
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
-  {% else %}
+  {%- elif postView.Author.Avatar %}
+  <meta name="twitter:card" content="summary">
   <meta property="og:image" content="{{ postView.Author.Avatar }}">
   <meta property="twitter:image" content="{{ postView.Author.Avatar }}">
-  <meta name="twitter:card" content="summary">
   {% endif %}
   <meta name="twitter:label1" content="Posted At">
   <meta name="twitter:value1" content="{{ postView.IndexedAt }}">
-  {%- if postView.LikeCount %}
-  <meta name="twitter:label2" content="Likes">
-  <meta name="twitter:value2" content="{{ postView.LikeCount }}">
-  {% endif -%}
-  {%- if postView.ReplyCount %}
-  <meta name="twitter:label3" content="Replies">
-  <meta name="twitter:value3" content="{{ postView.ReplyCount }}">
-  {% endif -%}
-  {%- if postView.RepostCount %}
-  <meta name="twitter:label4" content="Reposts">
-  <meta name="twitter:value4" content="{{ postView.RepostCount }}">
-  {% endif -%}
-  <meta property="article:published_time" content="{{ postView.IndexedAt }}">
+  <meta name="article:published_time" content="{{ postView.IndexedAt }}">
+  <meta name="article:published_time" content="{{ postView.IndexedAt }}">
   <link rel="alternate" type="application/json+oembed" href="https://embed.bsky.app/oembed?format=json&url={{ postView.Uri | urlencode }}" />
   <link rel="alternate" href="{{ postView.Uri }}" />
-  <script type="application/ld+json">
-    {
-      "@context": "https://schema.org",
-      "@type": "DiscussionForumPosting",
-      "author": {
-        "@type": "Person",
-        "name": "{{ postView.Author.DisplayName }}",
-        "url": "https://bsky.app/profile/{{ postView.Author.Handle }}"
-      },
-      {%- if postText %}
-      "text": "{{ postText }}",
-      {% endif %}
-      {%- if imageThumbUrls %}
-      "image": "{{ imageThumbUrls[0] }}",
-      {% endif %}
-      "datePublished": "{{ postView.IndexedAt }}",
-      "interactionStatistic": [
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/LikeAction",
-          "userInteractionCount": {{ postView.LikeCount }}
-        },
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/CommentAction",
-          "userInteractionCount": {{ postView.ReplyCount }}
-        },
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/ShareAction",
-          "userInteractionCount": {{ postView.RepostCount + postView.QuoteCount }}
-        }
-      ]
-    }
-  </script>
-{%- elif requiresAuth and profileHandle -%}
-  <meta property="og:type" content="article">
-  <meta property="profile:username" content="{{ profileHandle }}">
-  {%- if requestURI %}
-  <meta property="og:url" content="{{ requestURI }}">
-  <link rel="canonical" href="{{ requestURI|canonicalize_url }}" />
-  {% endif -%}
-  {%- if profileDisplayName %}
-  <meta property="og:title" content="{{ profileDisplayName }} (@{{ profileHandle }})">
-  {% else %}
-  <meta property="og:title" content="@{{ profileHandle }}">
-  {% endif -%}
-  <meta name="description" content="This post requires authentication to view.">
-  <meta property="og:description" content="This post requires authentication to view.">
-  <meta property="twitter:description" content="This post requires authentication to view.">
-  <meta name="twitter:card" content="summary">
 {% endif -%}
 {%- endblock %}
 
@@ -120,11 +56,5 @@
   <p id="bsky_post_text">{{ postText }}</p>
   <p id="bsky_post_indexedat">{{ postView.IndexedAt }}</p>
 </div>
-{%- elif requiresAuth and profileHandle -%}
-<div id="bsky_post_summary">
-  <h3>Post</h3>
-  <p id="bsky_handle">{{ profileHandle }}</p>
-  <p id="bsky_post_text">This post requires authentication to view.</p>
-</div>
 {% endif -%}
 {%- endblock %}

bskyweb/templates/profile.html

@@ -9,83 +9,36 @@
 {% endblock %}
 
 {% block html_head_extra -%}
+{%- if profileView -%}
   <meta property="og:site_name" content="Bluesky Social">
   <meta property="og:type" content="profile">
-{%- if requestURI %}
+  <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 -%}
-  <meta property="profile:username" content="{{ profileView.Handle }}">
+  {% endif -%}
   {%- if profileView.DisplayName %}
   <meta property="og:title" content="{{ profileView.DisplayName }} (@{{ profileView.Handle }})">
   {% else %}
   <meta property="og:title" content="{{ profileView.Handle }}">
   {% endif -%}
-
-  <link rel="alternate" href="at://{{ profileView.Did }}/app.bsky.actor.profile/self" />
-
+  {%- if profileView.Description %}
+  <meta name="description" content="{{ profileView.Description }}">
+  <meta property="og:description" content="{{ profileView.Description }}">
+  {% endif -%}
+  {%- if profileView.Banner %}
+  <meta property="og:image" content="{{ profileView.Banner }}">
+  <meta name="twitter:card" content="summary_large_image">
+  {%- elif profileView.Avatar -%}
+  {# Don't use avatar image in cards; usually looks bad #}
+  <meta name="twitter:card" content="summary">
+  {% endif %}
   <meta name="twitter:label1" content="Account DID">
   <meta name="twitter:value1" content="{{ profileView.Did }}">
-
   {%- if requestHost %}
   <link rel="alternate" type="application/rss+xml" href="https://{{ requestHost }}/profile/{{ profileView.Did }}/rss">
   {% endif %}
-
-  {# Only show details if auth isn't required #}
-  {% if not requiresAuth %}
-    {%- if profileView.Description %}
-    <meta name="description" content="{{ profileView.Description }}">
-    <meta property="og:description" content="{{ profileView.Description }}">
-    {% endif -%}
-    {%- if profileView.Banner %}
-    <meta property="og:image" content="{{ profileView.Banner }}">
-    <meta name="twitter:card" content="summary_large_image">
-    {%- elif profileView.Avatar -%}
-    {# Don't use avatar image in cards; usually looks bad #}
-    <meta name="twitter:card" content="summary">
-    {% endif %}
-  {% else %}
-    <meta name="description" content="This profile requires authentication to view.">
-    <meta property="og:description" content="This profile requires authentication to view.">
-    <meta property="twitter:description" content="This profile requires authentication to view.">
-  {% endif %}
-  
-  <script type="application/ld+json">
-  {
-    "@context": "https://schema.org",
-    "@type": "ProfilePage",
-    "dateCreated": "{{ profileView.CreatedAt }}",
-    "mainEntity": {
-      "@type": "Person",
-      "name": "{{ profileView.DisplayName }}",
-      "alternateName": "@{{ profileView.Handle }}",
-      "identifier": "{{ profileView.Did }}",
-      "description": "{{ profileView.Description }}",
-      "image": "{{ profileView.Avatar }}",
-      "interactionStatistic": [
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/FollowAction",
-          "userInteractionCount": {{ profileView.FollowersCount }}
-        }
-      ],
-      "agentInteractionStatistic": [
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/FollowAction",
-          "userInteractionCount": {{ profileView.FollowsCount }}
-        },
-        {
-          "@type": "InteractionCounter",
-          "interactionType": "https://schema.org/WriteAction",
-          "userInteractionCount": {{ profileView.PostsCount }}
-        }
-      ]
-    }
-  }
-  </script>
+  <link rel="alternate" href="at://{{ profileView.Did }}/app.bsky.actor.profile/self" />
 {% endif -%}
 {%- endblock %}
 

docs/build.md

@@ -63,7 +63,7 @@ After you do `yarn ios` and `yarn android` once, you can later just run `yarn we
 ### Tips
 
 - Copy the `.env.example` to `.env` and fill in any necessary tokens. (The Sentry token is NOT required; see instructions below if you want to enable Sentry.)
-- To run on the device, add `--device` to the command (e.g. `yarn android --device`). To build in production mode (slower build, faster app), also add `--variant release` on Android or `--configuration Release` on iOS.
+- To run on the device, add `--device` to the command (e.g. `yarn android --device`). To build in production mode (slower build, faster app), also add `--variant release`.
 - If you want to use Expo EAS on your own builds without ejecting from Expo, make sure to change the `owner` and `extra.eas.projectId` properties. If you do not have an Expo account, you may remove these properties.
 - `npx react-native info` Checks what has been installed.
 - If the Android simulator frequently hangs or is very sluggish, [bump its memory limit](https://stackoverflow.com/a/40068396)
@@ -164,6 +164,7 @@ See [testing.md](./testing.md).
 - TextEncoder / TextDecoder
 - react-native-url-polyfill
 - Array#findLast (on web)
+- atob (on native)
 
 ### Sentry sourcemaps
 

eas.json

@@ -6,7 +6,7 @@
   },
   "build": {
     "base": {
-      "node": "20.19.4"
+      "node": "18.18.2"
     },
     "development": {
       "extends": "base",

jest/jestSetup.js

@@ -33,7 +33,7 @@ jest.mock('react-native-safe-area-context', () => {
   }
 })
 
-jest.mock('expo-file-system/legacy', () => ({
+jest.mock('expo-file-system', () => ({
   getInfoAsync: jest.fn().mockResolvedValue({exists: true, size: 100}),
   deleteAsync: jest.fn(),
   createDownloadResumable: jest.fn(),

modules/bottom-sheet/ios/SheetView.swift

@@ -1,5 +1,4 @@
 import ExpoModulesCore
-import React
 import UIKit
 
 class SheetView: ExpoView, UISheetPresentationControllerDelegate {

modules/expo-scroll-forwarder/ios/ExpoScrollForwarderView.swift

@@ -1,5 +1,4 @@
 import ExpoModulesCore
-import React
 
 // This view will be used as a native component. Make sure to inherit from `ExpoView`
 // to apply the proper styling (e.g. border radius and shadows).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.109.0",
+  "version": "1.107.0",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -71,10 +71,9 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.17.0",
+    "@atproto/api": "^0.16.2",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
-    "@bsky.app/alf": "^0.1.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/react": "^1.1.1",
     "@expo/html-elements": "^0.12.5",
@@ -93,13 +92,15 @@
     "@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.8.0",
-    "@react-native-async-storage/async-storage": "2.2.0",
+    "@mozzius/expo-dynamic-app-icon": "^1.7.1",
+    "@react-native-async-storage/async-storage": "2.1.2",
+    "@react-native-menu/menu": "^1.2.3",
+    "@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",
@@ -122,43 +123,44 @@
     "array.prototype.findlast": "^1.2.3",
     "await-lock": "^2.2.2",
     "babel-plugin-transform-remove-console": "^6.9.4",
+    "base64-js": "^1.5.1",
     "bcp-47": "^2.1.0",
     "bcp-47-match": "^2.0.3",
     "date-fns": "^2.30.0",
+    "deprecated-react-native-prop-types": "^5.0.0",
     "email-validator": "^2.0.4",
     "emoji-mart": "^5.5.2",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
-    "expo": "^54.0.9",
-    "expo-application": "~7.0.7",
-    "expo-blur": "~15.0.7",
-    "expo-build-properties": "~1.0.9",
-    "expo-camera": "~17.0.8",
-    "expo-clipboard": "~8.0.7",
-    "expo-dev-client": "~6.0.12",
-    "expo-device": "~8.0.8",
-    "expo-file-system": "~19.0.14",
-    "expo-font": "~14.0.8",
-    "expo-haptics": "~15.0.7",
-    "expo-image": "~3.0.8",
+    "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.7",
-    "expo-image-picker": "~17.0.8",
-    "expo-intent-launcher": "~13.0.7",
-    "expo-linear-gradient": "~15.0.7",
-    "expo-linking": "~8.0.8",
-    "expo-localization": "~17.0.7",
-    "expo-location": "~19.0.7",
-    "expo-media-library": "~18.2.0",
-    "expo-notifications": "~0.32.11",
-    "expo-screen-orientation": "~9.0.7",
-    "expo-sharing": "~14.0.7",
-    "expo-splash-screen": "~31.0.10",
-    "expo-system-ui": "~6.0.7",
-    "expo-task-manager": "~14.0.7",
-    "expo-updates": "~29.0.11",
-    "expo-video": "~3.0.11",
-    "expo-web-browser": "~15.0.7",
+    "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",
@@ -176,40 +178,41 @@
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
     "psl": "^1.9.0",
-    "radix-ui": "^1.4.3",
-    "react": "19.1.0",
+    "radix-ui": "^1.2.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.4",
-    "react-native-compressor": "^1.13.0",
-    "react-native-date-picker": "^5.0.13",
+    "react-native": "^0.79.3",
+    "react-native-compressor": "^1.11.0",
+    "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-keyboard-controller": "1.18.5",
+    "react-native-ios-context-menu": "^1.15.3",
+    "react-native-keyboard-controller": "^1.17.5",
     "react-native-mmkv": "^2.12.2",
     "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.16.0",
-    "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",
-    "react-responsive": "^10.0.1",
+    "react-responsive": "^9.0.2",
     "react-textarea-autosize": "^8.5.3",
     "sonner": "^2.0.7",
     "sonner-native": "^0.21.0",
@@ -217,20 +220,21 @@
     "tippy.js": "^6.3.7",
     "tlds": "^1.234.0",
     "tldts": "^6.1.46",
+    "zeego": "^1.6.2",
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.172",
+    "@atproto/dev-env": "^0.3.167",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",
-    "@expo/config-plugins": "~54.0.1",
+    "@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.4",
-    "@react-native/eslint-config": "^0.81.4",
-    "@react-native/typescript-config": "^0.81.4",
+    "@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",
@@ -240,15 +244,15 @@
     "@types/lodash.isequal": "^4.5.6",
     "@types/lodash.shuffle": "^4.2.7",
     "@types/psl": "^1.1.1",
-    "@types/react": "^19.1.12",
-    "@types/react-dom": "^19.1.9",
+    "@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",
     "babel-jest": "^29.7.0",
     "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": "~54.0.0",
+    "babel-preset-expo": "~13.1.11",
     "eslint": "^8.19.0",
     "eslint-plugin-bsky-internal": "link:./eslint",
     "eslint-plugin-ft-flow": "^2.0.3",
@@ -262,7 +266,7 @@
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "jest": "^29.7.0",
-    "jest-expo": "~54.0.12",
+    "jest-expo": "~53.0.7",
     "jest-junit": "^16.0.0",
     "lint-staged": "^13.2.3",
     "lockfile-lint": "^4.14.0",
@@ -272,14 +276,15 @@
     "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": {
-    "@react-native/babel-preset": "0.81.4",
-    "@react-native/normalize-colors": "0.81.4",
-    "**/@expo/image-utils": "0.8.7",
-    "**/expo-constants": "18.0.8",
+    "@expo/image-utils": "0.6.3",
+    "@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",
     "**/zod": "3.23.8",
     "**/multiformats": "9.9.0"

patches/@discord+bottom-sheet+4.6.1.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts b/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
-index 1c788ab..d30f330 100644
---- a/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
-+++ b/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
-@@ -6,7 +6,7 @@ type Callback = (...args: any[]) => any;
-  * https://gist.github.com/JakeCoxon/c7ebf6e6496f8468226fd36b596e1985
-  */
- export const useStableCallback = (callback: Callback) => {
--  const callbackRef = useRef<Callback>();
-+  const callbackRef = useRef<Callback>(undefined);
-   const memoCallback = useCallback(
-     (...args: any) => callbackRef.current && callbackRef.current(...args),
-     []

patches/@mattermost+react-native-paste-input+0.8.1.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-index 4ed2307..ede1181 100644
---- a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-+++ b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-@@ -54,7 +54,7 @@ class PasteTextInputManager(context: ReactApplicationContext) : ReactTextInputMa
-   }
- 
-   override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
--    val map = super.getExportedCustomBubblingEventTypeConstants()!!
-+    val map = super.getExportedCustomBubblingEventTypeConstants().toMutableMap()
-     map["onPaste"] = MapBuilder.of(
-       "phasedRegistrationNames",
-       MapBuilder.of("bubbled", "onPaste")

patches/@sentry+react-native+6.14.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
+index c282ade..8777755 100755
+--- a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
++++ b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
+@@ -215,7 +215,7 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
+ 
+   const isHermes = assets.find(asset => asset.endsWith('.hbc'));
+   const windowsCallback = process.platform === "win32" ? 'node ' : '';
+-  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
++  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')} --dist ${process.env.SENTRY_DIST}`, {
+     env: {
+       ...process.env,
+       [SENTRY_PROJECT]: sentryProject,

patches/@sentry+react-native+6.20.0.patch

@@ -1,33 +0,0 @@
-diff --git a/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js b/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
-index d7f2350..e9c0368 100644
---- a/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
-+++ b/node_modules/@sentry/react-native/dist/js/tools/sentryMetroSerializer.js
-@@ -12,12 +12,9 @@ exports.createSentryMetroSerializer = exports.unstable_beforeAssetSerializationP
- const crypto = require("crypto");
- const utils_1 = require("./utils");
- const utils_2 = require("./vendor/metro/utils");
--let countLines;
--try {
--    countLines = require('metro/private/lib/countLines');
--}
--catch (e) {
--    countLines = require('metro/src/lib/countLines');
-+const newline = /\r\n?|\n|\u2028|\u2029/g;
-+function countLines(string) {
-+    return (string.match(newline) || []).length + 1;
- }
- const DEBUG_ID_PLACE_HOLDER = '__debug_id_place_holder__';
- const DEBUG_ID_MODULE_PATH = '__debugid__';
-diff --git a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-index b3783b5..d5e3e45 100755
---- a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-+++ b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-@@ -218,7 +218,7 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
- 
-   const isHermes = assets.find(asset => asset.endsWith('.hbc'));
-   const windowsCallback = process.platform === "win32" ? 'node ' : '';
--  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
-+  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')} --dist ${process.env.SENTRY_DIST}`, {
-     env: {
-       ...process.env,
-       [SENTRY_PROJECT]: sentryProject,

patches/@sentry+react-native+6.20.0.patch.md

@@ -1,9 +0,0 @@
-# @sentry/react-native/scripts/expo-upload-sourcemaps.js patch
-
-Lets us specify the output directory for the sourcemaps via an environment variable.
-
-# @sentry/react-native/dist/js/tools/sentryMetroSerializer.js patch
-
-Patch of this: https://github.com/getsentry/sentry-react-native/issues/5180#issuecomment-3311772038
-
-Will be fixed in an upcoming release of @sentry/react-native - remove when available.

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.2.0.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

@@ -15,7 +15,7 @@ diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/Scro
 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
-@@ -1038,6 +1038,11 @@ - (void)_adjustForMaintainVisibleContentPosition
+@@ -1003,6 +1003,11 @@ - (void)_adjustForMaintainVisibleContentPosition
    }
  }
  

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
--

patches/react-native-drawer-layout+4.1.10.patch

@@ -1,38 +0,0 @@
-diff --git a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-index efa71f9..a23c624 100644
---- a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-+++ b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-@@ -124,15 +124,21 @@ export function Drawer({
-     }
-     onTransitionEnd?.(!open);
-   });
-+  const animatingTo = useSharedValue(null)
-   const toggleDrawer = React.useCallback((open, velocity) => {
-     'worklet';
- 
-+    if (animatingTo.value === (open ? 'open' : 'close')) {
-+      return;
-+    }
-+
-     const translateX = getDrawerTranslationX(open);
-     if (velocity === undefined) {
-       runOnJS(onAnimationStart)(open);
-     }
-     touchStartX.value = 0;
-     touchX.value = 0;
-+    animatingTo.value = open ? 'open' : 'close';
-     translationX.value = withSpring(translateX, {
-       velocity,
-       stiffness: 1000,
-@@ -142,7 +148,10 @@ export function Drawer({
-       restDisplacementThreshold: 0.01,
-       restSpeedThreshold: 0.01,
-       reduceMotion: ReduceMotion.Never
--    }, finished => runOnJS(onAnimationEnd)(open, finished));
-+    }, finished => {
-+      animatingTo.value = null;
-+      runOnJS(onAnimationEnd)(open, finished)
-+    });
-     if (open) {
-       runOnJS(onOpen)();
-     } else {

patches/react-native-gesture-handler+2.25.0.patch

@@ -0,0 +1,36 @@
+diff --git a/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm b/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
+index 43d11b4..5bf0d32 100644
+--- a/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
++++ b/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
+@@ -461,16 +461,23 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+     shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+ {
+-  if ([_handlersToWaitFor count]) {
+-    RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
+-    if (handler != nil) {
+-      for (NSNumber *handlerTag in _handlersToWaitFor) {
+-        if ([handler.tag isEqual:handlerTag]) {
+-          return YES;
+-        }
+-      }
++  RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
++  if (handler == nil) {
++    return NO;
++  }
++
++  for (NSNumber *handlerTag in _handlersToWaitFor) {
++    if ([handler.tag isEqual:handlerTag]) {
++      return YES;
+     }
+   }
++
++  for (NSNumber *handlerTag in handler->_handlersThatShouldWait) {
++    if ([_tag isEqual:handlerTag]) {
++      return YES;
++    }
++  }
++
+   return NO;
+ }
+ 

patches/react-native-reanimated+3.17.5.patch

@@ -0,0 +1,44 @@
+diff --git a/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp b/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp
+index eae3989..432745a 100644
+--- a/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp
++++ b/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp
+@@ -416,6 +416,10 @@ void NativeProxy::progressLayoutAnimation(
+       tag, newPropsJNI, isSharedTransition);
+ }
+ 
++void NativeProxy::endLayoutAnimation(int tag, bool shouldRemove) {
++  layoutAnimations_->cthis()->endLayoutAnimation(tag, shouldRemove);
++}
++
+ PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
+ #ifdef RCT_NEW_ARCH_ENABLED
+   // nothing
+@@ -455,14 +459,7 @@ PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
+   auto progressLayoutAnimation =
+       bindThis(&NativeProxy::progressLayoutAnimation);
+ 
+-  auto endLayoutAnimation = [weakThis = weak_from_this()](
+-                                int tag, bool removeView) {
+-    auto strongThis = weakThis.lock();
+-    if (!strongThis) {
+-      return;
+-    }
+-    strongThis->layoutAnimations_->cthis()->endLayoutAnimation(tag, removeView);
+-  };
++  auto endLayoutAnimation = bindThis(&NativeProxy::endLayoutAnimation);
+ 
+   auto maybeFlushUiUpdatesQueueFunction =
+       bindThis(&NativeProxy::maybeFlushUIUpdatesQueue);
+diff --git a/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h b/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h
+index 2ee2cc8..2edb5c9 100644
+--- a/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h
++++ b/node_modules/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h
+@@ -234,6 +234,8 @@ class NativeProxy : public jni::HybridClass<NativeProxy>,
+       const jsi::Object &newProps,
+       bool isSharedTransition);
+ 
++  void endLayoutAnimation(int tag, bool shouldRemove);
++
+   /***
+    * Wraps a method of `NativeProxy` in a function object capturing `this`
+    * @tparam TReturn return type of passed method

patches/react-native-screens+4.16.0.patch

@@ -1,326 +0,0 @@
-diff --git a/node_modules/react-native-screens/ios/RNSScreen.mm b/node_modules/react-native-screens/ios/RNSScreen.mm
-index b62a2e2..cb469db 100644
---- a/node_modules/react-native-screens/ios/RNSScreen.mm
-+++ b/node_modules/react-native-screens/ios/RNSScreen.mm
-@@ -729,9 +729,26 @@ - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingFor
- #endif
- }
- 
--#if !RCT_NEW_ARCH_ENABLED
-+- (void)willMoveToWindow:(UIWindow *)newWindow
-+{
-+  if (@available(iOS 26, *)) {
-+    // In iOS 26, as soon as another screen appears in transition, it is interactable
-+    // To avoid glitches resulting from clicking buttons mid transition, we temporarily disable all interactions
-+    // Disabling interactions for parent navigation controller won't be enough in case of nested stack
-+    // Furthermore, a stack put inside a modal will exist in an entirely different hierarchy
-+    // To be sure, we block interactions on the whole window.
-+    // Note that newWindows is nil when moving from instead of moving to, and Obj-C handles nil correctly
-+    newWindow.userInteractionEnabled = false;
-+  }
-+}
-+
- - (void)presentationControllerWillDismiss:(UIPresentationController *)presentationController
- {
-+  if (@available(iOS 26, *)) {
-+    // Disable interactions to disallow multiple modals dismissed at once; see willMoveToWindow
-+    presentationController.containerView.window.userInteractionEnabled = false;
-+  }
-+#if !RCT_NEW_ARCH_ENABLED
-   // On Paper, we need to call both "cancel" and "reset" here because RN's gesture
-   // recognizer does not handle the scenario when it gets cancelled by other top
-   // level gesture recognizer. In this case by the modal dismiss gesture.
-@@ -744,8 +761,8 @@ - (void)presentationControllerWillDismiss:(UIPresentationController *)presentati
-   // down.
-   [_touchHandler cancel];
-   [_touchHandler reset];
--}
- #endif // !RCT_NEW_ARCH_ENABLED
-+}
- 
- - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presentationController
- {
-@@ -757,6 +774,10 @@ - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presenta
- 
- - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)presentationController
- {
-+  if (@available(iOS 26, *)) {
-+    // Reenable interactions; see presentationControllerWillDismiss
-+    presentationController.containerView.window.userInteractionEnabled = true;
-+  }
-   // NOTE(kkafar): We should consider depracating the use of gesture cancel here & align
-   // with usePreventRemove API of react-navigation v7.
-   [self notifyGestureCancel];
-@@ -767,6 +788,11 @@ - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)pr
- 
- - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
- {
-+  if (@available(iOS 26, *)) {
-+    // Reenable interactions; see presentationControllerWillDismiss
-+    // Dismissed screen doesn't hold a reference to window, but presentingViewController.view does
-+    presentationController.presentingViewController.view.window.userInteractionEnabled = true;
-+  }
-   if ([_reactSuperview respondsToSelector:@selector(presentationControllerDidDismiss:)]) {
-     [_reactSuperview performSelector:@selector(presentationControllerDidDismiss:) withObject:presentationController];
-   }
-@@ -1518,6 +1544,10 @@ - (void)viewWillDisappear:(BOOL)animated
- 
- - (void)viewDidAppear:(BOOL)animated
- {
-+  if (@available(iOS 26, *)) {
-+    // Reenable interactions, see willMoveToWindow
-+    self.view.window.userInteractionEnabled = true;
-+  }
-   [super viewDidAppear:animated];
-   if (!_isSwiping || _shouldNotify) {
-     // we are going forward or dismissing without swipe
-diff --git a/node_modules/react-native-screens/ios/RNSScreenStack.mm b/node_modules/react-native-screens/ios/RNSScreenStack.mm
-index 229dc58..10b365b 100644
---- a/node_modules/react-native-screens/ios/RNSScreenStack.mm
-+++ b/node_modules/react-native-screens/ios/RNSScreenStack.mm
-@@ -62,26 +62,6 @@ @interface RNSScreenStackView () <
- 
- @implementation RNSNavigationController
- 
--#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
--- (void)viewDidLoad
--{
--  // iOS 26 introduces new gesture recognizer which replaces our RNSPanGestureRecognizer.
--  // The problem is that we are not able to handle it here for various reasons:
--  // - the new recognizer comes with its own delegate and our current approach is to wire
--  //   all recognizers to RNSScreenStackView; to be 100% sure we don't break the logic,
--  //   we would have to decorate its delegate and call it after our code, which would
--  //   break other recognizers that the stack view is the delegate for
--  // - when RNSScreenStackView.setupGestureHandler method is called, the recognizer hasn't been
--  //   loaded yet and there is no other place to configure in a not "hacky" way
--  // - the official docs warn us to not use it for anything other than "setting up failure requirements with it"
--  // - we expose fullScreenGestureEnabled prop to enable/disable the feature,
--  //   so we need control over the delegate
--  if (@available(iOS 26.0, *)) {
--    self.interactiveContentPopGestureRecognizer.enabled = NO;
--  }
--}
--#endif // iOS 26
--
- #if !TARGET_OS_TV
- - (UIViewController *)childViewControllerForStatusBarStyle
- {
-@@ -219,50 +199,6 @@ - (bool)onRepeatedTabSelectionOfTabScreenController:(RNSTabsScreenViewController
-   return false;
- }
- 
--#pragma mark - UINavigationBarDelegate
--
--#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
--- (BOOL)navigationBar:(UINavigationBar *)navigationBar shouldPopItem:(UINavigationItem *)item
--{
--  if (@available(iOS 26, *)) {
--    // To prevent popping multiple screens when back button is pressed repeatedly,
--    // We allow for pop operation to proceed only if no transition is in progress,
--    // which we check indirectly by checking if transitionCoordinator is set.
--    // If it's not, we are safe to proceed.
--    if (self.transitionCoordinator == nil) {
--      // We still need to disable interactions for back button so click effects are not applied,
--      // and there is unfortunately no better place for it currently
--      UIView *button = [navigationBar rnscreens_findBackButtonWrapperView];
--      if (button != nil) {
--        button.userInteractionEnabled = false;
--      }
--
--      return true;
--    }
--
--    return false;
--  }
--
--  return true;
--}
--
--- (void)navigationBar:(UINavigationBar *)navigationBar didPopItem:(UINavigationItem *)item
--{
--  if (@available(iOS 26, *)) {
--    // Reset interactions on back button -> see navigationBar:shouldPopItem
--    // IMPORTANT: This reset won't execute when preventNativeDismiss is on.
--    // However, on iOS 26, unlike in previous versions, the back button instance changes
--    // when handling preventNativeDismiss and userIteractionEnabled is reset.
--    // The instance also changes when regular screen pop happens, but in that case
--    // the value of userInteractionEnabled is carried on, and we reset it here.
--    UIView *button = [navigationBar rnscreens_findBackButtonWrapperView];
--    if (button != nil) {
--      button.userInteractionEnabled = true;
--    }
--  }
--}
--#endif // Check for iOS >= 26
--
- #pragma mark - RNSFrameCorrectionProvider
- 
- #ifdef RNS_GAMMA_ENABLED
-@@ -327,7 +263,7 @@ @implementation RNSScreenStackView {
-   UINavigationController *_controller;
-   NSMutableArray<RNSScreenView *> *_reactSubviews;
-   BOOL _invalidated;
--  BOOL _isFullWidthSwiping;
-+  BOOL _isFullWidthSwipingWithPanGesture; // used only for content swipe with RNSPanGestureRecognizer
-   RNSPercentDrivenInteractiveTransition *_interactionController;
-   __weak RNSScreenStackManager *_manager;
-   BOOL _updateScheduled;
-@@ -522,6 +458,11 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller
-         [self addSubview:controller.view];
- #if !TARGET_OS_TV
-         _controller.interactivePopGestureRecognizer.delegate = self;
-+        #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-+        if (@available(iOS 26, *)) {
-+          _controller.interactiveContentPopGestureRecognizer.delegate = self;
-+        }
-+#endif // Check for iOS >= 26.0
- #endif
-         [controller didMoveToParentViewController:parentView.reactViewController];
-         // On iOS pre 12 we observed that `willShowViewController` delegate method does not always
-@@ -943,7 +884,7 @@ - (void)dismissOnReload
-       // when preventing the native dismiss with back button, we have to return the animator.
-       // Also, we need to return the animator when full width swiping even if the animation is not custom,
-       // otherwise the screen will be just popped immediately due to no animation
--      ((operation == UINavigationControllerOperationPop && shouldCancelDismiss) || _isFullWidthSwiping ||
-+      ((operation == UINavigationControllerOperationPop && shouldCancelDismiss) || _isFullWidthSwipingWithPanGesture ||
-        [RNSScreenStackAnimator isCustomAnimation:screen.stackAnimation] || _customAnimation)) {
-     return [[RNSScreenStackAnimator alloc] initWithOperation:operation];
-   }
-@@ -967,23 +908,39 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-   }
-   RNSScreenView *topScreen = _reactSubviews.lastObject;
- 
-+  BOOL customAnimationOnSwipePropSetAndSelectedAnimationIsCustom =
-+      topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation];
-+
- #if TARGET_OS_TV || TARGET_OS_VISION
-   [self cancelTouchesInParent];
-   return YES;
- #else
--  // RNSPanGestureRecognizer will receive events iff topScreen.fullScreenSwipeEnabled == YES;
--  // Events are filtered in gestureRecognizer:shouldReceivePressOrTouchEvent: method
-   if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
--    if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) {
--      _isFullWidthSwiping = YES;
--      [self cancelTouchesInParent];
--      return YES;
-+    // On iOS < 26, we have a custom full screen swipe recognizer that functions similarily
-+    // to interactiveContentPopGestureRecognizer introduced in iOS 26.
-+    // On iOS >= 26, we want to use the native one, but we are unable to handle custom animations
-+    // with native interactiveContentPopGestureRecognizer, so we have to fallback to the old implementation.
-+    // In this case, the old one should behave as close as the new native one, having only the difference
-+    // in animation, and without any customization that is exclusive for it (e.g. gestureResponseDistance).
-+    if (@available(iOS 26, *)) {
-+      if (customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) {
-+        _isFullWidthSwipingWithPanGesture = YES;
-+        [self cancelTouchesInParent];
-+        return YES;
-+      }
-+      return NO;
-+    } else {
-+      if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) {
-+        _isFullWidthSwipingWithPanGesture = YES;
-+        [self cancelTouchesInParent];
-+        return YES;
-+      }
-+      return NO;
-     }
--    return NO;
-   }
- 
-   // Now we're dealing with RNSScreenEdgeGestureRecognizer (or _UIParallaxTransitionPanGestureRecognizer)
--  if (topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation]) {
-+  if (customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) {
-     if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizer class]]) {
-       UIRectEdge edges = ((RNSScreenEdgeGestureRecognizer *)gestureRecognizer).edges;
-       BOOL isRTL = _controller.view.semanticContentAttribute == UISemanticContentAttributeForceRightToLeft;
-@@ -1028,7 +985,9 @@ - (void)setupGestureHandlers
-   rightEdgeSwipeGestureRecognizer.delegate = self;
-   [self addGestureRecognizer:rightEdgeSwipeGestureRecognizer];
- 
--  // gesture recognizer for full width swipe gesture
-+  // Starting from iOS 26, RNSPanGestureRecognizer has been mostly replaced by native
-+  // interactiveContentPopGestureRecognizer. It still needs to handle custom dismiss animations,
-+  // which we are not able to handle with the latter.
-   RNSPanGestureRecognizer *panRecognizer = [[RNSPanGestureRecognizer alloc] initWithTarget:self
-                                                                                     action:@selector(handleSwipe:)];
-   panRecognizer.delegate = self;
-@@ -1091,7 +1050,7 @@ - (void)handleSwipe:(UIPanGestureRecognizer *)gestureRecognizer
-         [_interactionController cancelInteractiveTransition];
-       }
-       _interactionController = nil;
--      _isFullWidthSwiping = NO;
-+      _isFullWidthSwipingWithPanGesture = NO;
-     }
-     default: {
-       break;
-@@ -1225,14 +1184,6 @@ - (BOOL)isScrollViewPanGestureRecognizer:(UIGestureRecognizer *)gestureRecognize
- // Be careful when adding another type of gesture recognizer.
- - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePressOrTouchEvent:(NSObject *)event
- {
--  if (@available(iOS 26, *)) {
--    // in iOS 26, you can swipe to pop screen before the previous one finished transitioning;
--    // this prevents from registering the second gesture
--    if ([self isTransitionInProgress]) {
--      return NO;
--    }
--  }
--
-   RNSScreenView *topScreen = _reactSubviews.lastObject;
- 
-   for (RNSScreenView *s in _reactSubviews.reverseObjectEnumerator) {
-@@ -1249,10 +1200,30 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
-     return NO;
-   }
- 
-+  BOOL customAnimationOnSwipePropSetAndSelectedAnimationIsCustom =
-+      topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation];
-+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-+  if (@available(iOS 26, *)) {
-+    // On iOS 26, fullScreenSwipeEnabled takes no effect, and depending on whether custom animations are on,
-+    // we select either interactiveContentPopGestureRecognizer or RNSPanGestureRecognizer
-+    if (([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]] &&
-+         !customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) ||
-+        (gestureRecognizer == _controller.interactiveContentPopGestureRecognizer &&
-+         customAnimationOnSwipePropSetAndSelectedAnimationIsCustom)) {
-+      return NO;
-+    }
-+  } else {
-+    // We want to pass events to RNSPanGestureRecognizer iff full screen swipe is enabled.
-+    if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
-+      return topScreen.fullScreenSwipeEnabled;
-+    }
-+  }
-+#else // check for iOS >= 26
-   // We want to pass events to RNSPanGestureRecognizer iff full screen swipe is enabled.
-   if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
-     return topScreen.fullScreenSwipeEnabled;
-   }
-+#endif // check for iOS >= 26
- 
-   // RNSScreenEdgeGestureRecognizer || _UIParallaxTransitionPanGestureRecognizer
-   return YES;
-@@ -1268,15 +1239,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
-   return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:touch];
- }
- 
--- (BOOL)isTransitionInProgress
--{
--  if (_controller.transitionCoordinator != nil) {
--    return YES;
--  }
--
--  return NO;
--}
--
- - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-     shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
- {
-@@ -1289,7 +1251,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-     if (gestureRecognizer.state == UIGestureRecognizerStateBegan || isBackGesture) {
-       return NO;
-     }
--
-     return YES;
-   }
-   return NO;

src/App.native.tsx

@@ -32,12 +32,13 @@ import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
 import {listenSessionDropped} from '#/state/events'
 import {
-  beginResolveGeolocationConfig,
-  ensureGeolocationConfigIsResolved,
+  beginResolveGeolocation,
+  ensureGeolocationResolved,
   Provider as GeolocationProvider,
 } from '#/state/geolocation'
 import {GlobalGestureEventsProvider} from '#/state/global-gesture-events'
 import {Provider as HomeBadgeProvider} from '#/state/home-badge'
+import {Provider as InvitesStateProvider} from '#/state/invites'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
 import {Provider as ModalStateProvider} from '#/state/modals'
@@ -90,7 +91,7 @@ if (isAndroid) {
 /**
  * Begin geolocation ASAP
  */
-beginResolveGeolocationConfig()
+beginResolveGeolocation()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -202,10 +203,9 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([
-      initPersistedState(),
-      ensureGeolocationConfigIsResolved(),
-    ]).then(() => setReady(true))
+    Promise.all([initPersistedState(), ensureGeolocationResolved()]).then(() =>
+      setReady(true),
+    )
   }, [])
 
   if (!isReady) {
@@ -224,22 +224,24 @@ function App() {
             <PrefsStateProvider>
               <I18nProvider>
                 <ShellStateProvider>
-                  <ModalStateProvider>
-                    <DialogStateProvider>
-                      <LightboxStateProvider>
-                        <PortalProvider>
-                          <BottomSheetProvider>
-                            <StarterPackProvider>
-                              <SafeAreaProvider
-                                initialMetrics={initialWindowMetrics}>
-                                <InnerApp />
-                              </SafeAreaProvider>
-                            </StarterPackProvider>
-                          </BottomSheetProvider>
-                        </PortalProvider>
-                      </LightboxStateProvider>
-                    </DialogStateProvider>
-                  </ModalStateProvider>
+                  <InvitesStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <BottomSheetProvider>
+                              <StarterPackProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}>
+                                  <InnerApp />
+                                </SafeAreaProvider>
+                              </StarterPackProvider>
+                            </BottomSheetProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </InvitesStateProvider>
                 </ShellStateProvider>
               </I18nProvider>
             </PrefsStateProvider>

src/App.web.tsx

@@ -21,11 +21,12 @@ import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
 import {listenSessionDropped} from '#/state/events'
 import {
-  beginResolveGeolocationConfig,
-  ensureGeolocationConfigIsResolved,
+  beginResolveGeolocation,
+  ensureGeolocationResolved,
   Provider as GeolocationProvider,
 } from '#/state/geolocation'
 import {Provider as HomeBadgeProvider} from '#/state/home-badge'
+import {Provider as InvitesStateProvider} from '#/state/invites'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
 import {Provider as ModalStateProvider} from '#/state/modals'
@@ -68,7 +69,7 @@ import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottom
 /**
  * Begin geolocation ASAP
  */
-beginResolveGeolocationConfig()
+beginResolveGeolocation()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -177,10 +178,9 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([
-      initPersistedState(),
-      ensureGeolocationConfigIsResolved(),
-    ]).then(() => setReady(true))
+    Promise.all([initPersistedState(), ensureGeolocationResolved()]).then(() =>
+      setReady(true),
+    )
   }, [])
 
   if (!isReady) {
@@ -198,17 +198,19 @@ function App() {
           <PrefsStateProvider>
             <I18nProvider>
               <ShellStateProvider>
-                <ModalStateProvider>
-                  <DialogStateProvider>
-                    <LightboxStateProvider>
-                      <PortalProvider>
-                        <StarterPackProvider>
-                          <InnerApp />
-                        </StarterPackProvider>
-                      </PortalProvider>
-                    </LightboxStateProvider>
-                  </DialogStateProvider>
-                </ModalStateProvider>
+                <InvitesStateProvider>
+                  <ModalStateProvider>
+                    <DialogStateProvider>
+                      <LightboxStateProvider>
+                        <PortalProvider>
+                          <StarterPackProvider>
+                            <InnerApp />
+                          </StarterPackProvider>
+                        </PortalProvider>
+                      </LightboxStateProvider>
+                    </DialogStateProvider>
+                  </ModalStateProvider>
+                </InvitesStateProvider>
               </ShellStateProvider>
             </I18nProvider>
           </PrefsStateProvider>

src/Navigation.tsx

@@ -1,4 +1,4 @@
-import {type JSX, useCallback, useRef} from 'react'
+import {useCallback, useRef} from 'react'
 import {Linking} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {i18n, type MessageDescriptor} from '@lingui/core'
@@ -64,12 +64,13 @@ import {PostThreadScreen} from '#/view/screens/PostThread'
 import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
 import {ProfileScreen} from '#/view/screens/Profile'
 import {ProfileFeedLikedByScreen} from '#/view/screens/ProfileFeedLikedBy'
+import {ProfileListScreen} from '#/view/screens/ProfileList'
+import {SavedFeeds} from '#/view/screens/SavedFeeds'
 import {Storybook} from '#/view/screens/Storybook'
 import {SupportScreen} from '#/view/screens/Support'
 import {TermsOfServiceScreen} from '#/view/screens/TermsOfService'
 import {BottomBar} from '#/view/shell/bottom-bar/BottomBar'
 import {createNativeStackNavigatorWithAuth} from '#/view/shell/createNativeStackNavigatorWithAuth'
-import {BookmarksScreen} from '#/screens/Bookmarks'
 import {SharedPreferencesTesterScreen} from '#/screens/E2E/SharedPreferencesTesterScreen'
 import HashtagScreen from '#/screens/Hashtag'
 import {LogScreen} from '#/screens/Log'
@@ -90,8 +91,6 @@ import {ProfileFollowersScreen} from '#/screens/Profile/ProfileFollowers'
 import {ProfileFollowsScreen} from '#/screens/Profile/ProfileFollows'
 import {ProfileLabelerLikedByScreen} from '#/screens/Profile/ProfileLabelerLikedBy'
 import {ProfileSearchScreen} from '#/screens/Profile/ProfileSearch'
-import {ProfileListScreen} from '#/screens/ProfileList'
-import {SavedFeeds} from '#/screens/SavedFeeds'
 import {SearchScreen} from '#/screens/Search'
 import {AboutSettingsScreen} from '#/screens/Settings/AboutSettings'
 import {AccessibilitySettingsScreen} from '#/screens/Settings/AccessibilitySettings'
@@ -601,14 +600,6 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
           requireAuth: true,
         }}
       />
-      <Stack.Screen
-        name="Bookmarks"
-        getComponent={() => BookmarksScreen}
-        options={{
-          title: title(msg`Saved Posts`),
-          requireAuth: true,
-        }}
-      />
     </>
   )
 }