Debug

Clean up env
2025-02-12 16:43:07 -06:00 · 2025-02-12 16:43:00 -06:00
812 changed files with 126483 additions and 230627 deletions
@@ -1,8 +1,23 @@
-# Copy this to `.env` and `.env.test` files
-
-BITDRIFT_API_KEY=
-SENTRY_AUTH_TOKEN=
-EXPO_PUBLIC_LOG_LEVEL=debug
-EXPO_PUBLIC_LOG_DEBUG=
+# The env the app is running in e.g. development, testflight, production
+EXPO_PUBLIC_ENV=development
+# This is the commit hash that the current bundle was made from. The user can
+# see the commit hash in the app's settings along with the other version info.
+# Useful for debugging/reporting.
 EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+# This will always be in the format of YYMMDD, so that it always increases for
+# each build. This should only be used for Statsig reporting and shouldn't be
+# used to identify a specific bundle.
 EXPO_PUBLIC_BUNDLE_DATE=0
+# The log level for the app's logger transports
+EXPO_PUBLIC_LOG_LEVEL=info
+# Currently unused. Enable debug for a subset of the debug logs.
+EXPO_PUBLIC_LOG_DEBUG=
+
+#
+# Bluesky specific
+#
+
+# Bitdrift
+BITDRIFT_API_KEY=
+# Sentry
+SENTRY_AUTH_TOKEN=
@@ -15,7 +15,6 @@ module.exports = {
    'simple-import-sort',
    'bsky-internal',
    'eslint-plugin-react-compiler',
-    'import',
  ],
  rules: {
    'react/no-unescaped-entities': 0,
@@ -33,8 +32,6 @@ module.exports = {
          'H6',
          'P',
          'Admonition',
-          'Admonition.Admonition',
-          'Span',
        ],
        impliedTextProps: [],
        suggestedTextWrappers: {
@@ -83,16 +80,20 @@ module.exports = {
    ],
    'simple-import-sort/exports': 'error',
    'react-compiler/react-compiler': 'warn',
-    'no-unused-vars': 'off',
-    '@typescript-eslint/no-unused-vars': [
+    'no-restricted-imports': [
      'error',
-      {argsIgnorePattern: '^_', varsIgnorePattern: '^_'},
+      {
+        paths: [
+          {
+            name: '@atproto/api',
+            importNames: ['moderatePost'],
+            message:
+              'Please use `moderatePost_wrapped` from `#/lib/moderatePost_wrapped` instead.',
+          },
+        ],
+      },
    ],
-    '@typescript-eslint/consistent-type-imports': [
-      'warn',
-      {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
-    ],
-    'import/consistent-type-specifier-style': ['warn', 'prefer-inline'],
+    '@typescript-eslint/ban-ts-comment': 'warn',
  },
  ignorePatterns: [
    '**/__mocks__/*.ts',
@@ -104,9 +105,9 @@ module.exports = {
    '*.lock',
    '.husky',
    'patches',
+    'bskyweb',
    '*.html',
    'bskyweb',
-    'bskyembed',
    'src/locale/locales/_build/',
    'src/locale/locales/**/*.js',
  ],
@@ -45,10 +45,7 @@ jobs:

      - name: Set outputs
        id: vars
-        run: |
-          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
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

      - name: Build and push Docker image
        id: build-and-push
@@ -63,7 +60,3 @@ jobs:
          cache-to: type=gha,mode=max
          build-args: |
            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 }}
@@ -56,10 +56,7 @@ jobs:
        run: yarn install

      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
-
-      - 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
+        run: yarn intl:build

      - name: ✏️ Write environment variables
        run: |
@@ -70,14 +67,8 @@ jobs:
          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_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
+        run: 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' }}
@@ -139,7 +130,7 @@ jobs:

      - name: 🏗️ Build Production APK
        if: ${{ inputs.profile == 'production' }}
-        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
+        run: 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
@@ -14,7 +14,7 @@ on:
 jobs:
  build:
    name: Build and Submit iOS
-    runs-on: macos-15
+    runs-on: macos-14
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -52,7 +52,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: '16.2'
+          xcode-version: '15.3'

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -69,10 +69,7 @@ jobs:
          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}

      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
-
-      - 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
+        run: yarn intl:build

      - name: ✏️ Write environment variables
        run: |
@@ -82,14 +79,8 @@ jobs:
          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_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
+        run: 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
@@ -75,11 +75,8 @@ jobs:
      - name: Prettier check
        run: yarn prettier --check .

-      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
-
-      - 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
+      - name: Check & compile i18n
+        run: yarn intl:build

      - name: Type check
        run: yarn typecheck
@@ -110,15 +107,9 @@ jobs:
          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_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
+        run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export

      - name: 📦 Package Bundle and 🚀 Deploy
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -143,7 +134,7 @@ jobs:
  # GitHub actions are horrible so let's just copy paste this in
  buildIfNecessaryIOS:
    name: Build and Submit iOS
-    runs-on: macos-15
+    runs-on: macos-14
    concurrency:
      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
      cancel-in-progress: true
@@ -185,7 +176,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: '16.2'
+          xcode-version: '15.3'

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -36,14 +36,3 @@ jobs:
        with:
          commit_message: Nightly source-language update
          file_pattern: ./src/locale/locales/en/messages.po
-      - name: Push source lang to Crowdin
-        uses: crowdin/github-action@v2
-        with:
-          upload_sources: true
-          upload_sources_args: "-b main"
-          upload_translations: false
-          push_translations: false
-          push_sources: false
-          create_pull_request: false
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"

-npx lint-staged --concurrent false
+npx lint-staged
@@ -4,47 +4,21 @@ WORKDIR /usr/src/social-app

 ENV DEBIAN_FRONTEND=noninteractive

-#
 # Node
-#
 ENV NODE_VERSION=20
 ENV NVM_DIR=/usr/share/nvm

-#
 # Go
-#
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
 ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"

-#
 # Expo
-#
 ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
 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}
-# 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
-#
 COPY . .

 #
@@ -64,9 +38,8 @@ RUN \. "$NVM_DIR/nvm.sh" && \
  echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .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 && \
-  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
+  yarn intl:build && \
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web

 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
@@ -1,4 +1,4 @@
-Copyright 2023–2025 Bluesky Social PBC
+Copyright 2023–2025 Bluesky PBC

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -37,6 +37,6 @@ deps: ## Installs dependent libs using 'yarn install'

 .PHONY: nvm-setup
 nvm-setup: ## Use NVM to install and activate node+yarn
-	nvm install 20
-	nvm use 20
+	nvm install 18
+	nvm use 18
 	npm install --global yarn
@@ -42,7 +42,7 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th
 - Open an issue and give some time for discussion before submitting a PR.
 - Stay away from PRs like...
  - Changing "Post" to "Skeet."
-  - Refactoring the codebase, e.g., to replace React Query with Redux Toolkit or something.
+  - Refactoring the codebase, e.g., to replace MobX with Redux or something.
  - Adding entirely new features without prior discussion. 

 Remember, we serve a wide community of users. Our day-to-day involves us constantly asking "which top priority is our top priority." If you submit well-written PRs that solve problems concisely, that's an awesome contribution. Otherwise, as much as we'd love to accept your ideas and contributions, we really don't have the bandwidth. That's what forking is for!
@@ -1,2 +1,2 @@
 flows:
-  - "flows/**"
+  - "flows/*"
@@ -18,6 +18,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "openGalleryBtn"
 - tapOn: "Content warnings"
+- tapOn: "Content warnings"
 - tapOn: "Porn"
 - tapOn:
    label: "Tap on confirm"
@@ -24,11 +24,12 @@ appId: xyz.blueskyweb.app
 - inputText: "example@test.com"
 - tapOn:
    id: "passwordInput"
- inputText: "hunter22"
- hideKeyboard
+- inputText: "hunter2"
+- pressKey: Enter
 - tapOn:
    id: "nextBtn"
- tapOn: "Not now"
+- tapOn:
+     id: "handleInput"
 - inputText: "e2e-test"
 - tapOn:
    id: "nextBtn"
@@ -98,13 +98,20 @@ appId: xyz.blueskyweb.app
 - tapOn: "People"

 - tapOn: "Start adding people"
- tapOn: "Search"
+- assertVisible:
+    id: "listAddUserModal"
+- tapOn:
+    id: "searchInput"
 - inputText: "b"
 - pressKey: Enter
- tapOn: "Add user to list"
- swipe:
-    direction: DOWN
- assertVisible: "View Bob's profile"
+- tapOn:
+    id: "user-bob.test-addBtn"
+- tapOn:
+    id: "doneBtn"
+- assertNotVisible:
+    id: "listAddUserModal"
+- assertVisible:
+    id: "user-bob.test"

 - tapOn: "Posts"
 - assertVisible:
@@ -135,18 +142,25 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoLists"
 - tapOn: "Good Ppl"

-# - tapOn: "People"
- assertVisible: "View Bob's profile"
+- tapOn: "People"
+- assertVisible:
+    label: "Removes users on curatelists from the list"
+    id: "user-bob.test"
 - tapOn:
    point: "90%,43%"
+- assertVisible:
+    id: "userAddRemoveListsModal"
 - tapOn:
    id: "user-bob.test-addBtn"
 - tapOn:
    id: "doneBtn"
+- assertNotVisible:
+    id: "userAddRemoveListsModal"

 - tapOn:
+    label: "Adds and removes users on curatelists from the profile"
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users, or feeds"
+- tapOn: "Search"
 - inputText: "bob"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -16,7 +16,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "profileCardButton"
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
@@ -23,5 +23,4 @@ appId: xyz.blueskyweb.app
    id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
- tapOn: "Not now"
 - assertVisible: "Following"
@@ -12,11 +12,10 @@ appId: xyz.blueskyweb.app
    id: "e2eStartOnboarding"
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
- assertVisible: "Search your library…"
 - tapOn:
    point: "50%,22%"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn: "Continue to next step"
 - assertVisible: "What are your interests?"
@@ -1,20 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../setupServer.js
-    env:
-        SERVER_PATH: "?users&follows&posts"
- runFlow:
-    file: ../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn: "Create report for Misleading Post"
- tapOn: "Send report to Dev-env Moderation"
- tapOn:
-    point: "50%,90%"
@@ -78,13 +78,13 @@ appId: xyz.blueskyweb.app
    id: "changeBannerBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
    id: "changeAvatarBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
    id: "editProfileSaveBtn"
@@ -15,7 +15,7 @@ appId: xyz.blueskyweb.app
        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users, or feeds"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -1,24 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn: "Carla's avatar"
- tapOn:
-    id: "profileHeaderDropdownBtn"
- tapOn:
-    id: "profileHeaderDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,24 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,35 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonOther"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
-# reason "other" defaults with details open
- assertVisible:
-    id: "report:details"
- tapOn:
-    id: "report:clearOption"
- assertNotVisible:
-    id: "report:details"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,30 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonOther"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
-# reason "other" defaults with details open
- assertVisible:
-    id: "report:details"
- tapOn:
-    id: "report:details"
- inputText: "This is a test report"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -12,8 +12,8 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile via autocomplete
 - tapOn:
    id: "bottomBarSearchBtn"
