fix type error

2025-07-25 09:13:45 -07:00
1004 changed files with 91818 additions and 116096 deletions
@@ -1,41 +1,8 @@
-# The env the app is running in e.g. development, testflight, production
-EXPO_PUBLIC_ENV=development
+# Copy this to `.env` and `.env.test` files

-# This is the semver release version of the app, pulled from package.json
-EXPO_PUBLIC_RELEASE_VERSION=
-
-# This is the commit hash that the current bundle was made from.
-EXPO_PUBLIC_BUNDLE_IDENTIFIER=
-
-# Should be formatted YYMMDDHH so that it increases for each build.
-EXPO_PUBLIC_BUNDLE_DATE=0
-
-# The log level for the app's logger transports
+BITDRIFT_API_KEY=
+SENTRY_AUTH_TOKEN=
 EXPO_PUBLIC_LOG_LEVEL=debug
-
-# Enable debug logs for specific logger instances
-EXPO_PUBLIC_LOG_DEBUG=session
-
-# Bluesky appview DID
-EXPO_PUBLIC_BLUESKY_PROXY_DID=
-
-# Chat service DID
-EXPO_PUBLIC_CHAT_PROXY_DID=
-
-#
-#
-# Bluesky specific values
-#
-#
-
-# Sentry DSN for telemetry
-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=
+EXPO_PUBLIC_LOG_DEBUG=
+EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+EXPO_PUBLIC_BUNDLE_DATE=0
@@ -34,7 +34,6 @@ module.exports = {
          'P',
          'Admonition',
          'Admonition.Admonition',
-          'Toast.Action',
          'AgeAssuranceAdmonition',
          'Span',
        ],
@@ -111,8 +110,6 @@ module.exports = {
    'bskyembed',
    'src/locale/locales/_build/',
    'src/locale/locales/**/*.js',
-    '*.e2e.ts',
-    '*.e2e.tsx',
  ],
  settings: {
    componentWrapperFunctions: ['observer'],
@@ -43,11 +43,12 @@ jobs:
          tags: |
            type=sha,enable=true,priority=100,prefix=,suffix=,format=long

-      - name: Env
-        id: env
+      - name: Set outputs
+        id: vars
        run: |
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT

      - name: Build and push Docker image
        id: build-and-push
@@ -61,8 +62,8 @@ jobs:
          cache-from: type=gha
          cache-to: type=gha,mode=max
          build-args: |
-            EXPO_PUBLIC_ENV=production
-            EXPO_PUBLIC_RELEASE_VERSION=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-            EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
+            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }}
+            SENTRY_DIST=${{ steps.vars.outputs.SENTRY_DIST }}
+            SENTRY_RELEASE=${{ steps.vars.outputs.SENTRY_RELEASE }}
            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            SENTRY_DSN=${{ secrets.SENTRY_DSN }}
@@ -3,7 +3,6 @@ on:
  push:
    branches:
      - main
-      - echoprom_fix

 env:
  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -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 }}
@@ -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 }}
@@ -62,31 +62,23 @@ jobs:
      - name: Check for i18n compilation errors
        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi

-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p android
-          --profile ${{ inputs.profile || 'testflight-android' }}
-          --local --output build.aab --non-interactive
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} --local --output build.aab --non-interactive

      - name: ✍️ Rename Testflight bundle
        if: ${{ inputs.profile != 'production' }}
@@ -148,14 +140,7 @@ jobs:

      - name: 🏗️ Build Production APK
        if: ${{ inputs.profile == 'production' }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p android
-          --profile production-apk
-          --local --output build.apk --non-interactive
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile production-apk --local --output build.apk --non-interactive

      - name: 🚀 Upload Production APK Artifact
        id: upload-artifact-production-apk
@@ -53,12 +53,12 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: "16.4"
+          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
@@ -75,30 +75,22 @@ jobs:
      - name: Check for i18n compilation errors
        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi

-      # EXPO_PUBLIC_ENV is handled in eas.json
      - name: ✏️ Write environment variables
-        id: env
        run: |
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p ios
-          --profile ${{ inputs.profile || 'testflight' }}
-          --local --output build.ipa --non-interactive
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p ios --profile ${{ inputs.profile || 'testflight' }} --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
        run: eas submit -p ios --non-interactive --path build.ipa
@@ -101,31 +101,25 @@ jobs:
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
        uses: dcarbone/install-jq-action@v2

-      # eas.json not used here, set EXPO_PUBLIC_ENV
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_ENV=${{ inputs.channel || 'testflight' }}" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - name: 🏗️ Create Bundle
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn export
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export

      - name: 📦 Package Bundle and 🚀 Deploy
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -192,12 +186,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
@@ -211,30 +205,16 @@ jobs:
      - name: 🔤 Compile translations
        run: yarn intl:build

-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p ios
-          --profile testflight
-          --local --output build.ipa --non-interactive
+        run: yarn use-build-number-with-bump eas build -p ios --profile testflight --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
        run: eas submit -p ios --non-interactive --path build.ipa
@@ -293,8 +273,8 @@ jobs:

      - uses: actions/setup-java@v4
        with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'

      - name: ⚙️ Install dependencies
        run: yarn install
@@ -302,37 +282,23 @@ jobs:
      - name: 🔤 Compile translations
        run: yarn intl:build

-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p android
-          --profile testflight-android
-          --local --output build.apk --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile testflight-android --local --output build.apk --non-interactive

      - name: ⏰ Get a timestamp
        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
@@ -72,32 +72,18 @@ jobs:
    runs-on: ubuntu-latest
    needs: [handle-comment]
    if: needs.handle-comment.outputs.should-deploy == 'true'
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-deploy
+      cancel-in-progress: true

    steps:
-      - name: Get PR HEAD SHA
-        id: pr-info
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const pr = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              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);
-
      - name: 💬 Drop a comment
        uses: marocchino/sticky-pull-request-comment@v2
        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