- assertVisible: "Search for posts, users, or feeds"
- tapOn: "Search for posts, users, or feeds"
+- assertVisible: "Search"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -1,3 +0,0 @@
-export const CID = jest.fn().mockImplementation(() => {
-  return {}
-})
@@ -1,7 +0,0 @@
-export const from = jest.fn().mockImplementation(() => {
-  return {
-    digest: jest.fn().mockImplementation(() => {
-      return Promise.resolve('')
-    }),
-  }
-})
@@ -0,0 +1,9 @@
+export const openPicker = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCamera = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCropper = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
@@ -1,9 +1,10 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system'
+import {deleteAsync} from 'expo-file-system'
 import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
+import RNFetchBlob from 'rn-fetch-blob'

 import {
  downloadAndResize,
-  type DownloadAndResizeOpts,
+  DownloadAndResizeOpts,
  getResizedDimensions,
 } from '../../src/lib/media/manip'

@@ -31,12 +32,11 @@ describe('downloadAndResize', () => {
  })

  it('should return resized image for valid URI and options', async () => {
-    const mockedFetch = createDownloadResumable as jest.Mock
-    mockedFetch.mockReturnValue({
-      cancelAsync: jest.fn(),
-      downloadAsync: jest
-        .fn()
-        .mockResolvedValue({uri: 'file://resized-image.jpg'}),
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image.jpg'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
    })

    const opts: DownloadAndResizeOpts = {
@@ -50,12 +50,13 @@ describe('downloadAndResize', () => {

    const result = await downloadAndResize(opts)
    expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
    )

    // First time it gets called is to get dimensions
@@ -85,6 +86,28 @@ describe('downloadAndResize', () => {
    expect(result).toBeUndefined()
  })

+  it('should return undefined for non-200 response', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 400}),
+      flush: jest.fn(),
+    })
+
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
+    }
+
+    const result = await downloadAndResize(opts)
+    expect(errorSpy).not.toHaveBeenCalled()
+    expect(result).toBeUndefined()
+  })
+
  it('should not downsize whenever dimensions are below the max dimensions', () => {
    const initialDimensionsOne = {
      width: 1200,
@@ -1,11 +1,11 @@
 import {RichText} from '@atproto/api'

-import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
+import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
 import {
  createStarterPackGooglePlayUri,
  createStarterPackLinkFromAndroidReferrer,
  parseStarterPackUri,
-} from '#/lib/strings/starter-pack'
+} from 'lib/strings/starter-pack'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
 import {enforceLen} from '../../src/lib/strings/helpers'
@@ -1,6 +1,8 @@
 const pkg = require('./package.json')

-module.exports = function (_config) {
+const DARK_SPLASH_ANDROID_BACKGROUND = '#0f141b'
+
+module.exports = function (config) {
  /**
   * App version number. Should be incremented as part of a release cycle.
   */
@@ -34,6 +36,9 @@ module.exports = function (_config) {
  const UPDATES_ENABLED = !!UPDATES_CHANNEL

  const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
+  const SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
+    IS_DEV ? 'dev' : ''
+  }`

  return {
    expo: {
@@ -70,18 +75,14 @@ module.exports = function (_config) {
            'an',
            'ast',
            'ca',
-            'cy',
            'da',
            'de',
            'el',
-            'eo',
            'es',
            'eu',
            'fi',
            'fr',
-            'fy',
            'ga',
-            'gd',
            'gl',
            'hi',
            'hu',
@@ -95,7 +96,6 @@ module.exports = function (_config) {
            'nl',
            'pl',
            'pt-BR',
-            'pt-PT',
            'ro',
            'ru',
            'sv',
@@ -140,10 +140,12 @@ module.exports = function (_config) {
      },
      androidStatusBar: {
        barStyle: 'light-content',
+        backgroundColor: '#00000000',
      },
      // Dark nav bar in light mode is better than light nav bar in dark mode
      androidNavigationBar: {
        barStyle: 'light-content',
+        backgroundColor: DARK_SPLASH_ANDROID_BACKGROUND,
      },
      android: {
        icon: './assets/app-icons/android_icon_default_light.png',
@@ -195,17 +197,13 @@ module.exports = function (_config) {
      plugins: [
        'expo-video',
        'expo-localization',
-        'expo-web-browser',
-        [
-          'react-native-edge-to-edge',
-          {android: {enforceNavigationBarContrast: false}},
-        ],
        USE_SENTRY && [
          '@sentry/react-native/expo',
          {
            organization: 'blueskyweb',
-            project: 'app',
-            url: 'https://sentry.io',
+            project: 'react-native',
+            release: VERSION,
+            dist: SENTRY_DIST,
          },
        ],
        [
@@ -219,7 +217,7 @@ module.exports = function (_config) {
              compileSdkVersion: 35,
              targetSdkVersion: 35,
              buildToolsVersion: '35.0.0',
-              newArchEnabled: true,
+              newArchEnabled: false,
            },
          },
        ],
@@ -239,14 +237,14 @@ module.exports = function (_config) {
          },
        ],
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
-        './plugins/withGradleJVMHeapSizeIncrease.js',
        './plugins/withAndroidManifestPlugin.js',
        './plugins/withAndroidManifestFCMIconPlugin.js',
        './plugins/withAndroidStylesAccentColorPlugin.js',
-        './plugins/withAndroidDayNightThemePlugin.js',
+        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
        './plugins/withAndroidNoJitpackPlugin.js',
        './plugins/shareExtension/withShareExtensions.js',
        './plugins/notificationsExtension/withNotificationsExtension.js',
+        './plugins/withAppDelegateReferrer.js',
        [
          'expo-font',
          {
@@ -358,6 +356,16 @@ module.exports = function (_config) {
          },
        ],
        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
+        [
+          'react-native-vision-camera',
+          {
+            enableLocation: false,
+            cameraPermissionText: 'Bluesky needs access to your camera.',
+            enableMicrophonePermission: true,
+            microphonePermissionText:
+              'Bluesky needs access to your microphone.',
+          },
+        ],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -394,6 +402,22 @@ module.exports = function (_config) {
          projectId: '55bd077a-d905-4184-9c7f-94789ba0f302',
        },
      },
+      hooks: {
+        postPublish: [
+          /*
+           * @see https://docs.expo.dev/guides/using-sentry/#app-configuration
+           */
+          {
+            file: './postHooks/uploadSentrySourcemapsPostHook',
+            config: {
+              organization: 'blueskyweb',
+              project: 'react-native',
+              release: VERSION,
+              dist: SENTRY_DIST,
+            },
+          },
+        ],
+      },
    },
  }
 }
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M20 13.75a1 1 0 0 1 1 1V18a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-3.25a1 1 0 1 1 2 0V18a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-3.25a1 1 0 0 1 1-1ZM12 3a1 1 0 0 1 .707.293l4.5 4.5a1 1 0 1 1-1.414 1.414L13 6.414v8.836a1 1 0 1 1-2 0V6.414L8.207 9.207a1 1 0 1 1-1.414-1.414l4.5-4.5A1 1 0 0 1 12 3Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M11.839 4.744c0-1.488 1.724-2.277 2.846-1.364l.107.094 7.66 7.256.128.134c.558.652.558 1.62 0 2.272l-.128.135-7.66 7.255c-1.115 1.057-2.953.267-2.953-1.27v-2.748c-3.503.055-5.417.41-6.592.97-.997.474-1.525 1.122-2.084 2.14l-.243.46c-.558 1.088-2.09.583-2.08-.515l.015-.748c.111-3.68.777-6.5 2.546-8.415 1.83-1.98 4.63-2.771 8.438-2.884V4.744Zm2 3.256c0 .79-.604 1.41-1.341 1.494l-.149.01c-3.9.057-6.147.813-7.48 2.254-.963 1.043-1.562 2.566-1.842 4.79.38-.327.826-.622 1.361-.877 1.656-.788 4.08-1.14 7.938-1.169l.153.007A1.5 1.5 0 0 1 13.839 16v2.675L20.884 12l-7.045-6.676V8Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm-.63 3.225a1 1 0 0 1 1.337.068l3 3 .068.076a1 1 0 0 1-1.406 1.406l-.076-.068L13 10.414V16a1 1 0 1 1-2 0v-5.586l-1.293 1.293a1 1 0 1 1-1.414-1.414l3-3 .076-.068Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M11 20V6.164l-4.293 4.293a1 1 0 1 1-1.414-1.414l5.293-5.293.151-.138a2 2 0 0 1 2.677.138l5.293 5.293.068.076a1 1 0 0 1-1.406 1.406l-.076-.068L13 6.164V20a1 1 0 0 1-2 0Z"/></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="M20.494 2.13a1 1 0 0 1 .375 1.364l-4.658 8.2.263.095c1.52.554 2.737 2.062 2.484 3.864-.336 2.393-1.358 4.12-3.245 6.047a1 1 0 0 1-1.102.222l-9.5-4a1 1 0 0 1-.166-1.754c1.458-.971 2.623-1.923 3.498-3.3 1.057-1.662 3.154-2.854 5.281-2.08l.58.212 4.827-8.494a1 1 0 0 1 1.363-.375ZM13.04 12.669c-.983-.358-2.19.142-2.91 1.273-.737 1.16-1.628 2.054-2.601 2.828l1.708.72a.2.2 0 0 0 .177-.011l2.13-1.218a.2.2 0 0 1 .29.237l-.551 1.653a.2.2 0 0 0 .112.247l3.353 1.413c1.359-1.494 1.994-2.76 2.23-4.435.094-.675-.359-1.405-1.188-1.707l-2.75-1ZM4.407 7.184a.5.5 0 0 1-.224.224l-1.29.645a.5.5 0 0 0 0 .894l1.29.645a.5.5 0 0 1 .224.224l.645 1.29a.5.5 0 0 0 .894 0l.645-1.29a.5.5 0 0 1 .224-.224l1.29-.645a.5.5 0 0 0 0-.894l-1.29-.645a.5.5 0 0 1-.224-.224l-.645-1.29a.5.5 0 0 0-.894 0l-.645 1.29ZM9.559 3.72a.36.36 0 0 0 .16-.16l.46-.921a.357.357 0 0 1 .64 0l.46.921q.054.106.16.16l.921.46a.357.357 0 0 1 0 .64l-.921.46a.36.36 0 0 0-.16.16l-.46.921a.357.357 0 0 1-.64 0l-.46-.921a.36.36 0 0 0-.16-.16l-.921-.46a.357.357 0 0 1 0-.64l.921-.46Z" 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="M18.535 5.465a5.003 5.003 0 0 0-7.076 0l-.005.005-.752.742a1 1 0 1 1-1.404-1.424l.749-.74a7.003 7.003 0 0 1 9.904 9.905l-.002.003-.737.746a1 1 0 1 1-1.424-1.404l.747-.757a5.003 5.003 0 0 0 0-7.076ZM6.202 9.288a1 1 0 0 1 .01 1.414l-.747.757a5.003 5.003 0 1 0 7.076 7.076l.005-.005.752-.742a1 1 0 1 1 1.404 1.424l-.746.737-.003.002a7.003 7.003 0 0 1-9.904-9.904l.74-.75a1 1 0 0 1 1.413-.009Zm8.505.005a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414-1.414l4-4a1 1 0 0 1 1.414 0Z" 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="M11.293 4.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414L12 6.414 8.707 9.707a1 1 0 0 1-1.414-1.414l4-4Zm-4 10a1 1 0 0 1 1.414 0L12 17.586l3.293-3.293a1 1 0 0 1 1.414 1.414l-4 4a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 0-1.414Z" 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 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 12Zm13.633-3.274a1 1 0 0 1 .141 1.407l-4.5 5.5a1 1 0 0 1-1.481.074l-2-2a1 1 0 1 1 1.414-1.414l1.219 1.219 3.8-4.645a1 1 0 0 1 1.407-.141Z" 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 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm0 3a1 1 0 0 1 1 1v3h3l.102.005a1 1 0 0 1 0 1.99L16 13h-3v3a1 1 0 1 1-2 0v-3H8a1 1 0 0 1 0-2h3V8a1 1 0 0 1 1-1Z"/></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 12Zm6.293-3.707a1 1 0 0 1 1.414 0L12 10.586l2.293-2.293a1 1 0 1 1 1.414 1.414L13.414 12l2.293 2.293a1 1 0 0 1-1.414 1.414L12 13.414l-2.293 2.293a1 1 0 0 1-1.414-1.414L10.586 12 8.293 9.707a1 1 0 0 1 0-1.414Z" 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="M11.158 2.879c.584-.835 1.757-1.137 2.673-.507.951.654 2.597 1.92 4.013 3.694S20.5 10.194 20.5 13c0 4.997-3.752 9-8.5 9s-8.5-4.003-8.5-9c0-2.035.874-4.636 2.578-6.712.746-.91 2.034-.855 2.786-.133l2.294-3.276Zm-3.04 15.758C6.538 17.386 5.5 15.37 5.5 13c0-1.511.666-3.616 2.042-5.342.87.797 2.254.653 2.939-.325l2.286-3.265c.871.606 2.299 1.723 3.514 3.246C17.53 8.879 18.5 10.804 18.5 13c0 2.369-1.038 4.386-2.618 5.637q.117-.518.118-1.061c0-2.601-2.038-4.382-2.911-5.04a1.8 1.8 0 0 0-2.177 0C10.038 13.195 8 14.976 8 17.577q0 .543.118 1.061ZM12 14.222c-.825.648-2 1.859-2 3.354C10 19.043 11.016 20 12 20s2-.957 2-2.424c0-1.495-1.175-2.706-2-3.354Z" 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="M2 12a9.97 9.97 0 0 1 2.929-7.07l.076-.068a1 1 0 0 1 1.407 1.406l-.07.076A7.97 7.97 0 0 0 4 12a7.97 7.97 0 0 0 2.078 5.38l.265.277.07.076a1 1 0 0 1-1.408 1.407l-.076-.07-.331-.346A9.97 9.97 0 0 1 2 12Zm18 0a7.97 7.97 0 0 0-2.078-5.379l-.265-.278-.07-.076a1 1 0 0 1 1.408-1.406l.076.068.331.347A9.97 9.97 0 0 1 22 12a9.97 9.97 0 0 1-2.929 7.07 1 1 0 1 1-1.414-1.413A7.97 7.97 0 0 0 20 12ZM6 12c0-1.656.673-3.158 1.758-4.243a1 1 0 0 1 1.414 1.414A4 4 0 0 0 8 12.001a3.98 3.98 0 0 0 1.04 2.689l.132.138.068.077a1 1 0 0 1-1.407 1.406l-.075-.069-.2-.208A5.98 5.98 0 0 1 6 12Zm10 0a3.98 3.98 0 0 0-1.04-2.69l-.132-.139-.068-.075a1 1 0 0 1 1.407-1.407l.075.068.2.208A5.98 5.98 0 0 1 18 12a6 6 0 0 1-1.758 4.243 1 1 0 0 1-1.414-1.415A4 4 0 0 0 16 12Zm-6 0a2 2 0 1 1 4 0 2 2 0 0 1-4 0Z"/></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.325 2.054a1 1 0 0 0-.65 0l-8 2.75A1 1 0 0 0 3 5.75v6.162c0 2.807 1.149 4.83 2.813 6.405 1.572 1.488 3.632 2.6 5.555 3.636l.157.085a1 1 0 0 0 .95 0l.157-.085c1.923-1.037 3.983-2.148 5.556-3.636C19.85 16.742 21 14.719 21 11.912V5.75a1 1 0 0 0-.675-.946l-8-2.75ZM5 11.912V6.464l7-2.407 7 2.407v5.448c0 2.166-.851 3.687-2.188 4.952-1.276 1.209-2.964 2.158-4.812 3.157-1.848-1-3.536-1.948-4.813-3.157C5.851 15.6 5 14.078 5 11.912Zm10.207-1.205a1 1 0 0 0-1.414-1.414L11 12.086l-.793-.793a1 1 0 0 0-1.414 1.414l1.5 1.5a1 1 0 0 0 1.414 0l3.5-3.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" fill-rule="evenodd" d="M12 2a1 1 0 0 1 1 1c0 3.188.669 5.256 1.882 6.536C16.084 10.805 18.01 11.5 21 11.5a1 1 0 1 1 0 2c-2.99 0-4.916.695-6.118 1.964C13.67 16.744 13 18.812 13 22a1 1 0 1 1-2 0c0-3.188-.669-5.256-1.882-6.536C7.916 14.195 5.99 13.5 3 13.5a1 1 0 1 1 0-2c2.99 0 4.916-.695 6.118-1.964C10.33 8.256 11 6.188 11 3a1 1 0 0 1 1-1Zm0 6.734a7.6 7.6 0 0 1-1.43 2.178A7.3 7.3 0 0 1 8.349 12.5a7.3 7.3 0 0 1 2.22 1.588A7.6 7.6 0 0 1 12 16.267a7.6 7.6 0 0 1 1.43-2.179 7.3 7.3 0 0 1 2.221-1.588 7.3 7.3 0 0 1-2.22-1.588A7.6 7.6 0 0 1 12 8.734Z" 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="M6 2a2.998 2.998 0 0 1 1 5.825V8a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-2-.537V16a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-4-4V7.825A2.998 2.998 0 0 1 6 2Zm7 16a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5Zm0-8a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5ZM6 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></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="M15 7a1 1 0 0 1 1-1h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V9.414L14.414 15a2 2 0 0 1-2.828 0L9 12.414l-5.293 5.293a1 1 0 0 1-1.414-1.414L7.586 11a2 2 0 0 1 2.828 0L13 13.586 18.586 8H16a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle cx="12" cy="12" r="11.5" fill="#1183FE"/><path fill="#fff" fill-rule="evenodd" d="M17.659 8.175a1.36 1.36 0 0 1 0 1.925l-6.224 6.223a1.36 1.36 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.36 1.36 0 0 1 1.925 0Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#1185FE" d="M8.792 1.615a4.154 4.154 0 0 1 6.416 0 4.15 4.15 0 0 0 3.146 1.515 4.154 4.154 0 0 1 4 5.017 4.15 4.15 0 0 0 .777 3.404 4.154 4.154 0 0 1-1.427 6.255 4.15 4.15 0 0 0-2.177 2.73 4.154 4.154 0 0 1-5.781 2.784 4.15 4.15 0 0 0-3.492 0 4.154 4.154 0 0 1-5.78-2.784 4.15 4.15 0 0 0-2.178-2.73A4.154 4.154 0 0 1 .87 11.551a4.15 4.15 0 0 0 .776-3.404 4.154 4.154 0 0 1 4-5.017 4.15 4.15 0 0 0 3.146-1.515Z"/><path fill="#fff" fill-rule="evenodd" d="M17.861 8.26a1.44 1.44 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" clip-rule="evenodd"/></svg>
@@ -17,7 +17,7 @@ module.exports = function (api) {
    ],
    plugins: [
      'macros',
-      ['babel-plugin-react-compiler', {target: '19'}],
+      ['babel-plugin-react-compiler', {target: '18'}],
      [
        'module:react-native-dotenv',
        {
@@ -37,6 +37,10 @@ module.exports = function (api) {
          alias: {
            // This needs to be mirrored in tsconfig.json
            '#': './src',
+            lib: './src/lib',
+            platform: './src/platform',
+            state: './src/state',
+            view: './src/view',
            crypto: './src/platform/crypto.ts',
          },
        },
@@ -0,0 +1,21 @@
+{
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint", "simple-import-sort"],
+  "extends": [
+    "eslint:recommended",
+    "preact",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking"
+  ],
+  "rules": {
+    "simple-import-sort/imports": "warn",
+    "simple-import-sort/exports": "warn",
+    'no-else-return': 'off'
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": "latest",
+    "project": "./bskyembed/tsconfig.json"
+  }
+}
@@ -1,22 +0,0 @@
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'simple-import-sort'],
-  extends: [
-    'eslint:recommended',
-    'preact',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:@typescript-eslint/recommended-requiring-type-checking',
-  ],
-  rules: {
-    'simple-import-sort/imports': 'warn',
-    'simple-import-sort/exports': 'warn',
-    'no-else-return': 'off',
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 'latest',
-    project: ['./tsconfig.json'],
-    tsconfigRootDir: __dirname,
-  },
-}
@@ -68,9 +68,6 @@ function scan(node = document) {
    if (ref_url.startsWith('http')) {
      searchParams.set('ref_url', encodeURIComponent(ref_url))
    }
-    if (embed.dataset.blueskyEmbedColorMode) {
-      searchParams.set('colorMode', embed.dataset.blueskyEmbedColorMode)
-    }

    const iframe = document.createElement('iframe')
    iframe.setAttribute('data-bluesky-id', id)
@@ -1,15 +1,9 @@
-export type ColorModeValues = 'system' | 'light' | 'dark'
-
-export function assertColorModeValues(value: string): value is ColorModeValues {
-  return ['system', 'light', 'dark'].includes(value)
-}
-
 export function applyTheme(theme: 'light' | 'dark') {
  document.documentElement.classList.remove('light', 'dark')
  document.documentElement.classList.add(theme)
 }

-export function initSystemColorMode() {
+export function initColorMode() {
  applyTheme(
    window.matchMedia('(prefers-color-scheme: dark)').matches
      ? 'dark'
@@ -78,7 +78,7 @@ export function Embed({
        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">
+            className="transition-colors hover:bg-neutral-100 dark:hover:bg-slate-700 border dark:border-slate-600 rounded-lg p-2 gap-1.5 w-full flex flex-col">
            <div className="flex gap-1.5 items-center">
              <div className="w-4 h-4 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
                <img
@@ -207,7 +207,7 @@ export function Embed({

 function Info({children}: {children: ComponentChildren}) {
  return (
-    <div className="w-full rounded-xl border py-2 px-2.5 flex-row flex gap-2 bg-neutral-50">
+    <div className="w-full rounded-lg border py-2 px-2.5 flex-row flex gap-2 bg-neutral-50">
      <img src={infoIcon} className="w-4 h-4 shrink-0 mt-0.5" />
      <p className="text-sm text-textLight dark:text-textDimmed">{children}</p>
    </div>
@@ -231,12 +231,12 @@ function ImageEmbed({
        <img
          src={content.images[0].thumb}
          alt={content.images[0].alt}
-          className="w-full rounded-xl overflow-hidden object-cover h-auto max-h-[1000px]"
+          className="w-full rounded-lg overflow-hidden object-cover h-auto max-h-[1000px]"
        />
      )
    case 2:
      return (
-        <div className="flex gap-1 rounded-xl overflow-hidden w-full aspect-[2/1]">
+        <div className="flex gap-1 rounded-lg overflow-hidden w-full aspect-[2/1]">
          {content.images.map((image, i) => (
            <img
              key={i}
@@ -249,21 +249,19 @@ function ImageEmbed({
      )
    case 3:
      return (
-        <div className="flex gap-1 rounded-xl overflow-hidden w-full aspect-[2/1]">
-          <div className="flex-1 aspect-square">
-            <img
-              src={content.images[0].thumb}
-              alt={content.images[0].alt}
-              className="w-full h-full object-cover rounded-sm"
-            />
-          </div>
-          <div className="flex flex-col gap-1 flex-1">
+        <div className="flex gap-1 rounded-lg overflow-hidden w-full aspect-[2/1]">
+          <img
+            src={content.images[0].thumb}
+            alt={content.images[0].alt}
+            className="flex-[3] object-cover rounded-sm"
+          />
+          <div className="flex flex-col gap-1 flex-[2]">
            {content.images.slice(1).map((image, i) => (
              <img
                key={i}
                src={image.thumb}
                alt={image.alt}
-                className="flex-1 object-cover rounded-sm min-h-0"
+                className="w-full h-full object-cover rounded-sm"
              />
            ))}
          </div>
@@ -271,13 +269,13 @@ function ImageEmbed({
      )
    case 4:
      return (
-        <div className="grid grid-cols-2 gap-1 rounded-xl overflow-hidden">
+        <div className="grid grid-cols-2 gap-1 rounded-lg overflow-hidden">
          {content.images.map((image, i) => (
            <img
              key={i}
              src={image.thumb}
              alt={image.alt}
-              className="aspect-[3/2] w-full object-cover rounded-sm"
+              className="aspect-square w-full object-cover rounded-sm"
            />
          ))}
        </div>
@@ -310,7 +308,7 @@ function ExternalEmbed({
  return (
    <Link
      href={content.external.uri}
-      className="w-full rounded-xl overflow-hidden border dark:border-slate-600 flex flex-col items-stretch"
+      className="w-full rounded-lg overflow-hidden border dark:border-slate-600 flex flex-col items-stretch"
      disableTracking>
      {content.external.thumb && (
        <img
@@ -347,7 +345,7 @@ function GenericWithImageEmbed({
  return (
    <Link
      href={href}
-      className="w-full rounded-xl border dark:border-slate-600 py-2 px-3 flex flex-col gap-2">
+      className="w-full rounded-lg border dark:border-slate-600 py-2 px-3 flex flex-col gap-2">
      <div className="flex gap-2.5 items-center">
        {image ? (
          <img
@@ -385,7 +383,7 @@ function VideoEmbed({content}: {content: AppBskyEmbedVideo.View}) {

  return (
    <div
-      className="w-full overflow-hidden rounded-xl aspect-square relative"
+      className="w-full overflow-hidden rounded-lg aspect-square relative"
      style={{aspectRatio: `${aspectRatio} / 1`}}>
      <img
        src={content.thumbnail}
@@ -414,7 +412,7 @@ function StarterPackEmbed({
  return (
    <Link
      href={starterPackHref}
-      className="w-full rounded-xl overflow-hidden border dark:border-slate-600 flex flex-col items-stretch">
+      className="w-full rounded-lg overflow-hidden border dark:border-slate-600 flex flex-col items-stretch">
      <img src={imageUri} className="aspect-[1.91/1] object-cover" />
      <div className="py-3 px-4">
        <div className="flex space-x-2 items-center">
@@ -173,7 +173,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
  }

  return (
-    <p className="min-[300px]:text-lg leading-6 min-[300px]:leading-6 break-word break-words whitespace-pre-wrap">
+    <p className="min-[300px]:text-lg leading-6 break-word break-words whitespace-pre-wrap">
      {richText}
    </p>
  )
@@ -6,17 +6,6 @@
  word-break: break-word;
 }

-#app {
+:root {
  color-scheme: light dark;
 }
-
-select {
-  background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='14px' width='14px' fill='none' viewBox='0 0 24 24'><path fill='black' fill-rule='evenodd' d='M3.293 8.293a1 1 0 0 1 1.414 0L12 15.586l7.293-7.293a1 1 0 1 1 1.414 1.414l-8 8a1 1 0 0 1-1.414 0l-8-8a1 1 0 0 1 0-1.414Z' clip-rule='evenodd'/></svg>");
-  background-repeat: no-repeat;
-  background-position: calc(100% - 0.75rem) center;
-  padding-right: 2rem;
-
-  @media (prefers-color-scheme: dark) {
-    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='14px' width='14px' fill='none' viewBox='0 0 24 24'><path fill='white' fill-rule='evenodd' d='M3.293 8.293a1 1 0 0 1 1.414 0L12 15.586l7.293-7.293a1 1 0 1 1 1.414 1.414l-8 8a1 1 0 0 1-1.414 0l-8-8a1 1 0 0 1 0-1.414Z' clip-rule='evenodd'/></svg>");
-  }
-}
@@ -13,7 +13,6 @@ export function labelsToInfo(
      return 'Adult Content'
    case 'nudity':
      return 'Non-sexual Nudity'
-    case 'gore':
    case 'graphic-media':
      return 'Graphic Media'
    default:
@@ -1,16 +1,12 @@
 import '../index.css'

-import {AppBskyFeedDefs, AppBskyFeedPost, AtpAgent, AtUri} from '@atproto/api'
+import {AppBskyFeedDefs, AppBskyFeedPost, AtUri, BskyAgent} from '@atproto/api'
 import {h, render} from 'preact'
 import {useEffect, useMemo, useRef, useState} from 'preact/hooks'

 import arrowBottom from '../../assets/arrowBottom_stroke2_corner0_rounded.svg'
 import logo from '../../assets/logo.svg'
-import {
-  assertColorModeValues,
-  ColorModeValues,
-  initSystemColorMode,
-} from '../color-mode'
+import {initColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
@@ -26,9 +22,9 @@ export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js`
 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')

-initSystemColorMode()
+initColorMode()

-const agent = new AtpAgent({
+const agent = new BskyAgent({
  service: 'https://public.api.bsky.app',
 })

@@ -36,7 +32,6 @@ render(<LandingPage />, root)

 function LandingPage() {
  const [uri, setUri] = useState('')
-  const [colorMode, setColorMode] = useState<ColorModeValues>('system')
  const [error, setError] = useState<string | null>(null)
  const [loading, setLoading] = useState(false)
  const [thread, setThread] = useState<AppBskyFeedDefs.ThreadViewPost | null>(
@@ -125,50 +120,24 @@ function LandingPage() {

      <h1 className="text-4xl font-bold text-center">Embed a Bluesky Post</h1>

-      <div className="flex flex-col w-full max-w-[600px] gap-6">
-        <input
-          type="text"
-          value={uri}
-          onInput={e => setUri(e.currentTarget.value)}
-          className="border rounded-lg py-3 px-4 dark:bg-dimmedBg dark:border-slate-500"
-          placeholder={DEFAULT_POST}
-        />
-
-        <div className="flex flex-col gap-1.5">
-          <label className="text-sm font-medium" for="colorModeSelect">
-            Theme
-          </label>
-          <select
-            value={colorMode}
-            onChange={e => {
-              const value = e.currentTarget.value
-              if (assertColorModeValues(value)) {
-                setColorMode(value)
-              }
-            }}
-            id="colorModeSelect"
-            className="appearance-none bg-white border w-full rounded-lg text-sm px-3 py-2 dark:bg-dimmedBg dark:border-slate-500">
-            <option value="system">System</option>
-            <option value="light">Light</option>
-            <option value="dark">Dark</option>
-          </select>
-        </div>
-      </div>
+      <input
+        type="text"
+        value={uri}
+        onInput={e => setUri(e.currentTarget.value)}
+        className="border rounded-lg py-3 w-full max-w-[600px] px-4 dark:bg-dimmedBg dark:border-slate-500"
+        placeholder={DEFAULT_POST}
+      />

      <img src={arrowBottom} className="w-6 dark:invert" />

      {loading ? (
-        <div className={`${colorMode} w-full max-w-[600px]`}>
+        <div className="w-full max-w-[600px]">
          <Skeleton />
        </div>
      ) : (
        <div className="w-full max-w-[600px] gap-8 flex flex-col">
-          {!error && thread && uri && (
-            <Snippet thread={thread} colorMode={colorMode} />
-          )}
-          <div className={colorMode}>
-            {!error && thread && <Post thread={thread} key={thread.post.uri} />}
-          </div>
+          {!error && thread && uri && <Snippet thread={thread} />}
+          {!error && thread && <Post thread={thread} key={thread.post.uri} />}
          {error && (
            <div className="w-full border border-red-500 bg-red-500/10 px-4 py-3 rounded-lg">
              <p className="text-red-500 text-center">{error}</p>
@@ -199,13 +168,7 @@ function Skeleton() {
  )
 }

-function Snippet({
-  thread,
-  colorMode,
-}: {
-  thread: AppBskyFeedDefs.ThreadViewPost
-  colorMode: ColorModeValues
-}) {
+function Snippet({thread}: {thread: AppBskyFeedDefs.ThreadViewPost}) {
  const ref = useRef<HTMLInputElement>(null)
  const [copied, setCopied] = useState(false)

@@ -241,11 +204,9 @@ function Snippet({
    // x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x
    return `<blockquote class="bluesky-embed" data-bluesky-uri="${escapeHtml(
      thread.post.uri,
-    )}" data-bluesky-cid="${escapeHtml(
-      thread.post.cid,
-    )}" data-bluesky-embed-color-mode="${escapeHtml(
-      colorMode,
-    )}"><p lang="${escapeHtml(lang)}">${escapeHtml(record.text)}${
+    )}" data-bluesky-cid="${escapeHtml(thread.post.cid)}"><p lang="${escapeHtml(
+      lang,
+    )}">${escapeHtml(record.text)}${
      record.embed
        ? `<br><br><a href="${escapeHtml(href)}">[image or embed]</a>`
        : ''
@@ -256,7 +217,7 @@ function Snippet({
    )}</a>) <a href="${escapeHtml(href)}">${escapeHtml(
      niceDate(thread.post.indexedAt),
    )}</a></blockquote><script async src="${EMBED_SCRIPT}" charset="utf-8"></script>`
-  }, [thread, colorMode])
+  }, [thread])

  return (
    <div className="flex gap-2 w-full">
@@ -4,7 +4,7 @@ import {AppBskyFeedDefs, AtpAgent} from '@atproto/api'
 import {h, render} from 'preact'

 import logo from '../../assets/logo.svg'
-import {applyTheme, initSystemColorMode} from '../color-mode'
+import {initColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
@@ -22,23 +22,7 @@ if (!uri) {
  throw new Error('No uri in path')
 }

-const query = new URLSearchParams(window.location.search)
-
-// theme - default to light mode
-const colorMode = query.get('colorMode')
-
-switch (colorMode) {
-  case 'dark':
-    applyTheme('dark')
-    break
-  case 'system':
-    initSystemColorMode()
-    break
-  case 'light':
-  default:
-    applyTheme('light')
-    break
-}
+initColorMode()

 agent
  .getPostThread({
@@ -9,10 +9,8 @@
  },
  "dependencies": {
    "@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",
    "kysely": "^0.27.3",
@@ -1,11 +1,9 @@
-import {type Express} from 'express'
+import {Express} from 'express'

-import {type AppContext} from '../context.js'
-import {default as createShortLink} from './createShortLink.js'
+import {AppContext} from '../context.js'
+import {default as create} from './create.js'
 import {default as health} from './health.js'
 import {default as redirect} from './redirect.js'
-import {default as root} from './root.js'
-import {default as shortLink} from './shortLink.js'
 import {default as siteAssociation} from './siteAssociation.js'

 export * from './util.js'
@@ -13,9 +11,7 @@ export * from './util.js'
 export default function (ctx: AppContext, app: Express) {
  app = health(ctx, app) // GET /_health
  app = siteAssociation(ctx, app) // GET /.well-known/apple-app-site-association
-  app = redirect(ctx, app) // GET /redirect
-  app = createShortLink(ctx, app) // POST /link
-  app = root(ctx, app) // GET / (redirect to bsky.app on root)
-  app = shortLink(ctx, app) // GET /:linkId (should go last due to permissive matching)
+  app = create(ctx, app) // POST /link
+  app = redirect(ctx, app) // GET /:linkId (should go last due to permissive matching)
  return app
 }
@@ -1,52 +1,54 @@
 import assert from 'node:assert'

 import {DAY, SECOND} from '@atproto/common'
-import escapeHTML from 'escape-html'
-import {type Express} from 'express'
+import {Express} from 'express'

-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {handler} from './util.js'

-const INTERNAL_IP_REGEX = new RegExp(
-  '(^127.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$)|(^10.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$)|(^172.1[6-9]{1}[0-9]{0,1}.[0-9]{1,3}.[0-9]{1,3}$)|(^172.2[0-9]{1}[0-9]{0,1}.[0-9]{1,3}.[0-9]{1,3}$)|(^172.3[0-1]{1}[0-9]{0,1}.[0-9]{1,3}.[0-9]{1,3}$)|(^192.168.[0-9]{1,3}.[0-9]{1,3}$)|^localhost',
-  'i',
-)
-
 export default function (ctx: AppContext, app: Express) {
  return app.get(
-    '/redirect',
+    '/:linkId',
    handler(async (req, res) => {
-      let link = req.query.u
+      const linkId = req.params.linkId
+      const contentType = req.accepts(['html', 'json'])
      assert(
-        typeof link === 'string',
-        'express guarantees link query parameter is a string',
+        typeof linkId === 'string',
+        'express guarantees id parameter is a string',
      )
-
-      let url: URL | undefined
-      try {
-        url = new URL(link)
-      } catch {}
-
-      if (
-        !url ||
-        (url.protocol !== 'http:' && url.protocol !== 'https:') || // is a http(s) url
-        (ctx.cfg.service.hostnames.includes(url.hostname.toLowerCase()) &&
-          url.pathname === '/redirect') || // is a redirect loop
-        INTERNAL_IP_REGEX.test(url.hostname) // isn't directing to an internal location
-      ) {
+      const found = await ctx.db.db
+        .selectFrom('link')
+        .selectAll()
+        .where('id', '=', linkId)
+        .executeTakeFirst()
+      if (!found) {
+        // potentially broken or mistyped link
        res.setHeader('Cache-Control', 'no-store')
+        if (contentType === 'json') {
+          return res
+            .status(404)
+            .json({
+              error: 'NotFound',
+              message: 'Link not found',
+            })
+            .end()
+        }
+        // send the user to the app
        res.setHeader('Location', `https://${ctx.cfg.service.appHostname}`)
        return res.status(302).end()
      }
-
-      res.setHeader('Cache-Control', `max-age=${(7 * DAY) / SECOND}`)
-      res.type('html')
-      res.status(200)
-
-      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>`,
+      // build url from original url in order to preserve query params
+      const url = new URL(
+        req.originalUrl,
+        `https://${ctx.cfg.service.appHostname}`,
      )
+      url.pathname = found.path
+      res.setHeader('Cache-Control', `max-age=${(7 * DAY) / SECOND}`)
+      if (contentType === 'json') {
+        return res.json({url: url.href}).end()
+      }
+      res.setHeader('Location', url.href)
+      return res.status(301).end()
    }),
  )
 }
@@ -1,14 +0,0 @@
-import {type Express} from 'express'
-
-import {type AppContext} from '../context.js'
-import {handler} from './util.js'
-
-export default function (ctx: AppContext, app: Express) {
-  return app.get(
-    '/',
-    handler(async (_req, res) => {
-      res.setHeader('Location', `https://${ctx.cfg.service.appHostname}`)
-      return res.status(301).end()
-    }),
-  )
-}
@@ -1,54 +0,0 @@
-import assert from 'node:assert'
-
-import {DAY, SECOND} from '@atproto/common'
-import {Express} from 'express'
-
-import {AppContext} from '../context.js'
-import {handler} from './util.js'
-
-export default function (ctx: AppContext, app: Express) {
-  return app.get(
-    '/:linkId',
-    handler(async (req, res) => {
-      const linkId = req.params.linkId
-      const contentType = req.accepts(['html', 'json'])
-      assert(
-        typeof linkId === 'string',
-        'express guarantees id parameter is a string',
-      )
-      const found = await ctx.db.db
-        .selectFrom('link')
-        .selectAll()
-        .where('id', '=', linkId)
-        .executeTakeFirst()
-      if (!found) {
-        // potentially broken or mistyped link
-        res.setHeader('Cache-Control', 'no-store')
-        if (contentType === 'json') {
-          return res
-            .status(404)
-            .json({
-              error: 'NotFound',
-              message: 'Link not found',
-            })
-            .end()
-        }
-        // send the user to the app
-        res.setHeader('Location', `https://${ctx.cfg.service.appHostname}`)
-        return res.status(302).end()
-      }
-      // build url from original url in order to preserve query params
-      const url = new URL(
-        req.originalUrl,
-        `https://${ctx.cfg.service.appHostname}`,
-      )
-      url.pathname = found.path
-      res.setHeader('Cache-Control', `max-age=${(7 * DAY) / SECOND}`)
-      if (contentType === 'json') {
-        return res.json({url: url.href}).end()
-      }
-      res.setHeader('Location', url.href)
-      return res.status(301).end()
-    }),
-  )
-}
@@ -69,11 +69,6 @@
  dependencies:
    "@types/node" "*"

-"@types/escape-html@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.4.tgz#dc7c166b76c7b03b27e32f80edf01d91eb5d9af2"
-  integrity sha512-qZ72SFTgUAZ5a7Tj6kf2SHLetiH5S6f8G5frB2SPQ3EyF02kxdyBFf4Tz4banE3xCgGnKgWLt//a6VuYHKYJTg==
-
 "@types/node@*":
  version "20.14.2"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
@@ -281,7 +276,7 @@ es-errors@^1.3.0:
  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==

-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@~1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
@@ -97,7 +97,6 @@ const hideAvatarLabels = new Set([
  'nudity',
  'sexual-figurative',
  'graphic-media',
-  'gore',
  'self-harm',
  'sensitive',
  'security',
@@ -94,20 +94,6 @@ func run(args []string) {
 					Value:    "",
 					EnvVars:  []string{"STATIC_CDN_HOST"},
 				},
-				&cli.BoolFlag{
-					Name:     "bsky-canonical-instance",
-					Usage:    "Enable if this is the canonical deployment (bsky.app)",
-					Value:    false,
-					Required: false,
-					EnvVars:  []string{"BSKY_CANONICAL_INSTANCE"},
-				},
-				&cli.BoolFlag{
-					Name:     "robots-disallow-all",
-					Usage:    "Crawling is allowed by default. Enable this flag to Disallow all",
-					Value:    false,
-					Required: false,
-					EnvVars:  []string{"ROBOTS_DISALLOW_ALL"},
-				},
 			},
 		},
 	}
@@ -82,7 +82,7 @@ func (srv *Server) WebProfileRSS(c echo.Context) error {
 		}
 	}

-	af, err := appbsky.FeedGetAuthorFeed(ctx, srv.xrpcc, did.String(), "", "posts_no_replies", false, 30)
+	af, err := appbsky.FeedGetAuthorFeed(ctx, srv.xrpcc, did.String(), "", "posts_no_replies", 30)
 	if err != nil {
 		log.Warn("failed to fetch author feed", "did", did, "err", err)
 		return err
@@ -63,8 +63,6 @@ func serve(cctx *cli.Context) error {
 	corsOrigins := cctx.StringSlice("cors-allowed-origins")
 	staticCDNHost := cctx.String("static-cdn-host")
 	staticCDNHost = strings.TrimSuffix(staticCDNHost, "/")
-	canonicalInstance := cctx.Bool("bsky-canonical-instance")
-	robotsDisallowAll := cctx.Bool("robots-disallow-all")

 	// Echo
 	e := echo.New()
@@ -206,23 +204,13 @@ func serve(cctx *cli.Context) error {
 		return http.FS(fsys)
 	}())

-	// enable some special endpoints for the "canonical" deployment (bsky.app). not having these enabled should *not* impact regular operation
-	if canonicalInstance {
-		e.GET("/ips-v4", echo.WrapHandler(staticHandler))
-		e.GET("/ips-v6", echo.WrapHandler(staticHandler))
-		e.GET("/security.txt", func(c echo.Context) error {
-			return c.Redirect(http.StatusMovedPermanently, "/.well-known/security.txt")
-		})
-		e.GET("/.well-known/*", echo.WrapHandler(staticHandler))
-	}
-
-	// default to permissive, but Disallow all if flag set
-	if robotsDisallowAll {
-		e.File("/robots.txt", "static/robots-disallow-all.txt")
-	} else {
-		e.GET("/robots.txt", echo.WrapHandler(staticHandler))
-	}
-
+	e.GET("/robots.txt", echo.WrapHandler(staticHandler))
+	e.GET("/ips-v4", echo.WrapHandler(staticHandler))
+	e.GET("/ips-v6", echo.WrapHandler(staticHandler))
+	e.GET("/.well-known/*", echo.WrapHandler(staticHandler))
+	e.GET("/security.txt", func(c echo.Context) error {
+		return c.Redirect(http.StatusMovedPermanently, "/.well-known/security.txt")
+	})
 	e.GET("/iframe/youtube.html", echo.WrapHandler(staticHandler))
 	e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", staticHandler)), func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -263,7 +251,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/moderation/modlists", server.WebGeneric)
 	e.GET("/moderation/muted-accounts", server.WebGeneric)
 	e.GET("/moderation/blocked-accounts", server.WebGeneric)
-	e.GET("/moderation/verification-settings", server.WebGeneric)
 	e.GET("/settings", server.WebGeneric)
 	e.GET("/settings/language", server.WebGeneric)
 	e.GET("/settings/app-passwords", server.WebGeneric)
@@ -276,7 +263,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/settings/account", server.WebGeneric)
 	e.GET("/settings/privacy-and-security", server.WebGeneric)
 	e.GET("/settings/content-and-media", server.WebGeneric)
-	e.GET("/settings/interests", server.WebGeneric)
 	e.GET("/settings/about", server.WebGeneric)
 	e.GET("/settings/app-icon", server.WebGeneric)
 	e.GET("/sys/debug", server.WebGeneric)
@@ -297,7 +283,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/profile/:handleOrDID/follows", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/followers", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/known-followers", server.WebGeneric)
-	e.GET("/profile/:handleOrDID/search", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/lists/:rkey", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/feed/:rkey", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/feed/:rkey/liked-by", server.WebGeneric)
@@ -5,7 +5,7 @@ go 1.23
 toolchain go1.23.4

 require (
-	github.com/bluesky-social/indigo v0.0.0-20250605010711-db9bb60025dc
+	github.com/bluesky-social/indigo v0.0.0-20240624223826-fd66f93ce141
 	github.com/flosch/pongo2/v6 v6.0.0
 	github.com/ipfs/go-log v1.0.5
 	github.com/joho/godotenv v1.5.1
@@ -16,7 +16,6 @@ require (

 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
 	github.com/carlmjohnson/versioninfo v0.22.5 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
@@ -82,7 +81,7 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e // indirect
+	github.com/whyrusleeping/cbor-gen v0.1.1-0.20240311221002-68b9f235c302 // indirect
 	github.com/whyrusleeping/go-did v0.0.0-20230824162731-404d1707d5d6 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect
@@ -95,13 +94,13 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gorm.io/driver/postgres v1.5.7 // indirect
 	gorm.io/driver/sqlite v1.5.5 // indirect
 	gorm.io/gorm v1.25.9 // indirect
@@ -2,10 +2,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bluesky-social/indigo v0.0.0-20250605010711-db9bb60025dc h1:chbGD59Cn1mw07kbq9Uvb8WUFIr1dcoL5TOhT+I9bV4=
-github.com/bluesky-social/indigo v0.0.0-20250605010711-db9bb60025dc/go.mod h1:ovyxp8AMO1Hoe838vMJUbqHTZaAR8ABM3g3TXu+A5Ng=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bluesky-social/indigo v0.0.0-20240624223826-fd66f93ce141 h1:F3ZceqS82fFfVV3ychWRLNDRFaFlbOwrPic0qJiUVqw=
+github.com/bluesky-social/indigo v0.0.0-20240624223826-fd66f93ce141/go.mod h1:dBIOGhsiK0rgEETnxiGiuEyrSx6DKxEotHIPbiKD6WU=
 github.com/carlmjohnson/versioninfo v0.22.5 h1:O00sjOLUAFxYQjlN/bzYTuZiS0y6fWDQjMRvwtKgwwc=
 github.com/carlmjohnson/versioninfo v0.22.5/go.mod h1:QT9mph3wcVfISUKd0i9sZfVrPviHuSF+cUtLjm2WSf8=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -35,6 +33,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
@@ -208,8 +208,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
-github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e h1:28X54ciEwwUxyHn9yrZfl5ojgF4CBNLWX7LR0rvBkf4=
-github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so=
+github.com/whyrusleeping/cbor-gen v0.1.1-0.20240311221002-68b9f235c302 h1:MhInbXe4SzcImAKktUvWBCWZgcw6MYf5NfumTj1BhAw=
+github.com/whyrusleeping/cbor-gen v0.1.1-0.20240311221002-68b9f235c302/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so=
 github.com/whyrusleeping/go-did v0.0.0-20230824162731-404d1707d5d6 h1:yJ9/LwIGIk/c0CdoavpC9RNSGSruIspSZtxG3Nnldic=
 github.com/whyrusleeping/go-did v0.0.0-20230824162731-404d1707d5d6/go.mod h1:39U9RRVr4CKbXpXYopWn+FSH5s+vWu6+RmguSPWAq5s=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
@@ -271,16 +271,16 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -297,8 +297,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -332,8 +332,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -1,3 +0,0 @@
-# This is an development or self-hosted instance of the bsky web app, and crawling has been disallowed by the operator team.
-User-Agent: *
-Disallow: /
@@ -1,6 +1,5 @@
 {
-  "project_id": "1",
-  "base_url": "https://bluesky.api.crowdin.com",
+  "project_id": "664276",
  "base_path": ".",
  "preserve_hierarchy": true,
  "files": [
@@ -9,7 +8,6 @@
      "translation": "/src/locale/locales/%two_letters_code%/messages.po",
      "languages_mapping": {
          "two_letters_code": {
-            "pt": "pt-PT",
            "pt-BR": "pt-BR",
            "en-GB": "en-GB",
            "zh-CN": "zh-CN",
@@ -15,7 +15,7 @@ This is NOT required when developing for web.

 - Set up your environment [using the expo instructions](https://docs.expo.dev/guides/local-app-development/).
  - make sure that the JAVA_HOME points to the zulu-17 directory in your `.zshrc` or `.bashrc` file: `export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home`. DO NOT use another JDK or you will encounter build errors.
- If you're running macOS, make sure you are running the correct versions of Ruby and Cocoapods:-
+- If you're running macOS, make sure you are running the correct versions of Ruby and Cocoapods:- 
  - If you are using Apple Silicon and this is the first time you are building for RN 0.74+, you may need to run:
    - `arch -arm64 brew install llvm`
    - `sudo gem install ffi`
@@ -33,7 +33,7 @@ This is NOT required when developing for web.
 - After initial setup:
  - Copy `google-services.json.example` to `google-services.json` or provide your own `google-services.json`. (A real firebase project is NOT required)
  - `npx expo prebuild` -> you will also need to run this anytime `app.json` or native `package.json` deps change
-
+ 
 ### Running the Native App

 - iOS: `yarn ios`
@@ -162,9 +162,6 @@ See [testing.md](./testing.md).
 `./platform/polyfills.*.ts` adds polyfills to the environment. Currently, this includes:

 - TextEncoder / TextDecoder
- react-native-url-polyfill
- Array#findLast (on web)
- atob (on native)

 ### Sentry sourcemaps

@@ -1,138 +1,95 @@
 # OTA Deployments

-## Automatic internal OTAs
-
-OTA deployments to TestFlight/APK installs happen automatically upon all merges
-into main. In cases where the fingerprint diff shows incompatible native
-changes, a new client build will automatically be ran and deployed to TestFlight
-(iOS) or delivered in Slack (Android).
-
-## Production OTAs
-
-Production OTAs can only update the JavaScript bundle. Changes to native modules
-must be done as a full release cycle through the app stores.
-
-> [!TIP]
-> If you're using a TestFlight build, in order to reference the correct build
-> number and to verify the success of an OTA, you will need to delete the
-> TestFlight app itself, delete the Bluesky app entirely, and re-install from
-> the App Store.
-
-### 1. Find the build numbers
-
-Find the latest production build numbers for iOS and Android in Slack. These are
-spit out into `#bot-client-builds` after each release. You can also find this
-information under the `About` section in app settings.
-
-| Slack | In app |
-| ----- | ------ |
-| ![slack](./img/slack_client_builds.jpeg) | ![slack](./img/ios_settings_about.jpeg) |
-
-### 2. Ensure the release is tagged
-
-You need to ensure that the latest release was properly tagged using the format
-`1.X.0`. If the commit is not properly tagged, then the OTA deployment will
-simply fail since the GitHub Action will not be able to find a commit to
-fingerprint and diff against.
-
-### 3. Create an OTA branch
-
-Create a branch based off the last commit that was deployed in the most recent
-release. This could be the commit that was tagged `1.x.0`, or a later commit,
-but it **needs to be the tip of the latest production release** in any case.
-Double check yourself by ensuring that the `version` in `package.json` matches
-what's in the latest release.
-
-This new OTA branch should follow the format `1.X.0-ota-1`. If one or more OTAs
-have already been deployed for this release, incremement the branch name e.g.
-`1.x.0-ota-2`.
-
-### 4. Add commits to the OTA branch
-
-Cherry pick in the commits that need to be deployed on top of the most recent
-release or OTA.
-
-### 5. Manually set build numbers
-
-Log in to the EAS CLI with `eas login` and manually set the build numbers to the
-values you found in **Step 1**.
-
-```sh
-> npx eas build:version:set -p ios
->
-> Project @blueskysocial/bluesky with bundle identifier "xyz.blueskyweb.app" is configured with buildNumber 1011.
-> ✔ What version would you like to set? … 1009
->
-> npx eas build:version:set -p android
->
-> Project @blueskysocial/bluesky with application ID "xyz.blueskyweb.app" is configured with versionCode 641.
-> ✔ What version would you like to set? … 639  
-```
-
-👉 **Save the previous values,** in this case `1011` and `641`, so you can reset
-them after the OTA completes.
-
-### 6. Run the GitHub actions
-You'll need to run two separate actions: one to deploy the iOS/Android OTA
-itself, and one to build the web Docker container.
-
-**For the iOS/Android OTA,** head to [Actions > Bundle and Deploy EAS
-Update](https://github.com/bluesky-social/social-app/actions/workflows/bundle-deploy-eas-update.yml)
-and run the action.
-
-| Steps |     |
-| ----- | --- |
-| Select your OTA branch `1.x.0-ota-x`, select `production` in the dropdown, enter the git tag of the latest release `1.x.0`, and click "Run workflow"  | ![workflow](./img/ota_action.png) |
-
-> [!NOTE]
-> If you do enter an incorrect version here, the deployment will either:
-> - Fail, because the action cannot find a commit with your misentered version
-> - Succeed, but with no users receiving the update. This is because the version
->   you entered will not properly correlate to a _build number_ as well, so no
->   clients in the wild will be able to receive the update.
-
-**For web,** head to [Actions >
-build-and-push-bskyweb-aws](https://github.com/bluesky-social/social-app/actions/workflows/build-and-push-bskyweb-aws.yaml)
-and run the action.
-
-| Steps |     |
-| ----- | --- |
-| Select your OTA branch `1.x.0-ota-x` and click "Run workflow" | ![workflow](./img/web_action.png) |
-
-### 7. Deploy web
-
-Once the web Docker container build finishes, go to your `1.x.0-ota-x` branch,
-copy the most recent commit hash. Post this hash in `#ops-deploys` and request
-someone with web deploy access deploy the built container.
-
-### 8. Confirm successful deployment
-
-In about five minutes, the new deployment should be deployed and devices will
-begin downloading and installing in the background.
-
-To confirm this, as mentioned above, you must completely clear the TestFlight
-build from your device and re-install from the App Store. Then, you'll need to:
- Launch the app (or quit and reopen) and wait ~15s for the download to complete
- Quit and reopen the app
- Check the `Settings > About` page and confirm the has matches the most recent has on your OTA branch
-
-### 9. Reset build numbers
-
-Grab the build numbers you saved in **Step 5** and reverse the EAS CLI commands
-to reset the build numbers.
-
-```sh
-> npx eas build:version:set -p ios
->
-> Project @blueskysocial/bluesky with bundle identifier "xyz.blueskyweb.app" is configured with buildNumber 1009.
-> ✔ What version would you like to set? … 1011
->
-> npx eas build:version:set -p android
->
-> Project @blueskysocial/bluesky with application ID "xyz.blueskyweb.app" is configured with versionCode 639.
-> ✔ What version would you like to set? … 641
-```
-
-## Overview diagram
+## Overview

 ![OTA Deployment](./img/ota-flow.png)
+
+## Internal Deployments
+
+Internal OTA deployments should be performed automatically upon all merges into main. In cases where the fingerprint
+diff results in incompatible native changes, a new client build will automatically be ran and deployed to TestFlight 
+(iOS) or delivered in Slack (Android).
+
+## Production Deployments
+
+### Prerequisites
+
+- Find the latest production build number for both iOS and Android in Slack. These are listed in #client-builds
+  - Production builds always send the Version Number and Build Number in the Slack message. Search for the latest
+  production version number, and you should find the correct information.
+  
+    ![slack-build-info](./img/slack-build-info.png)
+
+- It may also be useful to check the current production clients for these values. This will also help for testing. Note
+that you will need to _fully_ remove the existing internal client build from your device, otherwise the given values in
+the app may differ from the actual production values.
+
+  ![app-build-number](./img/app-build-number.png)
+
+- You should have signed in to EAS locally through npx eas login. You will need to modify the build number in a
+subsequent step.
+- Ensure that the commit the initial client was cut from is properly tagged in git. The tag should be in the format of 1.X.0
+  - Note: If the commit is not properly tagged, then the OTA deployment will simply fail since the GitHub Action will 
+  not be able to find a commit to fingerprint and diff against.
+
+### Preparation
+
+- Create a new branch from the git tag that the initial release was cut from if no OTA deployment has been made yet for this 
+client. Name this branch `1.X.0-ota-1`
+- If a deployment has been made previously for this release, increment the branch name, i.e. `1.x.0-ota-2`
+- If necessary, cherry-pick the commit(s) that you wish to deploy
+- Ensure that the package.json’s version field is set to the appropriate value. As long as used the correct git tag
+to create your branch from, this should be properly set.
+
+### Deployment
+
+- Update the build number through EAS to match the build numbers of the
+    production iOS/Android apps
+    - Note: This isn’t strictly necessary, but having a step that takes you off of GitHub and into the terminal provides 
+    a little “friction” to avoid fat fingering a release. Since there are legitimate reasons to just “click and deploy”
+    for internal builds, I felt it useful to make sure it doesn’t accidentally become a prod deployment.
+    - Set the build numbers to the values found in the prerequisite steps. Again, this should be the 
+    build number for the current production release you want to deploy for.
+    - `npx eas build:version:set -p ios`
+    - `npx eas build:version:set -p android`
+    - These steps should spit out what the current build number is, save those values
+        for later too
+- Run the deployment
+  - Navigate to https://github.com/bluesky-social/social-app/actions/workflows/bundle-deploy-eas-update.yml
+  - Select the “Run Workflow” dropdown
+  
+    ![run-workflow](./img/run-workflow.png)
+  
+  - Select the branch for the deployment you are releasing.
+  
+    ![branch-selection](./img/branch-selection.png)
+  
+  - Double check the branch selection.
+  - Select the production channel
+  - Enter the version for the client you are releasing to, i.e. 1.80.0
+    - Note: If you do enter an incorrect version here, the deployment will either:
+      - Fail because the action cannot find a commit with your misentered version
+      - Succeed - but with no users receiving the update. This is because the version you entered will not properly 
+      correlate to a _build number_ as well, so no clients in the wild will be able to receive the update.
+  
+        ![other-ota-options](./img/other-ota-options.png)
+  
+  - Triple check the branch selection.
+    - You selected the correct branch
+    - You selected the "Production" channel
+    - You entered the correct version in the format of `1.X.0`.
+  - Press “Run Workflow”
+
+In about five minutes, the new deployment should be available for download. To test:
+
+- Remove the internal build of the app from your device
+- Download the app from the App Store/Google Play
+- Launch the app once and wait approximately 15 seconds
+- Relaunch the app
+- Check the Settings page and scroll to the bottom. The commit hash should now be the latest commit on your deployed branch.
+
+### Post Deployment
+
+- Reset both platforms build numbers to what they were before the OTA
+    deployment. These values should have been logged by the EAS CLI when you
+    reset them to the production values prior to OTA.
@@ -1,13 +1,13 @@
 # Internationalization

-We want the official Bluesky app to be supported in as many languages as possible. If you want to help us translate the app, please get involved on [Crowdin](https://bluesky.crowdin.com/bluesky-social) or open an issue on the [Bluesky app repo on GitHub](https://github.com/bluesky-social/social-app).
+We want the official Bluesky app to be supported in as many languages as possible. If you want to help us translate the app, please open a PR or issue on the [Bluesky app repo on GitHub](https://github.com/bluesky-social/social-app)

 ## Tools

- We use Crowdin to manage translations.
-  - Bluesky Crowdin: https://bluesky.crowdin.com/bluesky-social
-  - Introduction to Crowdin: https://support.crowdin.com/for-translators/
 - We use Lingui to implement translations. You can find the documentation [here](https://lingui.dev/).
+- We use Crowdin to manage translations.
+  - Bluesky Crowdin: https://crowdin.com/project/bluesky-social
+  - Introduction to Crowdin: https://support.crowdin.com/for-translators/

 ## Translators

@@ -15,7 +15,7 @@ Much of the app is translated by community contributions. (We <3 our translators

 ### Using Crowdin

-[Crowdin](https://bluesky.crowdin.com/bluesky-social) is our primary tool for managing translations. There are two roles:
+[Crowdin](https://crowdin.com/project/bluesky-social) is our primary tool for managing translations. There are two roles:

 - **Proof-readers**. Can create new translations and approve submitted translations.
 - **Translators**. Can create new translations.
@@ -32,7 +32,7 @@ Please treat everyone with respect. Proof-readers are given final say on transla

 ### Adding a new language

-You can request a new language be added to the project by clicking **Request New Language** on [Crowdin](https://bluesky.crowdin.com/bluesky-social) or you can create a [GitHub issue](https://github.com/bluesky-social/social-app/issues).
+Create a new [Crowdin discussion](https://crowdin.com/project/bluesky-social/discussions) or [GitHub issue](https://github.com/bluesky-social/social-app/issues) requesting the new language be added to the project.

 Please only request a new language when you are certain you will be able to contribute a substantive portion of translations for the language.

@@ -47,8 +47,7 @@ Every night, a GitHub action will run `yarn intl:extract` to update the english
 ### Release process

 1. Pull main and create a branch.
-1. Run `yarn intl:pull` to fetch all translation updates from Crowdin. Commit.
-1. Run `yarn intl:extract:all` to ensure all `.po` files are synced with the current state of the code. Commit.
+1. Run `yarn intl:pull` to fetch all translation updates from Crowdin.
 1. Create a PR, ensure the translations all look correct, and merge.
 1. If needed:
  1. Merge all approved translation PRs (contributions from outside crowdin).
@@ -33,10 +33,15 @@ jest.mock('react-native-safe-area-context', () => {
  }
 })

+jest.mock('rn-fetch-blob', () => ({
+  config: jest.fn().mockReturnThis(),
+  cancel: jest.fn(),
+  fetch: jest.fn(),
+}))
+
 jest.mock('expo-file-system', () => ({
  getInfoAsync: jest.fn().mockResolvedValue({exists: true, size: 100}),
  deleteAsync: jest.fn(),
-  createDownloadResumable: jest.fn(),
 }))

 jest.mock('expo-image-manipulator', () => ({
@@ -96,7 +101,7 @@ jest.mock('expo-modules-core', () => ({
      }
    }
  }),
-  requireNativeViewManager: jest.fn().mockImplementation(_ => {
+  requireNativeViewManager: jest.fn().mockImplementation(moduleName => {
    return () => null
  }),
 }))
@@ -114,5 +119,5 @@ jest.mock('statsig-react-native-expo', () => ({
  },
 }))

-jest.mock('../src/logger/bitdrift/lib', () => ({}))
+jest.mock('../src/lib/bitdrift', () => ({}))
 jest.mock('../src/lib/statsig/statsig', () => ({}))
@@ -5,19 +5,15 @@ module.exports = {
    'an',
    'ast',
    'ca',
-    'cy',
    'da',
    'de',
    'el',
    'en-GB',
-    'eo',
    'es',
    'eu',
    'fi',
    'fr',
-    'fy',
    'ga',
-    'gd',
    'gl',
    'hi',
    'hu',
@@ -31,7 +27,6 @@ module.exports = {
    'nl',
    'pl',
    'pt-BR',
-    'pt-PT',
    'ro',
    'ru',
    'sv',
@@ -1,6 +1,6 @@
 // Learn more https://docs.expo.io/guides/customizing-metro
-const {getSentryExpoConfig} = require('@sentry/react-native/metro')
-const cfg = getSentryExpoConfig(__dirname)
+const {getDefaultConfig} = require('expo/metro-config')
+const cfg = getDefaultConfig(__dirname)

 cfg.resolver.sourceExts = process.env.RN_SRC_EXT
  ? process.env.RN_SRC_EXT.split(',').concat(cfg.resolver.sourceExts)
@@ -16,21 +16,22 @@ if (process.env.BSKY_PROFILE) {

 cfg.resolver.assetExts = [...cfg.resolver.assetExts, 'woff2']

-// Enabled by default in RN 0.79+, but this breaks Lingui + others
-cfg.resolver.unstable_enablePackageExports = false
-
 cfg.resolver.resolveRequest = (context, moduleName, platform) => {
  // HACK: manually resolve a few packages that use `exports` in `package.json`.
  // A proper solution is to enable `unstable_enablePackageExports` but this needs careful testing.
  if (moduleName.startsWith('multiformats/hashes/hasher')) {
    return context.resolveRequest(
      context,
-      'multiformats/cjs/src/hashes/hasher',
+      'multiformats/dist/src/hashes/hasher',
      platform,
    )
  }
  if (moduleName.startsWith('multiformats/cid')) {
-    return context.resolveRequest(context, 'multiformats/cjs/src/cid', platform)
+    return context.resolveRequest(
+      context,
+      'multiformats/dist/src/cid',
+      platform,
+    )
  }
  if (moduleName === '@ipld/dag-cbor') {
    return context.resolveRequest(context, '@ipld/dag-cbor/src', platform)
@@ -31,13 +31,9 @@ class BottomSheetView(
  private lateinit var dialogRootViewGroup: DialogRootViewGroup
  private var eventDispatcher: EventDispatcher? = null

-  private val rawScreenHeight = context.resources.displayMetrics.heightPixels.toFloat()
-  private val safeScreenHeight = (rawScreenHeight - getNavigationBarHeight()).toFloat()
-
-  private fun getNavigationBarHeight(): Int {
-      val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
-      return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0
-  }
+  private val screenHeight =
+    context.resources.displayMetrics.heightPixels
+      .toFloat()

  private val onAttemptDismiss by EventDispatcher()
  private val onSnapPointChange by EventDispatcher()
@@ -67,12 +63,12 @@ class BottomSheetView(
        }
    }

-  var maxHeight = this.safeScreenHeight
+  var maxHeight = this.screenHeight
    set(value) {
      val px = dpToPx(value)
      field =
-        if (px > this.safeScreenHeight) {
-          this.safeScreenHeight
+        if (px > this.screenHeight) {
+          this.screenHeight
        } else {
          px
        }
@@ -157,19 +153,6 @@ class BottomSheetView(

  // Presentation

-  private fun getHalfExpandedRatio(contentHeight: Float): Float {
-    return when {
-      // Full height sheets
-      contentHeight >= safeScreenHeight -> 0.99f
-      // Medium height sheets (>50% but <100%)
-      contentHeight >= safeScreenHeight / 2 ->
-        this.clampRatio(this.getTargetHeight() / safeScreenHeight)
-      // Small height sheets (<50%)
-      else ->
-        this.clampRatio(this.getTargetHeight() / rawScreenHeight)
-    }
-  }
-
  private fun present() {
    if (this.isOpen || this.isOpening || this.isClosing) return

@@ -189,12 +172,12 @@ class BottomSheetView(
      val behavior = BottomSheetBehavior.from(it)
      behavior.state = BottomSheetBehavior.STATE_HIDDEN
      behavior.isFitToContents = true
-      behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
+      behavior.halfExpandedRatio = this.clampRatio(this.getTargetHeight() / this.screenHeight)
      behavior.skipCollapsed = true
      behavior.isDraggable = true
      behavior.isHideable = true

-      if (contentHeight >= this.safeScreenHeight || this.minHeight >= this.safeScreenHeight) {
+      if (contentHeight >= this.screenHeight || this.minHeight >= this.screenHeight) {
        behavior.state = BottomSheetBehavior.STATE_EXPANDED
        this.selectedSnapPoint = 2
      } else {
@@ -244,11 +227,11 @@ class BottomSheetView(
    bottomSheet?.let {
      val behavior = BottomSheetBehavior.from(it)

-      behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
+      behavior.halfExpandedRatio = this.clampRatio(this.getTargetHeight() / this.screenHeight)

-      if (contentHeight > this.safeScreenHeight && behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
+      if (contentHeight > this.screenHeight && behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-      } else if (contentHeight < this.safeScreenHeight && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
+      } else if (contentHeight < this.screenHeight && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
      }
    }
@@ -317,9 +300,6 @@ class BottomSheetView(
  // View overrides to pass to DialogRootViewGroup instead

  override fun dispatchProvideStructure(structure: ViewStructure?) {
-    if (structure == null) {
-      return
-    }
    dialogRootViewGroup.dispatchProvideStructure(structure)
  }

@@ -139,7 +139,19 @@ class DialogRootViewGroup(
    return super.onHoverEvent(event)
  }

-  override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
+  @Deprecated("Deprecated in Java")
+  override fun onChildStartedNativeGesture(ev: MotionEvent?) {
+    eventDispatcher?.let {
+      if (ev != null) {
+        jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
+      }
+    }
+  }
+
+  override fun onChildStartedNativeGesture(
+    childView: View,
+    ev: MotionEvent,
+  ) {
    eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
    jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
  }
@@ -144,8 +144,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
  }

  func updateLayout() {
-    // Allow updates either when identifiers match OR when prevLayoutDetentIdentifier is nil (first real content update)
-    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier || self.prevLayoutDetentIdentifier == nil,
+    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier,
       let contentHeight = self.innerView?.subviews.first?.frame.size.height {
      self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
                                  preventExpansion: self.preventExpansion)
@@ -155,15 +154,9 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
  }

  func dismiss() {
-    guard let sheetVc = self.sheetVc else {
-      return
-    }
-
    self.isClosing = true
-    DispatchQueue.main.async {
-      sheetVc.dismiss(animated: true) { [weak self] in
-        self?.destroy()
-      }
+    self.sheetVc?.dismiss(animated: true) { [weak self] in
+      self?.destroy()
    }
  }

@@ -1,21 +1,15 @@
 import * as React from 'react'
 import {
  Dimensions,
-  type LayoutChangeEvent,
-  type NativeSyntheticEvent,
+  NativeSyntheticEvent,
  Platform,
-  type StyleProp,
+  StyleProp,
  View,
-  type ViewStyle,
+  ViewStyle,
 } from 'react-native'
-import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'

-import {isIOS} from '#/platform/detection'
-import {
-  type BottomSheetState,
-  type BottomSheetViewProps,
-} from './BottomSheet.types'
+import {BottomSheetState, BottomSheetViewProps} from './BottomSheet.types'
 import {BottomSheetPortalProvider} from './BottomSheetPortal'
 import {Context as PortalContext} from './BottomSheetPortal'

@@ -30,10 +24,7 @@ const NativeView: React.ComponentType<

 const NativeModule = requireNativeModule('BottomSheet')

-const isIOS15 =
-  Platform.OS === 'ios' &&
-  // semvar - can be 3 segments, so can't use Number(Platform.Version)
-  Number(Platform.Version.split('.').at(0)) < 16
+const isIOS15 = Platform.OS === 'ios' && Number(Platform.Version) < 16

 export class BottomSheetNativeComponent extends React.Component<
  BottomSheetViewProps,
@@ -90,10 +81,12 @@ export class BottomSheetNativeComponent extends React.Component<
      return null
    }

+    const {children, backgroundColor, ...rest} = this.props
+    const cornerRadius = rest.cornerRadius ?? 0
+
    let extraStyles
    if (isIOS15 && this.state.viewHeight) {
      const {viewHeight} = this.state
-      const cornerRadius = this.props.cornerRadius ?? 0
      if (viewHeight < screenHeight / 2) {
        extraStyles = {
          height: viewHeight,
@@ -106,70 +99,39 @@ export class BottomSheetNativeComponent extends React.Component<

    return (
      <Portal>
-        <BottomSheetNativeComponentInner
-          {...this.props}
-          nativeViewRef={this.ref}
+        <NativeView
+          {...rest}
          onStateChange={this.onStateChange}
-          extraStyles={extraStyles}
-          onLayout={e => {
-            const {height} = e.nativeEvent.layout
-            this.setState({viewHeight: height})
-            this.updateLayout()
+          ref={this.ref}
+          style={{
+            position: 'absolute',
+            height: screenHeight,
+            width: '100%',
          }}
-        />
+          containerBackgroundColor={backgroundColor}>
+          <View
+            style={[
+              {
+                flex: 1,
+                backgroundColor,
+              },
+              Platform.OS === 'android' && {
+                borderTopLeftRadius: cornerRadius,
+                borderTopRightRadius: cornerRadius,
+              },
+              extraStyles,
+            ]}>
+            <View
+              onLayout={e => {
+                const {height} = e.nativeEvent.layout
+                this.setState({viewHeight: height})
+                this.updateLayout()
+              }}>
+              <BottomSheetPortalProvider>{children}</BottomSheetPortalProvider>
+            </View>
+          </View>
+        </NativeView>
      </Portal>
    )
  }
 }
-
-function BottomSheetNativeComponentInner({
-  children,
-  backgroundColor,
-  onLayout,
-  onStateChange,
-  nativeViewRef,
-  extraStyles,
-  ...rest
-}: BottomSheetViewProps & {
-  extraStyles?: StyleProp<ViewStyle>
-  onStateChange: (
-    event: NativeSyntheticEvent<{state: BottomSheetState}>,
-  ) => void
-  nativeViewRef: React.RefObject<View>
-  onLayout: (event: LayoutChangeEvent) => void
-}) {
-  const insets = useSafeAreaInsets()
-  const cornerRadius = rest.cornerRadius ?? 0
-
-  const sheetHeight = isIOS ? screenHeight - insets.top : screenHeight
-
-  return (
-    <NativeView
-      {...rest}
-      onStateChange={onStateChange}
-      ref={nativeViewRef}
-      style={{
-        position: 'absolute',
-        height: sheetHeight,
-        width: '100%',
-      }}
-      containerBackgroundColor={backgroundColor}>
-      <View
-        style={[
-          {
-            flex: 1,
-            backgroundColor,
-          },
-          Platform.OS === 'android' && {
-            borderTopLeftRadius: cornerRadius,
-            borderTopRightRadius: cornerRadius,
-          },
-          extraStyles,
-        ]}>
-        <View onLayout={onLayout}>
-          <BottomSheetPortalProvider>{children}</BottomSheetPortalProvider>
-        </View>
-      </View>
-    </NativeView>
-  )
-}
@@ -1,4 +1,4 @@
-import {type BottomSheetViewProps} from './BottomSheet.types'
+import {BottomSheetViewProps} from './BottomSheet.types'

 export function BottomSheetNativeComponent(_: BottomSheetViewProps) {
  throw new Error('BottomSheetNativeComponent is not available on web')
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
  s.static_framework = true

  s.dependency 'ExpoModulesCore'
-  s.dependency 'SDWebImage', '~> 5.21.0'
+  s.dependency 'SDWebImage', '~> 5.19.1'
  s.dependency 'SDWebImageWebPCoder', '~> 0.14.6'

  # Swift/Objective-C compatibility
@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Alan Hughes
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,3 +0,0 @@
-# expo-emoji-picker
-
-Based on [react-native-emoji-popup](https://github.com/okwasniewski/react-native-emoji-popup) and [expo-emoji-picker](https://github.com/alanjhughes/expo-emoji-picker)
@@ -1,46 +0,0 @@
-apply plugin: 'com.android.library'
-
-group = 'expo.community.modules.emojipicker'
-version = '0.1.0'
-
-def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-apply from: expoModulesCorePlugin
-applyKotlinExpoModulesCorePlugin()
-useCoreDependencies()
-useExpoPublishing()
-
-// If you want to use the managed Android SDK versions from expo-modules-core, set this to true.
-// The Android SDK versions will be bumped from time to time in SDK releases and may introduce breaking changes in your module code.
-// Most of the time, you may like to manage the Android SDK versions yourself.
-def useManagedAndroidSdkVersions = false
-if (useManagedAndroidSdkVersions) {
-  useDefaultAndroidSdkVersions()
-} else {
-  buildscript {
-    // Simple helper that allows the root project to override versions declared by this library.
-    ext.safeExtGet = { prop, fallback ->
-      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-    }
-  }
-  project.android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 21)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-  }
-}
-
-android {
-  namespace "expo.community.modules.emojipicker"
-  defaultConfig {
-    versionCode 1
-    versionName "0.1.0"
-  }
-  lintOptions {
-    abortOnError false
-  }
-  dependencies {
-    implementation "androidx.emoji2:emoji2-emojipicker:1.5.0"
-  }
-}
@@ -1,2 +0,0 @@
-<manifest>
-</manifest>
@@ -1,15 +0,0 @@
-package expo.community.modules.emojipicker
-
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-import java.net.URL
-
-class EmojiPickerModule : Module() {
-    override fun definition() = ModuleDefinition {
-        Name("EmojiPicker")
-
-        View(EmojiPickerModuleView::class) {
-            Events("onEmojiSelected")
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Bailey	7634110f1d	Debug	2025-02-12 16:43:07 -06:00
Eric Bailey	4349c7f16d	Clean up env	2025-02-12 16:43:00 -06:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M20 13.75a1 1 0 0 1 1 1V18a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-3.25a1 1 0 1 1 2 0V18a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-3.25a1 1 0 0 1 1-1ZM12 3a1 1 0 0 1 .707.293l4.5 4.5a1 1 0 1 1-1.414 1.414L13 6.414v8.836a1 1 0 1 1-2 0V6.414L8.207 9.207a1 1 0 1 1-1.414-1.414l4.5-4.5A1 1 0 0 1 12 3Z"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M11.839 4.744c0-1.488 1.724-2.277 2.846-1.364l.107.094 7.66 7.256.128.134c.558.652.558 1.62 0 2.272l-.128.135-7.66 7.255c-1.115 1.057-2.953.267-2.953-1.27v-2.748c-3.503.055-5.417.41-6.592.97-.997.474-1.525 1.122-2.084 2.14l-.243.46c-.558 1.088-2.09.583-2.08-.515l.015-.748c.111-3.68.777-6.5 2.546-8.415 1.83-1.98 4.63-2.771 8.438-2.884V4.744Zm2 3.256c0 .79-.604 1.41-1.341 1.494l-.149.01c-3.9.057-6.147.813-7.48 2.254-.963 1.043-1.562 2.566-1.842 4.79.38-.327.826-.622 1.361-.877 1.656-.788 4.08-1.14 7.938-1.169l.153.007A1.5 1.5 0 0 1 13.839 16v2.675L20.884 12l-7.045-6.676V8Z"/></svg>