+          header: pull-request-eas-build-${{ github.sha }}
          number: ${{ github.event.issue.number }}
          message: |
-            An OTA deployment has been requested and is now running for `${{ steps.pr-info.outputs.head-sha }}`.
+            An OTA deployment has been requested and is now running...

            [Here is some music to listen to while you wait...](https://www.youtube.com/watch?v=VBlFHuCzPgY)
            ---
@@ -112,8 +98,6 @@ jobs:

      - name: ⬇️ Checkout
        uses: actions/checkout@v4
-        with:
-          ref: ${{ steps.pr-info.outputs.head-sha }}

      - name: 🔧 Setup Node
        uses: actions/setup-node@v4
@@ -152,28 +136,23 @@ jobs:
      - name: 🪛 Setup jq
        uses: dcarbone/install-jq-action@v2

-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_ENV=testflight" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - name: 🏗️ Create Bundle
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn export
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="pull-request" yarn export

      - name: 📦 Package Bundle and 🚀 Deploy
        run: yarn use-build-number bash scripts/bundleUpdate.sh
@@ -182,26 +161,25 @@ jobs:
          CHANNEL_NAME: pull-request-${{ github.event.issue.number }}
          RUNTIME_VERSION:

+
      - name: 💬 Drop a comment
        uses: marocchino/sticky-pull-request-comment@v2
        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
+          header: pull-request-eas-build-${{ github.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()
        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
+          header: pull-request-eas-build-${{ github.sha }}
          number: ${{ github.event.issue.number }}
          message: |
            Your requested OTA deployment was unsuccessful. See action logs for more details.
@@ -50,7 +50,6 @@ jobs:
          git config --global user.name "github-actions[bot]"
          git merge --no-edit ${{ github.head_ref }}
          yarn install
-          yarn intl:build

      - name: 🔦 Generate stats file for PR
        run: |
@@ -74,7 +73,6 @@ jobs:
        if: ${{ !steps.get-base-stats.outputs.cache-hit }}
        run: |
          yarn install
-          yarn intl:build
          yarn generate-webpack-stats-file
          mv stats.json stats-base.json

@@ -145,3 +143,4 @@ jobs:
        with:
          header: fingerprint-diff
          delete: true
+
@@ -58,7 +58,6 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
-Gemfile.lock

 # Testing
 coverage/
@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -19,28 +19,28 @@ ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"

-# The latest git hash of the preview branch on render.com
-# https://render.com/docs/docker-secrets#environment-variables-in-docker-builds
-ARG RENDER_GIT_COMMIT
-
 #
 # Expo
 #
-ARG EXPO_PUBLIC_ENV
-ENV EXPO_PUBLIC_ENV=${EXPO_PUBLIC_ENV:-development}
-ARG EXPO_PUBLIC_RELEASE_VERSION
-ENV EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION
 ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
-# If not set by GitHub workflows, we're probably in Render
-ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-$RENDER_GIT_COMMIT}
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
+
+# The latest git hash of the preview branch on render.com
+ARG RENDER_GIT_COMMIT

 #
 # Sentry
 #
 ARG SENTRY_AUTH_TOKEN
 ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-unknown}
-ARG EXPO_PUBLIC_SENTRY_DSN
-ENV EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN
+# Will fall back to package.json#version, but this is handled elsewhere
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=$SENTRY_RELEASE
+ARG SENTRY_DIST
+# Default to RENDER_GIT_COMMIT if not set by GitHub workflows
+ENV SENTRY_DIST=${SENTRY_DIST:-$RENDER_GIT_COMMIT}
+ARG SENTRY_DSN
+ENV SENTRY_DSN=$SENTRY_DSN

 #
 # Copy everything into the container
@@ -60,16 +60,13 @@ RUN \. "$NVM_DIR/nvm.sh" && \
  nvm install $NODE_VERSION && \
  nvm use $NODE_VERSION && \
  echo "Using bundle identifier: $EXPO_PUBLIC_BUNDLE_IDENTIFIER" && \
-  echo "EXPO_PUBLIC_ENV=$EXPO_PUBLIC_ENV" >> .env && \
-  echo "EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION" >> .env && \
  echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER" >> .env && \
  echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \
-  echo "EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN" >> .env && \
  npm install --global yarn && \
  yarn && \
  yarn intl:build 2>&1 | tee i18n.log && \
  if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compile errors!\n\n"; fi && \
-  SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$EXPO_PUBLIC_RELEASE_VERSION SENTRY_DIST=$EXPO_PUBLIC_BUNDLE_IDENTIFIER yarn build-web
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$SENTRY_RELEASE SENTRY_DIST=$SENTRY_DIST SENTRY_DSN=$SENTRY_DSN yarn build-web

 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
@@ -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
@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -10,7 +10,7 @@ Get the app itself:

 ## Development Resources

-This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), which are also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
+This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).

 There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application.

@@ -19,7 +19,7 @@ The [Build Instructions](./docs/build.md) are a good place to get started with t
 The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentralized social media protocol. You don't *need* to understand AT Protocol to work with this application, but it can help. Learn more at:

 - [Overview and Guides](https://atproto.com/guides/overview)
- [GitHub Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
+- [Github Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
 - [Protocol Specifications](https://atproto.com/specs/atp)
 - [Blogpost on self-authenticating data structures](https://bsky.social/about/blog/3-6-2022-a-self-authenticating-social-protocol)

@@ -27,7 +27,6 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th

 ## Contributions

-> [!NOTE]
 > While we do accept contributions, we prioritize high quality issues and pull requests. Adhering to the below guidelines will ensure a more timely review.

 **Rules:**
@@ -60,7 +59,7 @@ Please be sure to:

 ## Security disclosures

-If you discover any security issues, please send an email to security@bsky.app. The email is automatically CC'd to the entire team and we'll respond promptly.
+If you discover any security issues, please send an email to security@bsky.app. The email is automatically CCed to the entire team and we'll respond promptly.

 ## Are you a developer interested in building on atproto?

@@ -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:
@@ -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:
@@ -28,13 +28,7 @@ appId: xyz.blueskyweb.app
 - hideKeyboard
 - tapOn:
    id: "nextBtn"
- tapOn:
-    text: "Not Now"
-    optional: true
 - inputText: "e2e-test"
- extendedWaitUntil:
-    visible:
-        id: "handleAvailableCheck"
 - tapOn:
    id: "nextBtn"
- assertVisible: "Give your profile a face"
+
@@ -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"
@@ -23,7 +23,4 @@ appId: xyz.blueskyweb.app
    id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
- tapOn:
-    text: "Not Now"
-    optional: true
 - assertVisible: "Following"
@@ -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
@@ -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%"
@@ -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%"
@@ -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"
@@ -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"
@@ -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"
+
@@ -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:
@@ -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"
@@ -1,7 +1,7 @@
 import {createServer as createHTTPServer} from 'node:http'
 import {parse} from 'node:url'

-import {createServer, type TestPDS} from '../jest/test-pds'
+import {createServer, TestPDS} from '../jest/test-pds'

 async function main() {
  let server: TestPDS
@@ -181,10 +181,10 @@ async function main() {
            'warn-profile',
            'warn-posts',
            'muted-account',
-            'muted-by-list-acc',
+            'muted-by-list-account',
            'blocking-account',
            'blockedby-account',
-            'mutual-block-acc',
+            'mutual-block-account',
          ]) {
            await server.mocker.createUser(user)
            await server.mocker.follow('alice', user)
@@ -411,16 +411,16 @@ async function main() {
          await server.mocker.addToMuteList(
            'alice',
            list,
-            server.mocker.users['muted-by-list-acc'].did,
+            server.mocker.users['muted-by-list-account'].did,
          )
-          await server.mocker.createPost('muted-by-list-acc', 'muted post')
+          await server.mocker.createPost('muted-by-list-account', 'muted post')
          await server.mocker.createQuotePost(
-            'muted-by-list-acc',
+            'muted-by-list-account',
            'account quote post',
            anchorPost,
          )
          await server.mocker.createReply(
-            'muted-by-list-acc',
+            'muted-by-list-account',
            'account reply',
            anchorPost,
          )
@@ -470,16 +470,16 @@ async function main() {
          )

          await server.mocker.createPost(
-            'mutual-block-acc',
+            'mutual-block-account',
            'mutual-block post',
          )
          await server.mocker.createQuotePost(
-            'mutual-block-acc',
+            'mutual-block-account',
            'mutual-block quote post',
            anchorPost,
          )
          await server.mocker.createReply(
-            'mutual-block-acc',
+            'mutual-block-account',
            'mutual-block reply',
            anchorPost,
          )
@@ -488,15 +488,15 @@ async function main() {
              repo: server.mocker.users.alice.did,
            },
            {
-              subject: server.mocker.users['mutual-block-acc'].did,
+              subject: server.mocker.users['mutual-block-account'].did,
              createdAt: new Date().toISOString(),
            },
          )
          await server.mocker.users[
-            'mutual-block-acc'
+            'mutual-block-account'
          ].agent.app.bsky.graph.block.create(
            {
-              repo: server.mocker.users['mutual-block-acc'].did,
+              repo: server.mocker.users['mutual-block-account'].did,
            },
            {
              subject: server.mocker.users.alice.did,
@@ -509,16 +509,7 @@ async function main() {
        }
      }
      console.log('Ready')
-      return res
-        .writeHead(200, {
-          'content-type': 'application/json',
-        })
-        .end(
-          JSON.stringify({
-            pdsUrl: server.pdsUrl,
-            appviewDid: server.appviewDid,
-          }),
-        )
+      return res.writeHead(200).end(server.pdsUrl)
    } catch (e) {
      console.error('Error!', e)
      return res.writeHead(500).end()
@@ -11,8 +11,3 @@ appId: xyz.blueskyweb.app
 - swipe:
   from: "Bluesky"
   direction: DOWN
- tapOn:
-   id: e2eProxyHeaderInput
- inputText: ${output.result}
- pressKey: Enter
- hideKeyboard
@@ -1,8 +1,5 @@
-// eslint-disable-next-line no-undef
-var res = http.post('http://localhost:1986/' + SERVER_PATH, {
+// eslint-disable-next-line
+http.post('http://localhost:1986/' + SERVER_PATH, {
  headers: {'Content-Type': 'text/plain'},
  body: '',
 })
-
-// eslint-disable-next-line no-undef
-output.result = json(res.body).appviewDid
@@ -1,8 +1,7 @@
-import React, {type ReactNode} from 'react'
-import {FlatList, Modal, ScrollView, TextInput, View} from 'react-native'
+import React, {ReactNode} from 'react'
+import {View, ScrollView, Modal, FlatList, TextInput} from 'react-native'

 const BottomSheetModalContext = React.createContext(null)
-BottomSheetModalContext.displayName = 'BottomSheetModalContext'

 const BottomSheetModalProvider = (props: any) => {
  return <BottomSheetModalContext.Provider {...props} value={{}} />
@@ -48,13 +47,13 @@ export {useBottomSheetInternal}
 export {useBottomSheetDynamicSnapPoints}

 export {
+  BottomSheetModalProvider,
  BottomSheetBackdrop,
-  BottomSheetFlatList,
-  BottomSheetFooter,
  BottomSheetHandle,
  BottomSheetModal,
-  BottomSheetModalProvider,
+  BottomSheetFooter,
  BottomSheetScrollView,
+  BottomSheetFlatList,
  BottomSheetTextInput,
 }

@@ -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 {
@@ -1,4 +1,4 @@
-import {type IsValidHandle, validateServiceHandle} from '#/lib/strings/handles'
+import {IsValidHandle, validateServiceHandle} from '#/lib/strings/handles'

 describe('handle validation', () => {
  const valid = [
@@ -18,17 +18,17 @@ describe('handle validation', () => {
  })

  const invalid = [
-    ['al', 'bsky.social', 'frontLengthNotTooShort'],
+    ['al', 'bsky.social', 'frontLength'],
    ['-alice', 'bsky.social', 'hyphenStartOrEnd'],
    ['alice-', 'bsky.social', 'hyphenStartOrEnd'],
    ['%%%', 'bsky.social', 'handleChars'],
-    ['1234567890123456789', 'bsky.social', 'frontLengthNotTooLong'],
+    ['1234567890123456789', 'bsky.social', 'frontLength'],
    [
      '1234567890123456789',
      'my-custom-pds-with-long-name.social',
-      'frontLengthNotTooLong',
+      'frontLength',
    ],
-    ['al', 'my-custom-pds-with-long-name.social', 'frontLengthNotTooShort'],
+    ['al', 'my-custom-pds-with-long-name.social', 'frontLength'],
    ['a'.repeat(300), 'toolong.com', 'totalLength'],
  ] satisfies [string, string, keyof IsValidHandle][]
  it.each(invalid)(
@@ -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,
            },
          },
        ],
@@ -235,9 +234,8 @@ module.exports = function (_config) {
        ],
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
        './plugins/withGradleJVMHeapSizeIncrease.js',
-        './plugins/withAndroidManifestLargeHeapPlugin.js',
+        './plugins/withAndroidManifestPlugin.js',
        './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidManifestIntentQueriesPlugin.js',
        './plugins/withAndroidStylesAccentColorPlugin.js',
        './plugins/withAndroidDayNightThemePlugin.js',
        './plugins/withAndroidNoJitpackPlugin.js',
@@ -252,12 +250,10 @@ module.exports = function (_config) {
              // Android only
              './assets/fonts/inter/Inter-Regular.otf',
              './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
              './assets/fonts/inter/Inter-SemiBold.otf',
              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
+              './assets/fonts/inter/Inter-ExtraBold.otf',
+              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
            ],
          },
        ],
@@ -304,11 +300,6 @@ module.exports = function (_config) {
              android: './assets/app-icons/android_icon_default_dark.png',
              prerendered: true,
            },
-            next: {
-              ios: './assets/app-icons/icon_default_next.png',
-              android: './assets/app-icons/icon_default_next.png',
-              prerendered: true,
-            },

            /**
             * Bluesky+ core set
@@ -361,7 +352,6 @@ module.exports = function (_config) {
          },
        ],
        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
-        ['expo-location'],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M15.793 10.293a1 1 0 0 1 1.338-.068l.076.068 3.293 3.293a2 2 0 0 1 .138 2.677l-.138.151-3.293 3.293a1 1 0 1 1-1.414-1.414L18.086 16H8a5 5 0 0 1-5-5V5a1 1 0 0 1 2 0v6a3 3 0 0 0 3 3h10.086l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></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>
@@ -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>
@@ -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>
@@ -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 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Z" clip-rule="evenodd"/></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>
@@ -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>
@@ -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>
@@ -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>
@@ -6,25 +6,24 @@
    "dev": "vite",
    "build": "tsc && vite build",
    "build-snippet": "tsc --project tsconfig.snippet.json",
-    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
-    "typecheck": "tsc --noEmit"
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src"
  },
  "dependencies": {
-    "@atproto/api": "^0.15.25",
-    "preact": "^10.4.8"
+    "@atproto/api": "0.13.6",
+    "@preact/preset-vite": "^2.8.2",
+    "@vitejs/plugin-legacy": "^5.3.2",
+    "preact": "^10.4.8",
+    "terser": "^5.30.3"
  },
  "devDependencies": {
-    "@preact/preset-vite": "^2.10.2",
-    "@vitejs/plugin-legacy": "^7.0.0",
    "autoprefixer": "^10.4.19",
    "eslint": "^8.19.0",
    "eslint-config-preact": "^1.3.0",
    "eslint-plugin-simple-import-sort": "^12.0.0",
    "postcss": "^8.4.38",
    "tailwindcss": "^3.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "vite": "^7.0.4",
-    "vite-tsconfig-paths": "^5.1.4"
+    "typescript": "^5.5.4",
+    "vite": "^5.2.8",
+    "vite-tsconfig-paths": "^4.3.2"
  }
 }
@@ -49,7 +49,7 @@ export function Container({
        }
      }}>
      {href && <Link href={href} />}
-      <div className="flex-1 px-4 pt-3 pb-2.5 max-w-full">{children}</div>
+      <div className="flex-1 px-4 pt-3 pb-2.5">{children}</div>
    </div>
  )
 }
@@ -17,11 +17,8 @@ import infoIcon from '../../assets/circleInfo_stroke2_corner0_rounded.svg'
 import playIcon from '../../assets/play_filled_corner2_rounded.svg'
 import starterPackIcon from '../../assets/starterPack.svg'
 import {CONTENT_LABELS, labelsToInfo} from '../labels'
-import * as bsky from '../types/bsky'
-import {getRkey} from '../util/rkey'
-import {getVerificationState} from '../util/verification-state'
+import {getRkey} from '../utils'
 import {Link} from './link'
-import {VerificationCheck} from './verification-check'

 export function Embed({
  content,
@@ -78,35 +75,23 @@ export function Embed({
          CONTENT_LABELS.includes(label.val),
        )

-        const verification = getVerificationState({profile: record.author})
-
        return (
          <Link
            href={`/profile/${record.author.did}/post/${getRkey(record)}`}
            className="transition-colors hover:bg-neutral-100 dark:hover:bg-slate-700 border dark:border-slate-600 rounded-xl p-2 gap-1.5 w-full flex flex-col">
            <div className="flex gap-1.5 items-center">
-              <div className="w-4 h-4 rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
+              <div className="w-4 h-4 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
                <img
-                  className="rounded-full"
                  src={record.author.avatar}
                  style={isAuthorLabeled ? {filter: 'blur(1.5px)'} : undefined}
                />
              </div>
-              <div className="flex flex-1 items-center shrink min-w-0 min-h-0">
-                <p className="block text-sm shrink-0 font-bold max-w-[70%] line-clamp-1">
-                  {record.author.displayName?.trim() || record.author.handle}
-                </p>
-                {verification.isVerified && (
-                  <VerificationCheck
-                    className="ml-[3px] mt-px shrink-0 self-center"
-                    verifier={verification.role === 'verifier'}
-                    size={12}
-                  />
-                )}
-                <p className="block line-clamp-1 text-sm text-textLight dark:text-textDimmed shrink-[10] ml-1">
+              <p className="line-clamp-1 text-sm">
+                <span className="font-bold">{record.author.displayName}</span>
+                <span className="text-textLight dark:text-textDimmed ml-1">
                  @{record.author.handle}
-                </p>
-              </div>
+                </span>
+              </p>
            </div>
            {text && <p className="text-sm">{text}</p>}
            {record.embeds?.map(embed => (
@@ -419,12 +404,7 @@ function StarterPackEmbed({
 }: {
  content: AppBskyGraphDefs.StarterPackViewBasic
 }) {
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      content.record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!AppBskyGraphStarterpack.isRecord(content.record)) {
    return null
  }

@@ -463,9 +443,7 @@ function StarterPackEmbed({
 }

 // from #/lib/strings/starter-pack.ts
-function getStarterPackImage(
-  starterPack: AppBskyGraphDefs.StarterPackViewBasic,
-) {
+function getStarterPackImage(starterPack: AppBskyGraphDefs.StarterPackView) {
  const rkey = getRkey({uri: starterPack.uri})
  return `https://ogcard.cdn.bsky.app/start/${starterPack.creator.did}/${rkey}`
 }
@@ -11,15 +11,10 @@ import likeIcon from '../../assets/heart2_filled_stroke2_corner0_rounded.svg'
 import logo from '../../assets/logo.svg'
 import repostIcon from '../../assets/repost_stroke2_corner2_rounded.svg'
 import {CONTENT_LABELS} from '../labels'
-import * as bsky from '../types/bsky'
-import {niceDate} from '../util/nice-date'
-import {prettyNumber} from '../util/pretty-number'
-import {getRkey} from '../util/rkey'
-import {getVerificationState} from '../util/verification-state'
+import {getRkey, niceDate, prettyNumber} from '../utils'
 import {Container} from './container'
 import {Embed} from './embed'
 import {Link} from './link'
-import {VerificationCheck} from './verification-check'

 interface Props {
  thread: AppBskyFeedDefs.ThreadViewPost
@@ -33,25 +28,16 @@ export function Post({thread}: Props) {
  )

  let record: AppBskyFeedPost.Record | null = null
-  if (
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+  if (AppBskyFeedPost.isRecord(post.record)) {
    record = post.record
  }

-  const verification = getVerificationState({profile: post.author})
-
  const href = `/profile/${post.author.did}/post/${getRkey(post)}`
  return (
    <Container href={href}>
      <div className="flex-1 flex-col flex gap-2" lang={record?.langs?.[0]}>
-        <div className="flex gap-2.5 items-center cursor-pointer w-full max-w-full">
-          <Link
-            href={`/profile/${post.author.did}`}
-            className="rounded-full shrink-0">
+        <div className="flex gap-2.5 items-center cursor-pointer">
+          <Link href={`/profile/${post.author.did}`} className="rounded-full">
            <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
              <img
                src={post.author.avatar}
@@ -59,27 +45,19 @@ export function Post({thread}: Props) {
              />
            </div>
          </Link>
-          <div className="flex flex-1 flex-col min-w-0">
-            <div className="flex flex-1 items-center">
-              <Link
-                href={`/profile/${post.author.did}`}
-                className="block font-bold text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 text-ellipsis decoration-2">
-                {post.author.displayName?.trim() || post.author.handle}
-              </Link>
-              {verification.isVerified && (
-                <VerificationCheck
-                  className="pl-[3px] mt-px shrink-0"
-                  verifier={verification.role === 'verifier'}
-                  size={15}
-                />
-              )}
-            </div>
+          <div>
            <Link
              href={`/profile/${post.author.did}`}
-              className="block text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
-              @{post.author.handle}
+              className="font-bold text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 decoration-2">
+              <p>{post.author.displayName}</p>
+            </Link>
+            <Link
+              href={`/profile/${post.author.did}`}
+              className="text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
+              <p>@{post.author.handle}</p>
            </Link>
          </div>
+          <div className="flex-1" />
          <Link
            href={href}
            className="transition-transform hover:scale-110 shrink-0 self-start">
@@ -155,7 +133,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
        <Link
          key={counter}
          href={segment.link.uri}
-          className="text-blue-500 hover:underline"
+          className="text-blue-400 hover:underline"
          disableTracking={
            !segment.link.uri.startsWith('https://bsky.app') &&
            !segment.link.uri.startsWith('https://go.bsky.app')
@@ -1,56 +0,0 @@
-import {h} from 'preact'
-
-type IconProps = {
-  size: number
-  className?: string
-}
-
-export function VerificationCheck({
-  verifier,
-  ...rest
-}: {verifier: boolean} & IconProps) {
-  return verifier ? <VerifierCheck {...rest} /> : <VerifiedCheck {...rest} />
-}
-
-export function VerifiedCheck({size, className}: IconProps) {
-  return (
-    <svg
-      fill="none"
-      viewBox="0 0 24 24"
-      width={size}
-      height={size}
-      className={className}>
-      <circle cx="12" cy="12" r="11.5" fill="hsl(211, 99%, 53%)" />
-      <path
-        fill="#fff"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M17.659 8.175a1.361 1.361 0 0 1 0 1.925l-6.224 6.223a1.361 1.361 0 0 1-1.925 0L6.4 13.212a1.361 1.361 0 0 1 1.925-1.925l2.149 2.148 5.26-5.26a1.361 1.361 0 0 1 1.925 0Z"
-      />
-    </svg>
-  )
-}
-
-export function VerifierCheck({size, className}: IconProps) {
-  return (
-    <svg
-      fill="none"
-      viewBox="0 0 24 24"
-      width={size}
-      height={size}
-      className={className}>
-      <path
-        fill="hsl(211, 99%, 53%)"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M8.792 1.615a4.154 4.154 0 0 1 6.416 0 4.154 4.154 0 0 0 3.146 1.515 4.154 4.154 0 0 1 4 5.017 4.154 4.154 0 0 0 .777 3.404 4.154 4.154 0 0 1-1.427 6.255 4.153 4.153 0 0 0-2.177 2.73 4.154 4.154 0 0 1-5.781 2.784 4.154 4.154 0 0 0-3.492 0 4.154 4.154 0 0 1-5.78-2.784 4.154 4.154 0 0 0-2.178-2.73A4.154 4.154 0 0 1 .87 11.551a4.154 4.154 0 0 0 .776-3.404A4.154 4.154 0 0 1 5.646 3.13a4.154 4.154 0 0 0 3.146-1.515Z"
-      />
-      <path
-        fill="#fff"
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M17.861 8.26a1.438 1.438 0 0 1 0 2.033l-6.571 6.571a1.437 1.437 0 0 1-2.033 0L5.97 13.58a1.438 1.438 0 0 1 2.033-2.033l2.27 2.269 5.554-5.555a1.437 1.437 0 0 1 2.033 0Z"
-      />
-    </svg>
-  )
-}
@@ -14,11 +14,9 @@ import {
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
-import * as bsky from '../types/bsky'
-import {niceDate} from '../util/nice-date'
+import {niceDate} from '../utils'

-const DEFAULT_POST =
-  'https://bsky.app/profile/did:plc:vjug55kidv6sye7ykr5faxxn/post/3jzn6g7ixgq2y'
+const DEFAULT_POST = 'https://bsky.app/profile/emilyliu.me/post/3jzn6g7ixgq2y'
 const DEFAULT_URI =
  'at://did:plc:vjug55kidv6sye7ykr5faxxn/app.bsky.feed.post/3jzn6g7ixgq2y'

@@ -224,12 +222,7 @@ function Snippet({
  const snippet = useMemo(() => {
    const record = thread.post.record

-    if (
-      !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        record,
-        AppBskyFeedPost.isRecord,
-      )
-    ) {
+    if (!AppBskyFeedPost.isRecord(record)) {
      return ''
    }

@@ -8,7 +8,7 @@ import {applyTheme, initSystemColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
-import {getRkey} from '../util/rkey'
+import {getRkey} from '../utils'

 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')
@@ -1,49 +0,0 @@
-import {ValidationResult} from '@atproto/lexicon'
-
-export * as profile from './profile'
-
-/**
- * Fast type checking without full schema validation, for use with data we
- * trust, or for non-critical path use cases. Why? Our SDK's `is*` identity
- * utils do not assert the type of the entire object, only the `$type` string.
- *
- * For full validation of the object schema, use the `validate` export from
- * this file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.dangerousIsType<AppBskyFeedPost.Record>(item, AppBskyFeedPost.isRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function dangerousIsType<R extends {$type?: string}>(
-  record: unknown,
-  identity: <V>(v: V) => v is V & {$type: NonNullable<R['$type']>},
-): record is R {
-  return identity(record)
-}
-
-/**
- * Fully validates the object schema, which has a performance cost.
- *
- * For faster checks with data we trust, like that from our app view, use the
- * `dangerousIsType` export from this same file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.validate(item, AppBskyFeedPost.validateRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function validate<R extends {$type?: string}>(
-  record: unknown,
-  validator: (v: unknown) => ValidationResult<R>,
-): record is R {
-  return validator(record).success
-}
@@ -1,10 +0,0 @@
-import {type AppBskyActorDefs, type ChatBskyActorDefs} from '@atproto/api'
-
-/**
- * Matches any profile view exported by our SDK
- */
-export type AnyProfileView =
-  | AppBskyActorDefs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileView
-  | AppBskyActorDefs.ProfileViewDetailed
-  | ChatBskyActorDefs.ProfileViewBasic
@@ -1,11 +0,0 @@
-export function niceDate(date: number | string | Date) {
-  const d = new Date(date)
-  return `${d.toLocaleDateString('en-us', {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-  })} at ${d.toLocaleTimeString(undefined, {
-    hour: 'numeric',
-    minute: '2-digit',
-  })}`
-}
@@ -1,152 +0,0 @@
-/**
- * This file is a copy of what exists in the social-app
- */
-
-import {
-  AppBskyEmbedExternal,
-  AppBskyEmbedImages,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  AppBskyEmbedVideo,
-  AppBskyFeedDefs,
-  AppBskyGraphDefs,
-  AppBskyLabelerDefs,
-} from '@atproto/api'
-
-export type Embed =
-  | {
-      type: 'post'
-      view: AppBskyEmbedRecord.ViewRecord
-    }
-  | {
-      type: 'post_not_found'
-      view: AppBskyEmbedRecord.ViewNotFound
-    }
-  | {
-      type: 'post_blocked'
-      view: AppBskyEmbedRecord.ViewBlocked
-    }
-  | {
-      type: 'post_detached'
-      view: AppBskyEmbedRecord.ViewDetached
-    }
-  | {
-      type: 'feed'
-      view: AppBskyFeedDefs.GeneratorView
-    }
-  | {
-      type: 'list'
-      view: AppBskyGraphDefs.ListView
-    }
-  | {
-      type: 'labeler'
-      view: AppBskyLabelerDefs.LabelerView
-    }
-  | {
-      type: 'starter_pack'
-      view: AppBskyGraphDefs.StarterPackViewBasic
-    }
-  | {
-      type: 'images'
-      view: AppBskyEmbedImages.View
-    }
-  | {
-      type: 'link'
-      view: AppBskyEmbedExternal.View
-    }
-  | {
-      type: 'video'
-      view: AppBskyEmbedVideo.View
-    }
-  | {
-      type: 'post_with_media'
-      view: Embed
-      media: Embed
-    }
-  | {
-      type: 'unknown'
-      view: null
-    }
-
-export type EmbedType<T extends Embed['type']> = Extract<Embed, {type: T}>
-
-export function parseEmbedRecordView({record}: AppBskyEmbedRecord.View): Embed {
-  if (AppBskyEmbedRecord.isViewRecord(record)) {
-    return {
-      type: 'post',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewNotFound(record)) {
-    return {
-      type: 'post_not_found',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewBlocked(record)) {
-    return {
-      type: 'post_blocked',
-      view: record,
-    }
-  } else if (AppBskyEmbedRecord.isViewDetached(record)) {
-    return {
-      type: 'post_detached',
-      view: record,
-    }
-  } else if (AppBskyFeedDefs.isGeneratorView(record)) {
-    return {
-      type: 'feed',
-      view: record,
-    }
-  } else if (AppBskyGraphDefs.isListView(record)) {
-    return {
-      type: 'list',
-      view: record,
-    }
-  } else if (AppBskyLabelerDefs.isLabelerView(record)) {
-    return {
-      type: 'labeler',
-      view: record,
-    }
-  } else if (AppBskyGraphDefs.isStarterPackViewBasic(record)) {
-    return {
-      type: 'starter_pack',
-      view: record,
-    }
-  } else {
-    return {
-      type: 'unknown',
-      view: null,
-    }
-  }
-}
-
-export function parseEmbed(embed: AppBskyFeedDefs.PostView['embed']): Embed {
-  if (AppBskyEmbedImages.isView(embed)) {
-    return {
-      type: 'images',
-      view: embed,
-    }
-  } else if (AppBskyEmbedExternal.isView(embed)) {
-    return {
-      type: 'link',
-      view: embed,
-    }
-  } else if (AppBskyEmbedVideo.isView(embed)) {
-    return {
-      type: 'video',
-      view: embed,
-    }
-  } else if (AppBskyEmbedRecord.isView(embed)) {
-    return parseEmbedRecordView(embed)
-  } else if (AppBskyEmbedRecordWithMedia.isView(embed)) {
-    return {
-      type: 'post_with_media',
-      view: parseEmbedRecordView(embed.record),
-      media: parseEmbed(embed.media),
-    }
-  } else {
-    return {
-      type: 'unknown',
-      view: null,
-    }
-  }
-}
@@ -1,9 +0,0 @@
-const formatter = new Intl.NumberFormat('en-US', {
-  notation: 'compact',
-  maximumFractionDigits: 1,
-  roundingMode: 'trunc',
-})
-
-export function prettyNumber(number: number) {
-  return formatter.format(number)
-}
@@ -1,6 +0,0 @@
-import {AtUri} from '@atproto/api'
-
-export function getRkey({uri}: {uri: string}): string {
-  const at = new AtUri(uri)
-  return at.rkey
-}
@@ -1,31 +0,0 @@
-import * as bsky from '../types/bsky'
-
-export type VerificationState = {
-  role: 'default' | 'verifier'
-  isVerified: boolean
-}
-
-export function getVerificationState({
-  profile,
-}: {
-  profile?: bsky.profile.AnyProfileView
-}): VerificationState {
-  if (!profile || !profile.verification) {
-    return {
-      role: 'default',
-      isVerified: false,
-    }
-  }
-
-  const {verifiedStatus, trustedVerifierStatus} = profile.verification
-  const isVerifiedUser = ['valid', 'invalid'].includes(verifiedStatus)
-  const isVerifierUser = ['valid', 'invalid'].includes(trustedVerifierStatus)
-  const isVerified =
-    (isVerifiedUser && verifiedStatus === 'valid') ||
-    (isVerifierUser && trustedVerifierStatus === 'valid')
-
-  return {
-    role: isVerifierUser ? 'verifier' : 'default',
-    isVerified,
-  }
-}
@@ -0,0 +1,28 @@
+import {AtUri} from '@atproto/api'
+
+export function niceDate(date: number | string | Date) {
+  const d = new Date(date)
+  return `${d.toLocaleDateString('en-us', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })} at ${d.toLocaleTimeString(undefined, {
+    hour: 'numeric',
+    minute: '2-digit',
+  })}`
+}
+
+export function getRkey({uri}: {uri: string}): string {
+  const at = new AtUri(uri)
+  return at.rkey
+}
+
+const formatter = new Intl.NumberFormat('en-US', {
+  notation: 'compact',
+  maximumFractionDigits: 1,
+  roundingMode: 'trunc',
+})
+
+export function prettyNumber(number: number) {
+  return formatter.format(number)
+}
@@ -10,7 +10,7 @@
    "strict": true,
    "forceConsistentCasingInFileNames": true,
    "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "Node",
    "resolveJsonModule": true,
    "isolatedModules": true,
    "noEmit": true,
@@ -19,5 +19,5 @@
    "jsxFragmentFactory": "Fragment",
    "downlevelIteration": true
  },
-  "include": ["src", "snippet", "vite.config.ts", "*.config.cjs", ".eslintrc.cjs"]
+  "include": ["src", "snippet", "vite.config.ts"]
 }
@@ -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"
-}
@@ -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"
-}
@@ -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"
-}
@@ -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"
  }
 }
@@ -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()
@@ -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',
-}
@@ -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')
-    }
-  }
-}
@@ -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,
@@ -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>) {
@@ -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({
@@ -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()
-}
@@ -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()
-}
@@ -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,
 }
@@ -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>
@@ -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>
-  `
-}
@@ -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>
-  `
-}
@@ -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>
-  `
-}
@@ -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
@@ -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)
@@ -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')
@@ -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('/')
  )
 }
@@ -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>`,
+      )
    }),
  )
 }
@@ -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"/)
-  })
-})
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M15.793 10.293a1 1 0 0 1 1.338-.068l.076.068 3.293 3.293a2 2 0 0 1 .138 2.677l-.138.151-3.293 3.293a1 1 0 1 1-1.414-1.414L18.086 16H8a5 5 0 0 1-5-5V5a1 1 0 0 1 2 0v6a3 3 0 0 0 3 3h10.086l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></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>