Make it safer

.editorconfig

@@ -1,2 +0,0 @@
-[*.{kt,kts}]
-indent_size=2

.eslintrc.js

@@ -31,7 +31,6 @@ module.exports = {
         },
       },
     ],
-    'bsky-internal/use-exact-imports': 'error',
     'bsky-internal/use-typed-gates': 'error',
     'simple-import-sort/imports': [
       'warn',
@@ -71,19 +70,6 @@ module.exports = {
     'simple-import-sort/exports': 'warn',
     // TODO: Reenable when we figure out why it gets stuck on CI.
     // 'react-compiler/react-compiler': 'error',
-    'no-restricted-imports': [
-      'error',
-      {
-        paths: [
-          {
-            name: '@atproto/api',
-            importNames: ['moderatePost'],
-            message:
-              'Please use `moderatePost_wrapped` from `#/lib/moderatePost_wrapped` instead.',
-          },
-        ],
-      },
-    ],
   },
   ignorePatterns: [
     '**/__mocks__/*.ts',

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

@@ -1,53 +0,0 @@
-name: build-and-push-link-aws
-on:
-  workflow_dispatch:
-
-env:
-  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
-  USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
-  PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }}
-  IMAGE_NAME: bskylink
-
-jobs:
-  link-container-aws:
-    if: github.repository == 'bluesky-social/social-app'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.USERNAME}}
-          password: ${{ env.PASSWORD }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=sha,enable=true,priority=100,prefix=,suffix=,format=long
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ./Dockerfile.bskylink
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

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

@@ -1,53 +0,0 @@
-name: build-and-push-ogcard-aws
-on:
-  workflow_dispatch:
-
-env:
-  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
-  USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
-  PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }}
-  IMAGE_NAME: bskyogcard
-
-jobs:
-  ogcard-container-aws:
-    if: github.repository == 'bluesky-social/social-app'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.USERNAME}}
-          password: ${{ env.PASSWORD }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=sha,enable=true,priority=100,prefix=,suffix=,format=long
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ./Dockerfile.bskyogcard
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

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

@@ -34,9 +34,6 @@ jobs:
           node-version-file: .nvmrc
           cache: yarn
 
-      - name: 🪛 Setup jq
-        uses: dcarbone/install-jq-action@v2
-
       - name: 🔨 Setup EAS
         uses: expo/expo-github-action@v8
         with:
@@ -99,17 +96,13 @@ jobs:
           name: build-${{ steps.timestamp.outputs.time }}.apk
           path: build.apk
 
-      - name: 📚 Get version from package.json
-        id: get-build-info
-        run: bash scripts/setGitHubOutput.sh
-
       - name: 🔔 Notify Slack of Production Build
         if: ${{ inputs.profile == 'production' }}
         uses: slackapi/slack-github-action@v1.25.0
         with:
           payload: |
             {
-              "text": "Android production build for Google Play Store submission is ready!\n```Artifact: ${{ steps.upload-artifact-production.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"
+              "text": "Android build is ready for submission. This is a production build! Download the artifact here: ${{ steps.upload-artifact-production.outputs.artifact-url }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
@@ -147,7 +140,7 @@ jobs:
         with:
           payload: |
             {
-              "text": "Android production build for GitHub/Obtanium is ready!\n```Artifact: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"
+              "text": "Android production APK build is ready for download. This is a production build, and you should add it to the GitHub release! Download the artifact here: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}"
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}

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

@@ -34,9 +34,6 @@ jobs:
           node-version-file: .nvmrc
           cache: yarn
 
-      - name: 🪛 Setup jq
-        uses: dcarbone/install-jq-action@v2
-
       - name: 🔨 Setup EAS
         uses: expo/expo-github-action@v8
         with:
@@ -84,22 +81,6 @@ jobs:
       - name: 🚀 Deploy
         run: eas submit -p ios --non-interactive --path build.ipa
 
-      - name: 📚 Get version from package.json
-        id: get-build-info
-        run: bash scripts/setGitHubOutput.sh
-
-      - name: 🔔 Notify Slack of Production Build
-        if: ${{ inputs.profile == 'production' }}
-        uses: slackapi/slack-github-action@v1.25.0
-        with:
-          payload: |
-            {
-              "text": "iOS production build for App Store submission is ready!\n```Artifact: Check TestFlight to know when it is available\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_IOS_BUILD_NUMBER }}```"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-
       - name: ⬇️ Restore Cache
         id: get-base-commit
         uses: actions/cache@v4

.github/workflows/golang-test-lint.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
       - name: Check
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
       - name: Lint

.gitignore

@@ -115,6 +115,3 @@ src/locale/locales/**/*.js
 *.apk
 *.aab
 *.ipa
-
-# ogcard assets
-bskyogcard/src/assets/fonts/noto-*

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npx lint-staged
+yarn lint-staged

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS build-env
+FROM golang:1.21-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 

Dockerfile.bskylink

@@ -1,41 +0,0 @@
-FROM node:20.11-alpine3.18 as build
-
-# Move files into the image and install
-WORKDIR /app
-
-COPY ./bskylink/package.json ./
-COPY ./bskylink/yarn.lock ./
-RUN yarn install --frozen-lockfile
-
-COPY ./bskylink ./
-
-# build then prune dev deps
-RUN yarn build
-RUN yarn install --production --ignore-scripts --prefer-offline
-
-# Uses assets from build stage to reduce build size
-FROM node:20.11-alpine3.18
-
-RUN apk add --update dumb-init
-
-# Avoid zombie processes, handle signal forwarding
-ENTRYPOINT ["dumb-init", "--"]
-
-WORKDIR /app
-COPY --from=build /app /app
-RUN mkdir /app/data && chown node /app/data
-
-VOLUME /app/data
-EXPOSE 3000
-ENV LINK_PORT=3000
-ENV NODE_ENV=production
-# potential perf issues w/ io_uring on this version of node
-ENV UV_USE_IO_URING=0
-
-# https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#non-root-user
-USER node
-CMD ["node", "--heapsnapshot-signal=SIGUSR2", "--enable-source-maps", "dist/bin.js"]
-
-LABEL org.opencontainers.image.source=https://github.com/bluesky-social/social-app
-LABEL org.opencontainers.image.description="Bsky Link Service"
-LABEL org.opencontainers.image.licenses=UNLICENSED

Dockerfile.bskyogcard

@@ -1,41 +0,0 @@
-FROM node:20.11-alpine3.18 as build
-
-# Move files into the image and install
-WORKDIR /app
-
-COPY ./bskyogcard/package.json ./
-COPY ./bskyogcard/yarn.lock ./
-RUN yarn install --frozen-lockfile
-
-COPY ./bskyogcard ./
-
-# build then prune dev deps
-RUN yarn install-fonts && yarn build
-RUN yarn install --production --ignore-scripts --prefer-offline
-
-# Uses assets from build stage to reduce build size
-FROM node:20.11-alpine3.18
-
-RUN apk add --update dumb-init
-
-# Avoid zombie processes, handle signal forwarding
-ENTRYPOINT ["dumb-init", "--"]
-
-WORKDIR /app
-COPY --from=build /app /app
-RUN mkdir /app/data && chown node /app/data
-
-VOLUME /app/data
-EXPOSE 3000
-ENV CARD_PORT=3000
-ENV NODE_ENV=production
-# potential perf issues w/ io_uring on this version of node
-ENV UV_USE_IO_URING=0
-
-# https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#non-root-user
-USER node
-CMD ["node", "--heapsnapshot-signal=SIGUSR2", "--enable-source-maps", "dist/bin.js"]
-
-LABEL org.opencontainers.image.source=https://github.com/bluesky-social/social-app
-LABEL org.opencontainers.image.description="Bsky Card Service"
-LABEL org.opencontainers.image.licenses=UNLICENSED

Dockerfile.embedr

@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS build-env
+FROM golang:1.21-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 

README.md

@@ -10,7 +10,7 @@ Get the app itself:
 
 ## Development Resources
 
-This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
+This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also on open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
 
 There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application.
 
@@ -42,10 +42,10 @@ 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 MobX with Redux or something.
+  - Refactoring the codebase, eg 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!
+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!
 
 ## Forking guidelines
 
@@ -63,7 +63,7 @@ If you discover any security issues, please send an email to security@bsky.app.
 
 ## Are you a developer interested in building on atproto?
 
-Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party integration can be as seamless as first-party through custom feeds, federated services, clients, and more.
+Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party can be as seamless as first-party through custom feeds, federated services, clients, and more.
 
 ## License (MIT)
 

__e2e__/flows/curate-lists.yml

@@ -144,7 +144,8 @@ appId: xyz.blueskyweb.app
     id: "homeScreenFeedTabs-Good Ppl"
 - tapOn:
     id: "e2eGotoLists"
-- tapOn: "Good Ppl"
+- tapOn:
+    id: "list-Good Ppl"
 
 - tapOn: "About"
 - assertVisible:
@@ -169,8 +170,9 @@ appId: xyz.blueskyweb.app
         id: "profilePager-selector"
     direction: LEFT
 - tapOn:
-    id: "profilePager-selector-6"
-- tapOn: "Good Ppl"
+    id: "profilePager-selector-5"
+- tapOn:
+    id: "list-Good Ppl"
 
 - tapOn:
     label: "Adds and removes users on curatelists from the profile"

__e2e__/flows/feed-reorder.yml

@@ -10,20 +10,16 @@ appId: xyz.blueskyweb.app
     id: "e2eSignInAlice"
 
 # Pin alice's feed
-- extendedWaitUntil:
-    visible:
-        id: "viewHeaderDrawerBtn"
 - tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn:
-    id: "profileCardButton"
+    id: "bottomBarProfileBtn"
 - swipe:
     from:
         id: "profilePager-selector"
     direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
-- tapOn: "alice-favs"
+- tapOn:
+    id: "feed-alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
     id: "bottomBarHomeBtn"
@@ -40,15 +36,12 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn: 
-    id: "editFeedsBtn"
+- tapOn: "Edit Saved Feeds"
 - tapOn:
     label: "Tap on down arrow"
     point: "79%,23%"
 - tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn:
-    id: "viewHeaderDrawerBtn"
+    id: "bottomBarHomeBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "alice-favs"
@@ -61,15 +54,11 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn: 
-    id: "editFeedsBtn"
 - tapOn:
     label: "Tap on down arrow"
     point: "79%,23%"
 - tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn:
-    id: "viewHeaderDrawerBtn"
+    id: "bottomBarHomeBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "Following"
@@ -82,15 +71,11 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn: 
-    id: "editFeedsBtn"
 - tapOn:
     label: "Tap on unpin"
     point: "91%,23%"
 - tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn:
-    id: "viewHeaderDrawerBtn"
+    id: "bottomBarHomeBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "alice-favs"

__e2e__/flows/home-screen.yml

@@ -9,9 +9,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "e2eSignInAlice"
 
-- extendedWaitUntil:
-    visible:
-        text: "Feeds ✨"
 - tapOn:
     label: "Can go to feeds page using feeds button in tab bar"
     text: "Feeds ✨"
@@ -26,27 +23,36 @@ appId: xyz.blueskyweb.app
     direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
-- tapOn: "alice-favs"
+- tapOn:
+    id: "feed-alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
     id: "bottomBarHomeBtn"
-- tapOn:
-    id: "viewHeaderDrawerBtn"
 - assertNotVisible: "Feeds ✨"
 
 - tapOn:
     label: "Can like posts"
     id: "likeBtn"
+- assertVisible:
+    id: "likeCount"
+    text: "1"
 - tapOn:
     id: "likeBtn"
+- assertNotVisible:
+    id: "likeCount"
 
 - tapOn:
     label: "Can repost posts"
     id: "repostBtn"
 - tapOn: "Repost"
+- assertVisible:
+    id: "repostCount"
+    text: "1"
 - tapOn:
     id: "repostBtn"
-- tapOn: "Remove repost"
+- tapOn: "Undo repost"
+- assertNotVisible:
+    id: "repostCount"
 
 - tapOn:
     label: "Can delete posts"

__e2e__/flows/onboarding-old.yml

@@ -0,0 +1,31 @@
+# Remove this test when the old onboarding is deprecated
+appId: xyz.blueskyweb.app
+---
+- runScript:
+    file: ../setupServer.js
+    env:
+        SERVER_PATH: "?users"
+- runFlow:
+    file: ../setupApp.yml
+- tapOn:
+    id: "e2eSignInAlice"
+- tapOn:
+    id: "e2eStartLongboarding"
+- tapOn: "Continue to next step"
+- tapOn: "Continue to the next step without following any accounts"
+- tapOn: Show replies in Following feed
+- tapOn: Show quote-posts in Following feed
+- tapOn: Show re-posts in Following feed
+- tapOn: Show replies in Following feed
+- waitForAnimationToEnd
+- tapOn: Continue to next step
+- waitForAnimationToEnd
+- tapOn: "Continue to the next step"
+- waitForAnimationToEnd
+- tapOn: Continue to next step
+- waitForAnimationToEnd
+- tapOn: Continue to next step
+- waitForAnimationToEnd
+- tapOn: "Complete onboarding and start using your account"
+- waitForAnimationToEnd
+- assertVisible: Following

__e2e__/flows/profile-screen-edit.yml

@@ -11,9 +11,6 @@ appId: xyz.blueskyweb.app
 
 
 # Navigate to my profile
-- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarProfileBtn"
 
@@ -24,7 +21,8 @@ appId: xyz.blueskyweb.app
     direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
-- assertVisible: "alice-favs"
+- assertVisible: 
+    id: "feed-alice-favs"
 - swipe:
     from:
         id: "profilePager-selector"

__e2e__/flows/profile-screen.yml

@@ -10,9 +10,6 @@ appId: xyz.blueskyweb.app
     id: "e2eSignInAlice"
 
 # Navigate to another user profile
-- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
 - tapOn:

__e2e__/flows/shared-prefs.yml

@@ -1,31 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../setupServer.js
-    env:
-      SERVER_PATH: "?users&posts&feeds"
-- runFlow:
-    file: ../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-- tapOn: "/sys/debug"
-- tapOn:
-    id: "sharedPrefsTestOpenBtn"
-- tapOn:
-    id: "setStringBtn"
-- assertVisible: "Hello"
-- tapOn:
-    id: "removeStringBtn"
-- assertVisible: "null"
-- tapOn:
-    id: "setBoolBtn"
-- assertVisible: "true"
-- tapOn:
-    id: "setNumberBtn"
-- assertVisible: "123"
-- tapOn:
-    id: "addToSetBtn"
-- assertVisible: "true"
-- tapOn:
-    id: "removeFromSetBtn"
-- assertVisible: "false"

__e2e__/flows/thread-screen.yml

@@ -11,8 +11,6 @@ appId: xyz.blueskyweb.app
 
 
 # Navigate to thread
-- extendedWaitUntil:
-    visible: "Thread root"
 - tapOn: "Thread root"
 - assertVisible: "Thread reply"
 
@@ -35,10 +33,18 @@ appId: xyz.blueskyweb.app
     id: "likeBtn"
     childOf:
         id: "postThreadItem-by-carla.test"
+- assertVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"
 - tapOn:
     id: "likeBtn"
     childOf:
         id: "postThreadItem-by-carla.test"
+- assertNotVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"
 
 # Can repost the root post
 - tapOn:
@@ -52,7 +58,7 @@ appId: xyz.blueskyweb.app
     id: "repostBtn"
     childOf:
         id: "postThreadItem-by-bob.test"
-- tapOn: "Remove repost"
+- tapOn: "Undo repost"
 - assertNotVisible:
     id: "repostCount-expanded"
 
@@ -71,7 +77,7 @@ appId: xyz.blueskyweb.app
     id: "repostBtn"
     childOf:
         id: "postThreadItem-by-carla.test"
-- tapOn: "Remove repost"
+- tapOn: "Undo repost"
 - assertNotVisible:
     id: "repostCount"
     childOf:

__tests__/lib/string.test.ts

@@ -1,16 +1,12 @@
 import {RichText} from '@atproto/api'
 
 import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
-import {
-  createStarterPackGooglePlayUri,
-  createStarterPackLinkFromAndroidReferrer,
-  parseStarterPackUri,
-} 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'
 import {detectLinkables} from '../../src/lib/strings/rich-text-detection'
 import {shortenLinks} from '../../src/lib/strings/rich-text-manip'
+import {ago} from '../../src/lib/strings/time'
 import {
   makeRecordUri,
   toNiceDomain,
@@ -146,6 +142,79 @@ describe('makeRecordUri', () => {
   })
 })
 
+// FIXME: Reenable after fixing non-deterministic test.
+describe.skip('ago', () => {
+  const oneYearDate = new Date(
+    new Date().setMonth(new Date().getMonth() - 11),
+  ).setDate(new Date().getDate() - 28)
+
+  const inputs = [
+    1671461038,
+    '04 Dec 1995 00:12:00 GMT',
+    new Date(),
+    new Date().setSeconds(new Date().getSeconds() - 10),
+    new Date().setMinutes(new Date().getMinutes() - 10),
+    new Date().setHours(new Date().getHours() - 1),
+    new Date().setDate(new Date().getDate() - 1),
+    new Date().setDate(new Date().getDate() - 20),
+    new Date().setDate(new Date().getDate() - 25),
+    new Date().setDate(new Date().getDate() - 28),
+    new Date().setDate(new Date().getDate() - 29),
+    new Date().setDate(new Date().getDate() - 30),
+    new Date().setMonth(new Date().getMonth() - 1),
+    new Date(new Date().setMonth(new Date().getMonth() - 1)).setDate(
+      new Date().getDate() - 20,
+    ),
+    new Date(new Date().setMonth(new Date().getMonth() - 1)).setDate(
+      new Date().getDate() - 25,
+    ),
+    new Date(new Date().setMonth(new Date().getMonth() - 1)).setDate(
+      new Date().getDate() - 28,
+    ),
+    new Date(new Date().setMonth(new Date().getMonth() - 1)).setDate(
+      new Date().getDate() - 29,
+    ),
+    new Date().setMonth(new Date().getMonth() - 11),
+    new Date(new Date().setMonth(new Date().getMonth() - 11)).setDate(
+      new Date().getDate() - 20,
+    ),
+    new Date(new Date().setMonth(new Date().getMonth() - 11)).setDate(
+      new Date().getDate() - 25,
+    ),
+    oneYearDate,
+  ]
+  const outputs = [
+    new Date(1671461038).toLocaleDateString(),
+    new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString(),
+    'now',
+    '10s',
+    '10m',
+    '1h',
+    '1d',
+    '20d',
+    '25d',
+    '28d',
+    '29d',
+    '1mo',
+    '1mo',
+    '1mo',
+    '1mo',
+    '2mo',
+    '2mo',
+    '11mo',
+    '11mo',
+    '11mo',
+    new Date(oneYearDate).toLocaleDateString(),
+  ]
+
+  it('correctly calculates how much time passed, in a string', () => {
+    for (let i = 0; i < inputs.length; i++) {
+      const result = ago(inputs[i])
+      expect(result).toEqual(outputs[i])
+    }
+  })
+})
+
 describe('makeValidHandle', () => {
   const inputs = [
     'test-handle-123',
@@ -340,14 +409,12 @@ describe('parseEmbedPlayerFromUrl', () => {
     'https://youtube.com/watch?v=videoId',
     'https://youtube.com/watch?v=videoId&feature=share',
     'https://youtube.com/shorts/videoId',
-    'https://youtube.com/live/videoId',
     'https://m.youtube.com/watch?v=videoId',
     'https://music.youtube.com/watch?v=videoId',
 
     'https://youtube.com/shorts/',
     'https://youtube.com/',
     'https://youtube.com/random',
-    'https://youtube.com/live/',
 
     'https://twitch.tv/channelName',
     'https://www.twitch.tv/channelName',
@@ -477,16 +544,10 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'youtube',
       playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
     },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
-    },
 
     undefined,
     undefined,
     undefined,
-    undefined,
 
     {
       type: 'twitch_video',
@@ -809,179 +870,3 @@ describe('parseEmbedPlayerFromUrl', () => {
     }
   })
 })
-
-describe('createStarterPackLinkFromAndroidReferrer', () => {
-  const validOutput = 'at://haileyok.com/app.bsky.graph.starterpack/rkey'
-
-  it('returns a link when input contains utm_source and utm_content', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_source=bluesky&utm_content=starterpack_haileyok.com_rkey',
-      ),
-    ).toEqual(validOutput)
-
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_source=bluesky&utm_content=starterpack_test-lover-9000.com_rkey',
-      ),
-    ).toEqual('at://test-lover-9000.com/app.bsky.graph.starterpack/rkey')
-  })
-
-  it('returns a link when input contains utm_source and utm_content in different order', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_content=starterpack_haileyok.com_rkey&utm_source=bluesky',
-      ),
-    ).toEqual(validOutput)
-  })
-
-  it('returns a link when input contains other parameters as well', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_source=bluesky&utm_medium=starterpack&utm_content=starterpack_haileyok.com_rkey',
-      ),
-    ).toEqual(validOutput)
-  })
-
-  it('returns null when utm_source is not present', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_content=starterpack_haileyok.com_rkey',
-      ),
-    ).toEqual(null)
-  })
-
-  it('returns null when utm_content is not present', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer('utm_source=bluesky'),
-    ).toEqual(null)
-  })
-
-  it('returns null when utm_content is malformed', () => {
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_content=starterpack_haileyok.com',
-      ),
-    ).toEqual(null)
-
-    expect(
-      createStarterPackLinkFromAndroidReferrer('utm_content=starterpack'),
-    ).toEqual(null)
-
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_content=starterpack_haileyok.com_rkey_more',
-      ),
-    ).toEqual(null)
-
-    expect(
-      createStarterPackLinkFromAndroidReferrer(
-        'utm_content=notastarterpack_haileyok.com_rkey',
-      ),
-    ).toEqual(null)
-  })
-})
-
-describe('parseStarterPackHttpUri', () => {
-  const baseUri = 'https://bsky.app/start'
-
-  it('returns a valid at uri when http uri is valid', () => {
-    const validHttpUri = `${baseUri}/haileyok.com/rkey`
-    expect(parseStarterPackUri(validHttpUri)).toEqual({
-      name: 'haileyok.com',
-      rkey: 'rkey',
-    })
-
-    const validHttpUri2 = `${baseUri}/haileyok.com/ilovetesting`
-    expect(parseStarterPackUri(validHttpUri2)).toEqual({
-      name: 'haileyok.com',
-      rkey: 'ilovetesting',
-    })
-
-    const validHttpUri3 = `${baseUri}/testlover9000.com/rkey`
-    expect(parseStarterPackUri(validHttpUri3)).toEqual({
-      name: 'testlover9000.com',
-      rkey: 'rkey',
-    })
-  })
-
-  it('returns null when there is no rkey', () => {
-    const validHttpUri = `${baseUri}/haileyok.com`
-    expect(parseStarterPackUri(validHttpUri)).toEqual(null)
-  })
-
-  it('returns null when there is an extra path', () => {
-    const validHttpUri = `${baseUri}/haileyok.com/rkey/other`
-    expect(parseStarterPackUri(validHttpUri)).toEqual(null)
-  })
-
-  it('returns null when there is no handle or rkey', () => {
-    const validHttpUri = `${baseUri}`
-    expect(parseStarterPackUri(validHttpUri)).toEqual(null)
-  })
-
-  it('returns null when the route is not /start or /starter-pack', () => {
-    const validHttpUri = 'https://bsky.app/start/haileyok.com/rkey'
-    expect(parseStarterPackUri(validHttpUri)).toEqual({
-      name: 'haileyok.com',
-      rkey: 'rkey',
-    })
-
-    const validHttpUri2 = 'https://bsky.app/starter-pack/haileyok.com/rkey'
-    expect(parseStarterPackUri(validHttpUri2)).toEqual({
-      name: 'haileyok.com',
-      rkey: 'rkey',
-    })
-
-    const invalidHttpUri = 'https://bsky.app/profile/haileyok.com/rkey'
-    expect(parseStarterPackUri(invalidHttpUri)).toEqual(null)
-  })
-
-  it('returns the at uri when the input is a valid starterpack at uri', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.starterpack/rkey'
-    expect(parseStarterPackUri(validAtUri)).toEqual({
-      name: 'did:123',
-      rkey: 'rkey',
-    })
-  })
-
-  it('returns null when the at uri has no rkey', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.starterpack'
-    expect(parseStarterPackUri(validAtUri)).toEqual(null)
-  })
-
-  it('returns null when the collection is not app.bsky.graph.starterpack', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.list/rkey'
-    expect(parseStarterPackUri(validAtUri)).toEqual(null)
-  })
-
-  it('returns null when the input is undefined', () => {
-    expect(parseStarterPackUri(undefined)).toEqual(null)
-  })
-})
-
-describe('createStarterPackGooglePlayUri', () => {
-  const base =
-    'https://play.google.com/store/apps/details?id=xyz.blueskyweb.app&referrer=utm_source%3Dbluesky%26utm_medium%3Dstarterpack%26utm_content%3Dstarterpack_'
-
-  it('returns valid google play uri when input is valid', () => {
-    expect(createStarterPackGooglePlayUri('name', 'rkey')).toEqual(
-      `${base}name_rkey`,
-    )
-  })
-
-  it('returns null when no rkey is supplied', () => {
-    // @ts-expect-error test
-    expect(createStarterPackGooglePlayUri('name', undefined)).toEqual(null)
-  })
-
-  it('returns null when no name or rkey are supplied', () => {
-    // @ts-expect-error test
-    expect(createStarterPackGooglePlayUri(undefined, undefined)).toEqual(null)
-  })
-
-  it('returns null when rkey is supplied but no name', () => {
-    // @ts-expect-error test
-    expect(createStarterPackGooglePlayUri(undefined, 'rkey')).toEqual(null)
-  })
-})

app.config.js

@@ -39,15 +39,6 @@ module.exports = function (config) {
   const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
   const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
 
-  const ASSOCIATED_DOMAINS = [
-    'applinks:bsky.app',
-    'applinks:staging.bsky.app',
-    'appclips:bsky.app',
-    'appclips:go.bsky.app', // Allows App Clip to work when scanning QR codes
-    // When testing local services, enter an ngrok (et al) domain here. It must use a standard HTTP/HTTPS port.
-    ...(IS_DEV || IS_TESTFLIGHT ? [] : []),
-  ]
-
   const UPDATES_CHANNEL = IS_TESTFLIGHT
     ? 'testflight'
     : IS_PRODUCTION
@@ -92,7 +83,7 @@ module.exports = function (config) {
           NSPhotoLibraryUsageDescription:
             'Used for profile pictures, posts, and other kinds of content',
         },
-        associatedDomains: ASSOCIATED_DOMAINS,
+        associatedDomains: ['applinks:bsky.app', 'applinks:staging.bsky.app'],
         splash: {
           ...SPLASH_CONFIG,
           dark: DARK_SPLASH_CONFIG,
@@ -191,7 +182,7 @@ module.exports = function (config) {
           'expo-build-properties',
           {
             ios: {
-              deploymentTarget: '15.1',
+              deploymentTarget: '14.0',
               newArchEnabled: false,
             },
             android: {
@@ -211,17 +202,14 @@ module.exports = function (config) {
             sounds: PLATFORM === 'ios' ? ['assets/dm.aiff'] : ['assets/dm.mp3'],
           },
         ],
-        'expo-video',
-        'react-native-compressor',
-        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
         './plugins/withAndroidManifestPlugin.js',
         './plugins/withAndroidManifestFCMIconPlugin.js',
+        './plugins/withAndroidManifestLaunchModePlugin.js',
         './plugins/withAndroidStylesWindowBackgroundPlugin.js',
         './plugins/withAndroidStylesAccentColorPlugin.js',
         './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
         './plugins/shareExtension/withShareExtensions.js',
         './plugins/notificationsExtension/withNotificationsExtension.js',
-        './plugins/withAppDelegateReferrer.js',
       ].filter(Boolean),
       extra: {
         eas: {
@@ -247,10 +235,6 @@ module.exports = function (config) {
                       ],
                     },
                   },
-                  {
-                    targetName: 'BlueskyClip',
-                    bundleIdentifier: 'xyz.blueskyweb.app.AppClip',
-                  },
                 ],
               },
             },

assets/icons/arrowBottom_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 21a1 1 0 0 1-.707-.293l-6-6a1 1 0 1 1 1.414-1.414L11 17.586V4a1 1 0 1 1 2 0v13.586l4.293-4.293a1 1 0 0 1 1.414 1.414l-6 6A1 1 0 0 1 12 21Z" clip-rule="evenodd"/></svg>

assets/icons/arrowRight_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M21 12a1 1 0 0 1-.293.707l-6 6a1 1 0 0 1-1.414-1.414L17.586 13H4a1 1 0 1 1 0-2h13.586l-4.293-4.293a1 1 0 0 1 1.414-1.414l6 6A1 1 0 0 1 21 12Z" clip-rule="evenodd"/></svg>

assets/icons/arrowsDiagonalIn_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M20.957 3.043a1 1 0 0 1 0 1.414L16.414 9H20a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1V4a1 1 0 1 1 2 0v3.586l4.543-4.543a1 1 0 0 1 1.414 0ZM3 14a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 1 1-2 0v-3.586l-4.543 4.543a1 1 0 0 1-1.414-1.414L7.586 15H4a1 1 0 0 1-1-1Z" fill="#000"/></svg>

assets/icons/arrowsDiagonalIn_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M20.957 3.043a1 1 0 0 1 0 1.414L16.414 9H20a1 1 0 1 1 0 2h-5a2 2 0 0 1-2-2V4a1 1 0 1 1 2 0v3.586l4.543-4.543a1 1 0 0 1 1.414 0ZM3 14a1 1 0 0 1 1-1h5a2 2 0 0 1 2 2v5a1 1 0 1 1-2 0v-3.586l-4.543 4.543a1 1 0 0 1-1.414-1.414L7.586 15H4a1 1 0 0 1-1-1Z" fill="#000"/></svg>

assets/icons/arrowsDiagonalOut_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5a1 1 0 1 1 0-2h6a1 1 0 0 1 1 1v6a1 1 0 1 1-2 0V6.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L17.586 5H14ZM4 13a1 1 0 0 1 1 1v3.586l4.293-4.293a1 1 0 0 1 1.414 1.414L6.414 19H10a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1Z" fill="#000"/></svg>

assets/icons/arrowsDiagonalOut_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M13 4a1 1 0 0 1 1-1h5a2 2 0 0 1 2 2v5a1 1 0 1 1-2 0V6.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L17.586 5H14a1 1 0 0 1-1-1Zm-9 9a1 1 0 0 1 1 1v3.586l4.293-4.293a1 1 0 0 1 1.414 1.414L6.414 19H10a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2v-5a1 1 0 0 1 1-1Z" fill="#000"/></svg>

assets/icons/cc_filled_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm11.543 7.293a1 1 0 0 1 1.414 0 1 1 0 0 0 1.414-1.414 3 3 0 1 0 0 4.242 1 1 0 0 0-1.414-1.414 1 1 0 0 1-1.414-1.414Zm-6 0a1 1 0 0 1 1.414 0 1 1 0 0 0 1.414-1.414 3 3 0 1 0 0 4.243 1 1 0 0 0-1.414-1.415 1 1 0 0 1-1.414-1.414Z" fill="#000"/></svg>

assets/icons/cc_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v14h14V5H5Zm10.957 6.293a1 1 0 1 0 0 1.414 1 1 0 0 1 1.414 1.414 3 3 0 1 1 0-4.242 1 1 0 0 1-1.414 1.414Zm-6.331-.22a1 1 0 1 0 .331 1.634 1 1 0 0 1 1.414 1.414 3 3 0 1 1 0-4.242 1 1 0 0 1-1.414 1.414.994.994 0 0 0-.331-.22Z" fill="#000"/></svg>

assets/icons/crop_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M6 2a1 1 0 0 1 1 1v2h11a1 1 0 0 1 1 1v11h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2H6a1 1 0 0 1-1-1V7H3a1 1 0 0 1 0-2h2V3a1 1 0 0 1 1-1Zm1 5v10h10V7H7Z" clip-rule="evenodd"/></svg>

assets/icons/download_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 3a1 1 0 0 1 1 1v8.086l1.793-1.793a1 1 0 1 1 1.414 1.414l-3.5 3.5a1 1 0 0 1-1.414 0l-3.5-3.5a1 1 0 1 1 1.414-1.414L11 12.086V4a1 1 0 0 1 1-1ZM4 14a1 1 0 0 1 1 1v4h14v-4a1 1 0 1 1 2 0v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-5a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>

assets/icons/eye_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.135 12C5.413 16.088 8.77 18 12 18s6.587-1.912 8.865-6C18.587 7.912 15.23 6 12 6c-3.228 0-6.587 1.912-8.865 6ZM12 4c4.24 0 8.339 2.611 10.888 7.54a1 1 0 0 1 0 .92C20.338 17.388 16.24 20 12 20c-4.24 0-8.339-2.611-10.888-7.54a1 1 0 0 1 0-.92C3.662 6.612 7.76 4 12 4Zm0 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4Zm-4 2a4 4 0 1 1 8 0 4 4 0 0 1-8 0Z" clip-rule="evenodd"/></svg>

assets/icons/listPlus_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 5a1 1 0 0 0 0 2h16a1 1 0 1 0 0-2H4Zm0 12a1 1 0 1 0 0 2h3a1 1 0 1 0 0-2H4Zm-1-5a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1Zm14-3c.552 0 1 .41 1 .917V13.5h3.583c.507 0 .917.448.917 1s-.41 1-.917 1H18v3.583c0 .507-.448.917-1 .917s-1-.41-1-.917V15.5h-3.583c-.507 0-.917-.448-.917-1s.41-1 .917-1H16V9.917C16 9.41 16.448 9 17 9Z" clip-rule="evenodd"/></svg>

assets/icons/menu_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm0 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm0 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/moon_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.097 2.53a1 1 0 0 1-.041 1.07 6 6 0 0 0 8.345 8.344 1 1 0 0 1 1.563.908c-.434 5.122-4.728 9.144-9.962 9.144-5.522 0-9.998-4.476-9.998-9.998 0-5.234 4.021-9.528 9.144-9.962a1 1 0 0 1 .949.494ZM9.424 4.424a7.998 7.998 0 1 0 10.152 10.152A8 8 0 0 1 9.424 4.424Z" clip-rule="evenodd"/></svg>

assets/icons/newskie.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#FFC404" fill-rule="evenodd" d="M11.183 8.561c0 .544.348.984.892.984.545 0 .893-.44.893-.985V6.985c0-.544-.348-.985-.893-.985-.543 0-.892.44-.892.985v1.576Zm5.94 7.481c0 .539-.438.942-.976.942H8.004c-.538 0-.975-.411-.975-.95 0-2.782 2.264-5.021 5.046-5.021 2.783 0 5.047 2.247 5.047 5.03Zm-.43-4.584a.983.983 0 0 1 0-1.393l1.114-1.114a.985.985 0 0 1 1.393 1.393l-1.114 1.114a.985.985 0 0 1-1.393 0Zm2.897 3.741h1.575c.544 0 .985.349.985.892 0 .544-.44.892-.985.892h-1.67a.872.872 0 0 1-.89-.887c0-.543.44-.897.985-.897Zm-14.045.893c0-.544-.44-.892-.985-.892H2.985c-.544 0-.985.349-.985.892 0 .544.44.892.985.892H4.56c.545 0 .985-.349.985-.892Zm1.913-6.027a.985.985 0 0 1-1.393 1.393L4.95 10.344A.985.985 0 0 1 6.344 8.95l1.114 1.114Z" clip-rule="evenodd"/></svg>

assets/icons/pause_filled_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4 4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4ZM14 4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1h-4a1 1 0 0 1-1-1V4Z" fill="#000"/></svg>

assets/icons/pause_filled_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4 6a3 3 0 0 1 6 0v12a3 3 0 1 1-6 0V6ZM14 6a3 3 0 1 1 6 0v12a3 3 0 1 1-6 0V6Z" fill="#000"/></svg>

assets/icons/pause_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4Zm2 1v14h2V5H6Zm8-1a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1h-4a1 1 0 0 1-1-1V4Zm2 1v14h2V5h-2Z" fill="#000"/></svg>

assets/icons/pause_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 6a3 3 0 0 1 6 0v12a3 3 0 1 1-6 0V6Zm3-1a1 1 0 0 0-1 1v12a1 1 0 1 0 2 0V6a1 1 0 0 0-1-1Zm7 1a3 3 0 1 1 6 0v12a3 3 0 1 1-6 0V6Zm3-1a1 1 0 0 0-1 1v12a1 1 0 1 0 2 0V6a1 1 0 0 0-1-1Z" fill="#000"/></svg>

assets/icons/phone_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5 4a3 3 0 0 1 3-3h8a3 3 0 0 1 3 3v16a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V4Zm3-1a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H8Zm2 2a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/pin_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M6.5 3a1 1 0 0 1 1-1h9a1 1 0 0 1 1 1v3.997a6.25 6.25 0 0 0 1.83 4.42l.377.376A1 1 0 0 1 20 12.5V15a1 1 0 0 1-1 1h-6v5a1 1 0 1 1-2 0v-5H5a1 1 0 0 1-1-1v-2.5a1 1 0 0 1 .293-.707l.376-.377A6.25 6.25 0 0 0 6.5 6.996V3.001Zm2 1v2.997a8.25 8.25 0 0 1-2.416 5.834L6 12.914V14h12v-1.086l-.084-.083A8.25 8.25 0 0 1 15.5 6.997V4h-7Z" clip-rule="evenodd"/></svg>

assets/icons/play_filled_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.514 2.143A1 1 0 0 0 5 3v18a1 1 0 0 0 1.514.858l15-9a1 1 0 0 0 0-1.716l-15-9Z" fill="#000"/></svg>

assets/icons/play_filled_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9.576 2.534C7.578 1.299 5 2.737 5 5.086v13.828c0 2.35 2.578 3.787 4.576 2.552l11.194-6.914c1.899-1.172 1.899-3.932 0-5.104L9.576 2.534Z"/></svg>

assets/icons/play_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M5.507 2.13a1 1 0 0 1 1.008.013l15 9a1 1 0 0 1 0 1.714l-15 9A1 1 0 0 1 5 21V3a1 1 0 0 1 .507-.87ZM7 4.766v14.468L19.056 12 7 4.766Z" fill="#000"/></svg>

assets/icons/play_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5 5.086C5 2.736 7.578 1.3 9.576 2.534L20.77 9.448c1.899 1.172 1.899 3.932 0 5.104L9.576 21.466C7.578 22.701 5 21.263 5 18.914V5.086Zm3.525-.85A1 1 0 0 0 7 5.085v13.828a1 1 0 0 0 1.525.85l11.194-6.913a1 1 0 0 0 0-1.702L8.525 4.235Z" clip-rule="evenodd"/></svg>

assets/icons/qrCode_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" fill-rule="evenodd" d="M3 5a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm6 0H5v4h4V5ZM3 15a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4Zm6 0H5v4h4v-4ZM13 5a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2V5Zm6 0h-4v4h4V5ZM14 13a1 1 0 0 1 1 1v1h1a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1v-2a1 1 0 0 1 1-1Zm3 1a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Zm0 4a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-1v1a1 1 0 1 1-2 0v-2Z" clip-rule="evenodd"/></svg>

assets/icons/shapes_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M7 3a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2H8v2a1 1 0 1 1-2 0V8H4a1 1 0 0 1 0-2h2V4a1 1 0 0 1 1-1Zm6 4a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm4-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4ZM3 14a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-6Zm2 1v4h4v-4H5Zm9.171-.829a1 1 0 0 1 1.415 0L17 15.585l1.414-1.414a1 1 0 1 1 1.414 1.414L18.414 17l1.414 1.414a1 1 0 0 1-1.414 1.414L17 18.414l-1.415 1.414a1 1 0 0 1-1.414-1.414l1.415-1.415-1.415-1.414a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/star_filled_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12.902 1.568a1 1 0 0 0-1.804 0L8.455 7.085l-6.085.799a1 1 0 0 0-.557 1.718l4.45 4.207-1.117 6.008a1 1 0 0 0 1.458 1.063L12 17.962l5.396 2.918a1 1 0 0 0 1.459-1.063l-1.117-6.008 4.45-4.207a1 1 0 0 0-.558-1.718l-6.085-.8-2.643-5.516Z"/></svg>

assets/icons/star_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 1a1 1 0 0 1 .902.568l2.643 5.517 6.085.799a1 1 0 0 1 .557 1.718l-4.45 4.207 1.118 6.008a1 1 0 0 1-1.46 1.063L12 17.962 6.604 20.88a1 1 0 0 1-1.459-1.063l1.117-6.008-4.45-4.207a1 1 0 0 1 .558-1.718l6.085-.8 2.643-5.516A1 1 0 0 1 12 1Zm0 3.315-1.975 4.123a1 1 0 0 1-.772.56l-4.538.595 3.317 3.137a1 1 0 0 1 .296.91l-.834 4.485 4.03-2.179a1 1 0 0 1 .952 0l4.03 2.179-.834-4.485a1 1 0 0 1 .296-.91l3.317-3.137-4.538-.596a1 1 0 0 1-.772-.56L12 4.316Z" clip-rule="evenodd"/></svg>

assets/icons/starterPack.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.26 5.227 5.02 6.899c-.734.197-1.17.95-.973 1.685l1.672 6.24c.197.734.951 1.17 1.685.973l6.24-1.672c.734-.197 1.17-.951.973-1.685L12.945 6.2a1.375 1.375 0 0 0-1.685-.973Zm-6.566.459a2.632 2.632 0 0 0-1.86 3.223l1.672 6.24a2.632 2.632 0 0 0 3.223 1.861l6.24-1.672a2.631 2.631 0 0 0 1.861-3.223l-1.672-6.24a2.632 2.632 0 0 0-3.223-1.861l-6.24 1.672Z" clip-rule="evenodd"/><path fill="#000" fill-rule="evenodd" d="M15.138 18.411a4.606 4.606 0 1 0 0-9.211 4.606 4.606 0 0 0 0 9.211Zm0 1.257a5.862 5.862 0 1 0 0-11.724 5.862 5.862 0 0 0 0 11.724Z" clip-rule="evenodd"/></svg>

assets/icons/starter_pack_icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 153 133"><path fill="url(#a)" fill-rule="evenodd" d="m60.196 105.445-18.1 4.85c-11.73 3.143-23.788-3.819-26.931-15.55L1.19 42.597c-3.143-11.731 3.819-23.79 15.55-26.932L68.889 1.69C80.62-1.452 92.68 5.51 95.821 17.241l4.667 17.416a49.7 49.7 0 0 1 3.522-.125c27.053 0 48.984 21.931 48.984 48.984S131.063 132.5 104.01 132.5c-19.17 0-35.769-11.012-43.814-27.055ZM19.457 25.804 71.606 11.83c6.131-1.643 12.434 1.996 14.076 8.127l4.44 16.571c-20.289 5.987-35.096 24.758-35.096 46.988 0 4.157.517 8.193 1.492 12.047l-17.138 4.593c-6.131 1.642-12.434-1.996-14.077-8.128L11.33 39.88c-1.643-6.131 1.996-12.434 8.127-14.077Zm83.812 19.232c.246-.005.493-.007.741-.007 21.256 0 38.487 17.231 38.487 38.487s-17.231 38.488-38.487 38.488c-14.29 0-26.76-7.788-33.4-19.35l23.635-6.333c11.731-3.143 18.693-15.2 15.55-26.932l-6.526-24.353Zm-10.428 1.638 6.815 25.432c1.642 6.131-1.996 12.434-8.128 14.076l-24.867 6.664a38.57 38.57 0 0 1-1.139-9.33c0-17.372 11.51-32.056 27.32-36.842Z" clip-rule="evenodd"/><defs><linearGradient id="a" x1="76.715" x2="76.715" y1=".937" y2="132.5" gradientUnits="userSpaceOnUse"><stop stop-color="#0A7AFF"/><stop offset="1" stop-color="#59B9FF"/></linearGradient></defs></svg>

assets/icons/videoClip_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v2h2V5H5Zm4 0v6h6V5H9Zm8 0v2h2V5h-2Zm2 4h-2v2h2V9Zm0 4h-2v2.444h2V13Zm0 4.444h-2V19h2v-1.556ZM15 19v-6H9v6h6Zm-8 0v-2H5v2h2Zm-2-4h2v-2H5v2Zm0-4h2V9H5v2Z" clip-rule="evenodd"/></svg>

bskyembed/.eslintrc

@@ -10,12 +10,11 @@
   ],
   "rules": {
     "simple-import-sort/imports": "warn",
-    "simple-import-sort/exports": "warn",
-    'no-else-return': 'off'
+    "simple-import-sort/exports": "warn"
   },
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": "latest",
     "project": "./bskyembed/tsconfig.json"
   }
-}
+}

bskyembed/assets/play_filled_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#fff" d="M9.576 2.534C7.578 1.299 5 2.737 5 5.086v13.828c0 2.35 2.578 3.787 4.576 2.552l11.194-6.914c1.899-1.172 1.899-3.932 0-5.104L9.576 2.534Z"/></svg>

bskyembed/assets/starterPack.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><defs><linearGradient x1="0" y1="0" x2="100%" y2="0" gradientTransform="rotate(45)" id="sky_V5w1FF_xb91wVQ_1euhBX"><stop offset="0" stop-color="#0A7AFF"></stop><stop offset="1" stop-color="#59B9FF"></stop></linearGradient></defs><path fill="url(#sky_V5w1FF_xb91wVQ_1euhBX)" fill-rule="evenodd" clip-rule="evenodd" d="M11.26 5.227 5.02 6.899c-.734.197-1.17.95-.973 1.685l1.672 6.24c.197.734.951 1.17 1.685.973l6.24-1.672c.734-.197 1.17-.951.973-1.685L12.945 6.2a1.375 1.375 0 0 0-1.685-.973Zm-6.566.459a2.632 2.632 0 0 0-1.86 3.223l1.672 6.24a2.632 2.632 0 0 0 3.223 1.861l6.24-1.672a2.631 2.631 0 0 0 1.861-3.223l-1.672-6.24a2.632 2.632 0 0 0-3.223-1.861l-6.24 1.672Z"></path><path fill="url(#sky_V5w1FF_xb91wVQ_1euhBX)" fill-rule="evenodd" clip-rule="evenodd" d="M15.138 18.411a4.606 4.606 0 1 0 0-9.211 4.606 4.606 0 0 0 0 9.211Zm0 1.257a5.862 5.862 0 1 0 0-11.724 5.862 5.862 0 0 0 0 11.724Z"></path></svg>

bskyembed/package.json

@@ -9,7 +9,7 @@
     "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src"
   },
   "dependencies": {
-    "@atproto/api": "0.13.6",
+    "@atproto/api": "^0.12.2",
     "@preact/preset-vite": "^2.8.2",
     "@vitejs/plugin-legacy": "^5.3.2",
     "preact": "^10.4.8",
@@ -22,7 +22,7 @@
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.5.4",
+    "typescript": "^4.0.5",
     "vite": "^5.2.8",
     "vite-tsconfig-paths": "^4.3.2"
   }

bskyembed/src/components/embed.tsx

@@ -3,20 +3,15 @@ import {
   AppBskyEmbedImages,
   AppBskyEmbedRecord,
   AppBskyEmbedRecordWithMedia,
-  AppBskyEmbedVideo,
   AppBskyFeedDefs,
   AppBskyFeedPost,
   AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
   AppBskyLabelerDefs,
-  AtUri,
 } from '@atproto/api'
 import {ComponentChildren, h} from 'preact'
 import {useMemo} from 'preact/hooks'
 
 import infoIcon from '../../assets/circleInfo_stroke2_corner0_rounded.svg'
-import playIcon from '../../assets/play_filled_corner2_rounded.svg'
-import starterPackIcon from '../../assets/starterPack.svg'
 import {CONTENT_LABELS, labelsToInfo} from '../labels'
 import {getRkey} from '../utils'
 import {Link} from './link'
@@ -110,7 +105,7 @@ export function Embed({
       // Case 3.2: List
       if (AppBskyGraphDefs.isListView(record)) {
         return (
-          <GenericWithImageEmbed
+          <GenericWithImage
             image={record.avatar}
             title={record.name}
             href={`/profile/${record.creator.did}/lists/${getRkey(record)}`}
@@ -127,7 +122,7 @@ export function Embed({
       // Case 3.3: Feed
       if (AppBskyFeedDefs.isGeneratorView(record)) {
         return (
-          <GenericWithImageEmbed
+          <GenericWithImage
             image={record.avatar}
             title={record.displayName}
             href={`/profile/${record.creator.did}/feed/${getRkey(record)}`}
@@ -139,35 +134,31 @@ export function Embed({
 
       // Case 3.4: Labeler
       if (AppBskyLabelerDefs.isLabelerView(record)) {
-        // Embed type does not exist in the app, so show nothing
-        return null
+        return (
+          <GenericWithImage
+            image={record.creator.avatar}
+            title={record.creator.displayName || record.creator.handle}
+            href={`/profile/${record.creator.did}`}
+            subtitle="Labeler"
+            description={`Liked by ${record.likeCount ?? 0} users`}
+          />
+        )
       }
 
-      // Case 3.5: Starter pack
-      if (AppBskyGraphDefs.isStarterPackViewBasic(record)) {
-        return <StarterPackEmbed content={record} />
-      }
-
-      // Case 3.6: Post not found
+      // Case 3.5: Post not found
       if (AppBskyEmbedRecord.isViewNotFound(record)) {
         return <Info>Quoted post not found, it may have been deleted.</Info>
       }
 
-      // Case 3.7: Post blocked
+      // Case 3.6: Post blocked
       if (AppBskyEmbedRecord.isViewBlocked(record)) {
         return <Info>The quoted post is blocked.</Info>
       }
 
-      // Unknown embed type
-      return null
+      throw new Error('Unknown embed type')
     }
 
-    // Case 4: Video
-    if (AppBskyEmbedVideo.isView(content)) {
-      return <VideoEmbed content={content} />
-    }
-
-    // Case 5: Record with media
+    // Case 4: Record with media
     if (
       AppBskyEmbedRecordWithMedia.isView(content) &&
       AppBskyEmbedRecord.isViewRecord(content.record.record)
@@ -191,8 +182,7 @@ export function Embed({
       )
     }
 
-    // Unknown embed type
-    return null
+    throw new Error('Unsupported embed type')
   } catch (err) {
     return (
       <Info>{err instanceof Error ? err.message : 'An error occurred'}</Info>
@@ -324,7 +314,7 @@ function ExternalEmbed({
   )
 }
 
-function GenericWithImageEmbed({
+function GenericWithImage({
   title,
   subtitle,
   href,
@@ -360,89 +350,3 @@ function GenericWithImageEmbed({
     </Link>
   )
 }
-
-// just the thumbnail and a play button
-function VideoEmbed({content}: {content: AppBskyEmbedVideo.View}) {
-  let aspectRatio = 1
-
-  if (content.aspectRatio) {
-    const {width, height} = content.aspectRatio
-    aspectRatio = clamp(width / height, 1 / 1, 3 / 1)
-  }
-
-  return (
-    <div
-      className="w-full overflow-hidden rounded-lg aspect-square relative"
-      style={{aspectRatio: `${aspectRatio} / 1`}}>
-      <img
-        src={content.thumbnail}
-        alt={content.alt}
-        className="object-cover size-full"
-      />
-      <div className="size-24 absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 rounded-full bg-black/50 flex items-center justify-center">
-        <img src={playIcon} className="object-cover size-3/5" />
-      </div>
-    </div>
-  )
-}
-
-function StarterPackEmbed({
-  content,
-}: {
-  content: AppBskyGraphDefs.StarterPackViewBasic
-}) {
-  if (!AppBskyGraphStarterpack.isRecord(content.record)) {
-    return null
-  }
-
-  const starterPackHref = getStarterPackHref(content)
-  const imageUri = getStarterPackImage(content)
-
-  return (
-    <Link
-      href={starterPackHref}
-      className="w-full rounded-lg overflow-hidden border 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">
-          <img src={starterPackIcon} className="w-10 h-10" />
-          <div>
-            <p className="font-semibold leading-[21px]">
-              {content.record.name}
-            </p>
-            <p className="text-sm text-textLight line-clamp-2 leading-[18px]">
-              Starter pack by{' '}
-              {content.creator.displayName || `@${content.creator.handle}`}
-            </p>
-          </div>
-        </div>
-        {content.record.description && (
-          <p className="text-sm mt-1">{content.record.description}</p>
-        )}
-        {!!content.joinedAllTimeCount && content.joinedAllTimeCount > 50 && (
-          <p className="text-sm font-semibold text-textLight mt-1">
-            {content.joinedAllTimeCount} users have joined!
-          </p>
-        )}
-      </div>
-    </Link>
-  )
-}
-
-// from #/lib/strings/starter-pack.ts
-function getStarterPackImage(starterPack: AppBskyGraphDefs.StarterPackView) {
-  const rkey = new AtUri(starterPack.uri).rkey
-  return `https://ogcard.cdn.bsky.app/start/${starterPack.creator.did}/${rkey}`
-}
-
-function getStarterPackHref(
-  starterPack: AppBskyGraphDefs.StarterPackViewBasic,
-) {
-  const rkey = new AtUri(starterPack.uri).rkey
-  const handleOrDid = starterPack.creator.handle || starterPack.creator.did
-  return `/starter-pack/${handleOrDid}/${rkey}`
-}
-
-function clamp(num: number, min: number, max: number) {
-  return Math.max(min, Math.min(num, max))
-}

bskyembed/src/components/post.tsx

@@ -11,7 +11,7 @@ import likeIcon from '../../assets/heart2_filled_stroke2_corner0_rounded.svg'
 import logo from '../../assets/logo.svg'
 import repostIcon from '../../assets/repost_stroke2_corner2_rounded.svg'
 import {CONTENT_LABELS} from '../labels'
-import {getRkey, niceDate, prettyNumber} from '../utils'
+import {getRkey, niceDate} from '../utils'
 import {Container} from './container'
 import {Embed} from './embed'
 import {Link} from './link'
@@ -78,7 +78,7 @@ export function Post({thread}: Props) {
             <div className="flex items-center gap-2 cursor-pointer">
               <img src={likeIcon} className="w-5 h-5" />
               <p className="font-bold text-neutral-500 mb-px">
-                {prettyNumber(post.likeCount)}
+                {post.likeCount}
               </p>
             </div>
           )}
@@ -86,7 +86,7 @@ export function Post({thread}: Props) {
             <div className="flex items-center gap-2 cursor-pointer">
               <img src={repostIcon} className="w-5 h-5" />
               <p className="font-bold text-neutral-500 mb-px">
-                {prettyNumber(post.repostCount)}
+                {post.repostCount}
               </p>
             </div>
           )}
@@ -97,7 +97,7 @@ export function Post({thread}: Props) {
           <div className="flex-1" />
           <p className="cursor-pointer text-brand font-bold hover:underline hidden min-[450px]:inline">
             {post.replyCount
-              ? `Read ${prettyNumber(post.replyCount)} ${
+              ? `Read ${post.replyCount} ${
                   post.replyCount > 1 ? 'replies' : 'reply'
                 } on Bluesky`
               : `View on Bluesky`}
@@ -132,10 +132,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
           key={counter}
           href={segment.link.uri}
           className="text-blue-400 hover:underline"
-          disableTracking={
-            !segment.link.uri.startsWith('https://bsky.app') &&
-            !segment.link.uri.startsWith('https://go.bsky.app')
-          }>
+          disableTracking={!segment.link.uri.startsWith('https://bsky.app')}>
           {segment.text}
         </Link>,
       )

bskyembed/src/screens/post.tsx

@@ -1,6 +1,6 @@
 import '../index.css'
 
-import {AppBskyFeedDefs, AtpAgent} from '@atproto/api'
+import {AppBskyFeedDefs, BskyAgent} from '@atproto/api'
 import {h, render} from 'preact'
 
 import logo from '../../assets/logo.svg'
@@ -12,7 +12,7 @@ import {getRkey} from '../utils'
 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')
 
-const agent = new AtpAgent({
+const agent = new BskyAgent({
   service: 'https://public.api.bsky.app',
 })
 

bskyembed/src/utils.ts

@@ -16,13 +16,3 @@ export function getRkey({uri}: {uri: string}): string {
   const at = new AtUri(uri)
   return at.rkey
 }
-
-const formatter = new Intl.NumberFormat('en-US', {
-  notation: 'compact',
-  maximumFractionDigits: 1,
-  roundingMode: 'trunc',
-})
-
-export function prettyNumber(number: number) {
-  return formatter.format(number)
-}

bskyembed/tsconfig.json

@@ -20,5 +20,5 @@
     "jsxFragmentFactory": "Fragment",
     "downlevelIteration": true
   },
-  "include": ["src", "vite.config.ts"]
+  "include": ["src"]
 }

bskyembed/tsconfig.snippet.json

@@ -6,5 +6,5 @@
     "strict": true,
     "outDir": "dist"
   },
-  "include": ["snippet"]
+  "include": ["snippet"],
 }

bskyembed/yarn.lock

@@ -20,16 +20,15 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@atproto/api@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.13.6.tgz#2500e9d7143e6718089632300c42ce50149f8cd5"
-  integrity sha512-58emFFZhqY8nVWD3xFWK0yYqAmJ2un+NaTtZxBbRo00mGq1rz9VXTpVmfoHFcuXL1hoDQN3WyJfsub8r6xGOgg==
+"@atproto/api@^0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.12.2.tgz#5df6d4f60dea0395c84fdebd9e81a7e853edf130"
+  integrity sha512-UVzCiDZH2j0wrr/O8nb1edD5cYLVqB5iujueXUCbHS3rAwIxgmyLtA3Hzm2QYsGPo/+xsIg1fNvpq9rNT6KWUA==
   dependencies:
     "@atproto/common-web" "^0.3.0"
-    "@atproto/lexicon" "^0.4.1"
+    "@atproto/lexicon" "^0.4.0"
     "@atproto/syntax" "^0.3.0"
-    "@atproto/xrpc" "^0.6.1"
-    await-lock "^2.2.2"
+    "@atproto/xrpc" "^0.5.0"
     multiformats "^9.9.0"
     tlds "^1.234.0"
 
@@ -43,29 +42,29 @@
     uint8arrays "3.0.0"
     zod "^3.21.4"
 
-"@atproto/lexicon@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@atproto/lexicon/-/lexicon-0.4.1.tgz#19155210570a2fafbcc7d4f655d9b813948e72a0"
-  integrity sha512-bzyr+/VHXLQWbumViX5L7h1NKQObfs8Z+XZJl43OUK8nYFUI4e/sW1IZKRNfw7Wvi5YVNK+J+yP3DWIBZhkCYA==
+"@atproto/lexicon@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@atproto/lexicon/-/lexicon-0.4.0.tgz#63e8829945d80c25524882caa8ed27b1151cc576"
+  integrity sha512-RvCBKdSI4M8qWm5uTNz1z3R2yIvIhmOsMuleOj8YR6BwRD+QbtUBy3l+xQ7iXf4M5fdfJFxaUNa6Ty0iRwdKqQ==
   dependencies:
     "@atproto/common-web" "^0.3.0"
     "@atproto/syntax" "^0.3.0"
     iso-datestring-validator "^2.2.2"
     multiformats "^9.9.0"
-    zod "^3.23.8"
+    zod "^3.21.4"
 
 "@atproto/syntax@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.3.0.tgz#fafa2dbea9add37253005cb663e7373e05e618b3"
   integrity sha512-Weq0ZBxffGHDXHl9U7BQc2BFJi/e23AL+k+i5+D9hUq/bzT4yjGsrCejkjq0xt82xXDjmhhvQSZ0LqxyZ5woxA==
 
-"@atproto/xrpc@^0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@atproto/xrpc/-/xrpc-0.6.1.tgz#dcd1315c8c60eef5af2db7fa4e35a38ebc6d79d5"
-  integrity sha512-Zy5ydXEdk6sY7FDUZcEVfCL1jvbL4tXu5CcdPqbEaW6LQtk9GLds/DK1bCX9kswTGaBC88EMuqQMfkxOhp2t4A==
+"@atproto/xrpc@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@atproto/xrpc/-/xrpc-0.5.0.tgz#dacbfd8f7b13f0ab5bd56f8fdd4b460e132a6032"
+  integrity sha512-swu+wyOLvYW4l3n+VAuJbHcPcES+tin2Lsrp8Bw5aIXIICiuFn1YMFlwK9JwVUzTH21Py1s1nHEjr4CJeElJog==
   dependencies:
-    "@atproto/lexicon" "^0.4.1"
-    zod "^3.23.8"
+    "@atproto/lexicon" "^0.4.0"
+    zod "^3.21.4"
 
 "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
   version "7.24.2"
@@ -1711,11 +1710,6 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-await-lock@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.2.2.tgz#a95a9b269bfd2f69d22b17a321686f551152bcef"
-  integrity sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw==
-
 babel-plugin-polyfill-corejs2@^0.4.10:
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1"
@@ -3736,16 +3730,8 @@ stack-trace@^1.0.0-pre2:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-1.0.0-pre2.tgz#46a83a79f1b287807e9aaafc6a5dd8bcde626f9c"
   integrity sha512-2ztBJRek8IVofG9DBJqdy2N5kulaacX30Nz7xmkYF6ale9WBVmIy6mFBchvGX7Vx/MyjBhx+Rcxqrj+dbOnQ6A==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -3809,14 +3795,7 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -4024,10 +4003,10 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typescript@^5.5.4:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
+typescript@^4.0.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 uint8arrays@3.0.0:
   version "3.0.0"
@@ -4213,8 +4192,3 @@ zod@^3.21.4:
   version "3.22.4"
   resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff"
   integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==
-
-zod@^3.23.8:
-  version "3.23.8"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
-  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==

bskylink/package.json

@@ -1,26 +0,0 @@
-{
-  "name": "bskylink",
-  "version": "0.0.0",
-  "type": "module",
-  "main": "index.ts",
-  "scripts": {
-    "test": "./tests/infra/with-test-db.sh node --loader ts-node/esm --test ./tests/index.ts",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@atproto/common": "^0.4.0",
-    "body-parser": "^1.20.2",
-    "cors": "^2.8.5",
-    "express": "^4.19.2",
-    "http-terminator": "^3.2.0",
-    "kysely": "^0.27.3",
-    "pg": "^8.12.0",
-    "pino": "^9.2.0",
-    "uint8arrays": "^5.1.0"
-  },
-  "devDependencies": {
-    "@types/cors": "^2.8.17",
-    "@types/pg": "^8.11.6",
-    "typescript": "^5.4.5"
-  }
-}

bskylink/src/bin.ts

@@ -1,24 +0,0 @@
-import {Database, envToCfg, httpLogger, LinkService, readEnv} from './index.js'
-
-async function main() {
-  const env = readEnv()
-  const cfg = envToCfg(env)
-  if (cfg.db.migrationUrl) {
-    const migrateDb = Database.postgres({
-      url: cfg.db.migrationUrl,
-      schema: cfg.db.schema,
-    })
-    await migrateDb.migrateToLatestOrThrow()
-    await migrateDb.close()
-  }
-  const link = await LinkService.create(cfg)
-  await link.start()
-  httpLogger.info('link service is running')
-  process.on('SIGTERM', async () => {
-    httpLogger.info('link service is stopping')
-    await link.destroy()
-    httpLogger.info('link service is stopped')
-  })
-}
-
-main()

bskylink/src/config.ts

@@ -1,82 +0,0 @@
-import {envInt, envList, envStr} from '@atproto/common'
-
-export type Config = {
-  service: ServiceConfig
-  db: DbConfig
-}
-
-export type ServiceConfig = {
-  port: number
-  version?: string
-  hostnames: string[]
-  appHostname: string
-}
-
-export type DbConfig = {
-  url: string
-  migrationUrl?: string
-  pool: DbPoolConfig
-  schema?: string
-}
-
-export type DbPoolConfig = {
-  size: number
-  maxUses: number
-  idleTimeoutMs: number
-}
-
-export type Environment = {
-  port?: number
-  version?: string
-  hostnames: string[]
-  appHostname?: string
-  dbPostgresUrl?: string
-  dbPostgresMigrationUrl?: string
-  dbPostgresSchema?: string
-  dbPostgresPoolSize?: number
-  dbPostgresPoolMaxUses?: number
-  dbPostgresPoolIdleTimeoutMs?: number
-}
-
-export const readEnv = (): Environment => {
-  return {
-    port: envInt('LINK_PORT'),
-    version: envStr('LINK_VERSION'),
-    hostnames: envList('LINK_HOSTNAMES'),
-    appHostname: envStr('LINK_APP_HOSTNAME'),
-    dbPostgresUrl: envStr('LINK_DB_POSTGRES_URL'),
-    dbPostgresMigrationUrl: envStr('LINK_DB_POSTGRES_MIGRATION_URL'),
-    dbPostgresSchema: envStr('LINK_DB_POSTGRES_SCHEMA'),
-    dbPostgresPoolSize: envInt('LINK_DB_POSTGRES_POOL_SIZE'),
-    dbPostgresPoolMaxUses: envInt('LINK_DB_POSTGRES_POOL_MAX_USES'),
-    dbPostgresPoolIdleTimeoutMs: envInt(
-      'LINK_DB_POSTGRES_POOL_IDLE_TIMEOUT_MS',
-    ),
-  }
-}
-
-export const envToCfg = (env: Environment): Config => {
-  const serviceCfg: ServiceConfig = {
-    port: env.port ?? 3000,
-    version: env.version,
-    hostnames: env.hostnames,
-    appHostname: env.appHostname || 'bsky.app',
-  }
-  if (!env.dbPostgresUrl) {
-    throw new Error('Must configure postgres url (LINK_DB_POSTGRES_URL)')
-  }
-  const dbCfg: DbConfig = {
-    url: env.dbPostgresUrl,
-    migrationUrl: env.dbPostgresMigrationUrl,
-    schema: env.dbPostgresSchema,
-    pool: {
-      idleTimeoutMs: env.dbPostgresPoolIdleTimeoutMs ?? 10000,
-      maxUses: env.dbPostgresPoolMaxUses ?? Infinity,
-      size: env.dbPostgresPoolSize ?? 10,
-    },
-  }
-  return {
-    service: serviceCfg,
-    db: dbCfg,
-  }
-}

bskylink/src/context.ts

@@ -1,33 +0,0 @@
-import {Config} from './config.js'
-import Database from './db/index.js'
-
-export type AppContextOptions = {
-  cfg: Config
-  db: Database
-}
-
-export class AppContext {
-  cfg: Config
-  db: Database
-  abortController = new AbortController()
-
-  constructor(private opts: AppContextOptions) {
-    this.cfg = this.opts.cfg
-    this.db = this.opts.db
-  }
-
-  static async fromConfig(cfg: Config, overrides?: Partial<AppContextOptions>) {
-    const db = Database.postgres({
-      url: cfg.db.url,
-      schema: cfg.db.schema,
-      poolSize: cfg.db.pool.size,
-      poolMaxUses: cfg.db.pool.maxUses,
-      poolIdleTimeoutMs: cfg.db.pool.idleTimeoutMs,
-    })
-    return new AppContext({
-      cfg,
-      db,
-      ...overrides,
-    })
-  }
-}

bskylink/src/db/index.ts

@@ -1,174 +0,0 @@
-import assert from 'assert'
-import {
-  Kysely,
-  KyselyPlugin,
-  Migrator,
-  PluginTransformQueryArgs,
-  PluginTransformResultArgs,
-  PostgresDialect,
-  QueryResult,
-  RootOperationNode,
-  UnknownRow,
-} from 'kysely'
-import {default as Pg} from 'pg'
-
-import {dbLogger as log} from '../logger.js'
-import {default as migrations} from './migrations/index.js'
-import {DbMigrationProvider} from './migrations/provider.js'
-import {DbSchema} from './schema.js'
-
-export class Database {
-  migrator: Migrator
-  destroyed = false
-
-  constructor(public db: Kysely<DbSchema>, public cfg: PgConfig) {
-    this.migrator = new Migrator({
-      db,
-      migrationTableSchema: cfg.schema,
-      provider: new DbMigrationProvider(migrations),
-    })
-  }
-
-  static postgres(opts: PgOptions): Database {
-    const {schema, url, txLockNonce} = opts
-    const pool =
-      opts.pool ??
-      new Pg.Pool({
-        connectionString: url,
-        max: opts.poolSize,
-        maxUses: opts.poolMaxUses,
-        idleTimeoutMillis: opts.poolIdleTimeoutMs,
-      })
-
-    // Select count(*) and other pg bigints as js integer
-    Pg.types.setTypeParser(Pg.types.builtins.INT8, n => parseInt(n, 10))
-
-    // Setup schema usage, primarily for test parallelism (each test suite runs in its own pg schema)
-    if (schema && !/^[a-z_]+$/i.test(schema)) {
-      throw new Error(`Postgres schema must only contain [A-Za-z_]: ${schema}`)
-    }
-
-    pool.on('error', onPoolError)
-
-    const db = new Kysely<DbSchema>({
-      dialect: new PostgresDialect({pool}),
-    })
-
-    return new Database(db, {
-      pool,
-      schema,
-      url,
-      txLockNonce,
-    })
-  }
-
-  async transaction<T>(fn: (db: Database) => Promise<T>): Promise<T> {
-    const leakyTxPlugin = new LeakyTxPlugin()
-    return this.db
-      .withPlugin(leakyTxPlugin)
-      .transaction()
-      .execute(txn => {
-        const dbTxn = new Database(txn, this.cfg)
-        return fn(dbTxn)
-          .catch(async err => {
-            leakyTxPlugin.endTx()
-            // ensure that all in-flight queries are flushed & the connection is open
-            await dbTxn.db.getExecutor().provideConnection(async () => {})
-            throw err
-          })
-          .finally(() => leakyTxPlugin.endTx())
-      })
-  }
-
-  get schema(): string | undefined {
-    return this.cfg.schema
-  }
-
-  get isTransaction() {
-    return this.db.isTransaction
-  }
-
-  assertTransaction() {
-    assert(this.isTransaction, 'Transaction required')
-  }
-
-  assertNotTransaction() {
-    assert(!this.isTransaction, 'Cannot be in a transaction')
-  }
-
-  async close(): Promise<void> {
-    if (this.destroyed) return
-    await this.db.destroy()
-    this.destroyed = true
-  }
-
-  async migrateToOrThrow(migration: string) {
-    if (this.schema) {
-      await this.db.schema.createSchema(this.schema).ifNotExists().execute()
-    }
-    const {error, results} = await this.migrator.migrateTo(migration)
-    if (error) {
-      throw error
-    }
-    if (!results) {
-      throw new Error('An unknown failure occurred while migrating')
-    }
-    return results
-  }
-
-  async migrateToLatestOrThrow() {
-    if (this.schema) {
-      await this.db.schema.createSchema(this.schema).ifNotExists().execute()
-    }
-    const {error, results} = await this.migrator.migrateToLatest()
-    if (error) {
-      throw error
-    }
-    if (!results) {
-      throw new Error('An unknown failure occurred while migrating')
-    }
-    return results
-  }
-}
-
-export default Database
-
-export type PgConfig = {
-  pool: Pg.Pool
-  url: string
-  schema?: string
-  txLockNonce?: string
-}
-
-type PgOptions = {
-  url: string
-  pool?: Pg.Pool
-  schema?: string
-  poolSize?: number
-  poolMaxUses?: number
-  poolIdleTimeoutMs?: number
-  txLockNonce?: string
-}
-
-class LeakyTxPlugin implements KyselyPlugin {
-  private txOver = false
-
-  endTx() {
-    this.txOver = true
-  }
-
-  transformQuery(args: PluginTransformQueryArgs): RootOperationNode {
-    if (this.txOver) {
-      throw new Error('tx already failed')
-    }
-    return args.node
-  }
-
-  async transformResult(
-    args: PluginTransformResultArgs,
-  ): Promise<QueryResult<UnknownRow>> {
-    return args.result
-  }
-}
-
-const onPoolError = (err: Error) => log.error({err}, 'db pool error')

bskylink/src/db/migrations/001-init.ts

@@ -1,15 +0,0 @@
-import {Kysely} from 'kysely'
-
-export async function up(db: Kysely<unknown>): Promise<void> {
-  await db.schema
-    .createTable('link')
-    .addColumn('id', 'varchar', col => col.primaryKey())
-    .addColumn('type', 'smallint', col => col.notNull()) // integer enum: 1->starterpack
-    .addColumn('path', 'varchar', col => col.notNull())
-    .addUniqueConstraint('link_path_unique', ['path'])
-    .execute()
-}
-
-export async function down(db: Kysely<unknown>): Promise<void> {
-  await db.schema.dropTable('link').execute()
-}

bskylink/src/db/migrations/index.ts

@@ -1,5 +0,0 @@
-import * as init from './001-init.js'
-
-export default {
-  '001': init,
-}

bskylink/src/db/migrations/provider.ts

@@ -1,8 +0,0 @@
-import {Migration, MigrationProvider} from 'kysely'
-
-export class DbMigrationProvider implements MigrationProvider {
-  constructor(private migrations: Record<string, Migration>) {}
-  async getMigrations(): Promise<Record<string, Migration>> {
-    return this.migrations
-  }
-}

bskylink/src/db/schema.ts

@@ -1,17 +0,0 @@
-import {Selectable} from 'kysely'
-
-export type DbSchema = {
-  link: Link
-}
-
-export interface Link {
-  id: string
-  type: LinkType
-  path: string
-}
-
-export enum LinkType {
-  StarterPack = 1,
-}
-
-export type LinkEntry = Selectable<Link>

bskylink/src/index.ts

@@ -1,45 +0,0 @@
-import events from 'node:events'
-import http from 'node:http'
-
-import cors from 'cors'
-import express from 'express'
-import {createHttpTerminator, HttpTerminator} from 'http-terminator'
-
-import {Config} from './config.js'
-import {AppContext} from './context.js'
-import {default as routes, errorHandler} from './routes/index.js'
-
-export * from './config.js'
-export * from './db/index.js'
-export * from './logger.js'
-
-export class LinkService {
-  public server?: http.Server
-  private terminator?: HttpTerminator
-
-  constructor(public app: express.Application, public ctx: AppContext) {}
-
-  static async create(cfg: Config): Promise<LinkService> {
-    let app = express()
-    app.use(cors())
-
-    const ctx = await AppContext.fromConfig(cfg)
-    app = routes(ctx, app)
-    app.use(errorHandler)
-
-    return new LinkService(app, ctx)
-  }
-
-  async start() {
-    this.server = this.app.listen(this.ctx.cfg.service.port)
-    this.server.keepAliveTimeout = 90000
-    this.terminator = createHttpTerminator({server: this.server})
-    await events.once(this.server, 'listening')
-  }
-
-  async destroy() {
-    this.ctx.abortController.abort()
-    await this.terminator?.terminate()
-    await this.ctx.db.close()
-  }
-}

bskylink/src/logger.ts

@@ -1,4 +0,0 @@
-import {subsystemLogger} from '@atproto/common'
-
-export const httpLogger = subsystemLogger('bskylink')
-export const dbLogger = subsystemLogger('bskylink:db')

bskylink/src/routes/create.ts

@@ -1,111 +0,0 @@
-import assert from 'node:assert'
-
-import bodyParser from 'body-parser'
-import {Express, Request} from 'express'
-
-import {AppContext} from '../context.js'
-import {LinkType} from '../db/schema.js'
-import {randomId} from '../util.js'
-import {handler} from './util.js'
-
-export default function (ctx: AppContext, app: Express) {
-  return app.post(
-    '/link',
-    bodyParser.json(),
-    handler(async (req, res) => {
-      let path: string
-      if (typeof req.body?.path === 'string') {
-        path = req.body.path
-      } else {
-        return res.status(400).json({
-          error: 'InvalidPath',
-          message: '"path" parameter is missing or not a string',
-        })
-      }
-      if (!path.startsWith('/')) {
-        return res.status(400).json({
-          error: 'InvalidPath',
-          message:
-            '"path" parameter must be formatted as a path, starting with a "/"',
-        })
-      }
-      const parts = getPathParts(path)
-      if (parts.length === 3 && parts[0] === 'start') {
-        // link pattern: /start/{did}/{rkey}
-        if (!parts[1].startsWith('did:')) {
-          // enforce strong links
-          return res.status(400).json({
-            error: 'InvalidPath',
-            message:
-              '"path" parameter for starter pack must contain the actor\'s DID',
-          })
-        }
-        const id = await ensureLink(ctx, LinkType.StarterPack, parts)
-        return res.json({url: getUrl(ctx, req, id)})
-      }
-      return res.status(400).json({
-        error: 'InvalidPath',
-        message: '"path" parameter does not have a known format',
-      })
-    }),
-  )
-}
-
-const ensureLink = async (ctx: AppContext, type: LinkType, parts: string[]) => {
-  const normalizedPath = normalizedPathFromParts(parts)
-  const created = await ctx.db.db
-    .insertInto('link')
-    .values({
-      id: randomId(),
-      type,
-      path: normalizedPath,
-    })
-    .onConflict(oc => oc.column('path').doNothing())
-    .returningAll()
-    .executeTakeFirst()
-  if (created) {
-    return created.id
-  }
-  const found = await ctx.db.db
-    .selectFrom('link')
-    .selectAll()
-    .where('path', '=', normalizedPath)
-    .executeTakeFirstOrThrow()
-  return found.id
-}
-
-const getUrl = (ctx: AppContext, req: Request, id: string) => {
-  if (!ctx.cfg.service.hostnames.length) {
-    assert(req.headers.host, 'request must be made with host header')
-    const baseUrl =
-      req.protocol === 'http' && req.headers.host.startsWith('localhost:')
-        ? `http://${req.headers.host}`
-        : `https://${req.headers.host}`
-    return `${baseUrl}/${id}`
-  }
-  const baseUrl = ctx.cfg.service.hostnames.includes(req.headers.host)
-    ? `https://${req.headers.host}`
-    : `https://${ctx.cfg.service.hostnames[0]}`
-  return `${baseUrl}/${id}`
-}
-
-const normalizedPathFromParts = (parts: string[]): string => {
-  return (
-    '/' +
-    parts
-      .map(encodeURIComponent)
-      .map(part => part.replaceAll('%3A', ':')) // preserve colons
-      .join('/')
-  )
-}
-
-const getPathParts = (path: string): string[] => {
-  if (path === '/') return []
-  if (path.endsWith('/')) {
-    path = path.slice(0, -1) // ignore trailing slash
-  }
-  return path
-    .slice(1) // remove leading slash
-    .split('/')
-    .map(decodeURIComponent)
-}

bskylink/src/routes/health.ts

@@ -1,20 +0,0 @@
-import {Express} from 'express'
-import {sql} from 'kysely'
-
-import {AppContext} from '../context.js'
-import {handler} from './util.js'
-
-export default function (ctx: AppContext, app: Express) {
-  return app.get(
-    '/_health',
-    handler(async (_req, res) => {
-      const {version} = ctx.cfg.service
-      try {
-        await sql`select 1`.execute(ctx.db.db)
-        return res.send({version})
-      } catch (err) {
-        return res.status(503).send({version, error: 'Service Unavailable'})
-      }
-    }),
-  )
-}

bskylink/src/routes/index.ts

@@ -1,17 +0,0 @@
-import {Express} from 'express'
-
-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 siteAssociation} from './siteAssociation.js'
-
-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 = create(ctx, app) // POST /link
-  app = redirect(ctx, app) // GET /:linkId (should go last due to permissive matching)
-  return app
-}

bskylink/src/routes/redirect.ts

@@ -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()
-    }),
-  )
-}

bskylink/src/routes/siteAssociation.ts

@@ -1,22 +0,0 @@
-import {Express} from 'express'
-
-import {AppContext} from '../context.js'
-
-export default function (ctx: AppContext, app: Express) {
-  return app.get('/.well-known/apple-app-site-association', (req, res) => {
-    res.json({
-      applinks: {
-        apps: [],
-        details: [
-          {
-            appID: 'B3LX46C5HS.xyz.blueskyweb.app',
-            paths: ['*'],
-          },
-        ],
-      },
-      appclips: {
-        apps: ['B3LX46C5HS.xyz.blueskyweb.app.AppClip'],
-      },
-    })
-  })
-}

bskylink/src/routes/util.ts

@@ -1,23 +0,0 @@
-import {ErrorRequestHandler, Request, RequestHandler, Response} from 'express'
-
-import {httpLogger} from '../logger.js'
-
-export type Handler = (req: Request, res: Response) => Awaited<void>
-
-export const handler = (runHandler: Handler): RequestHandler => {
-  return async (req, res, next) => {
-    try {
-      await runHandler(req, res)
-    } catch (err) {
-      next(err)
-    }
-  }
-}
-
-export const errorHandler: ErrorRequestHandler = (err, _req, res, next) => {
-  httpLogger.error({err}, 'request error')
-  if (res.headersSent) {
-    return next(err)
-  }
-  return res.status(500).end('server error')
-}

bskylink/src/util.ts

@@ -1,8 +0,0 @@
-import {randomBytes} from 'node:crypto'
-
-import {toString} from 'uint8arrays'
-
-// 40bit random id of 5-7 characters
-export const randomId = () => {
-  return toString(randomBytes(5), 'base58btc')
-}

bskylink/tests/index.ts

@@ -1,123 +0,0 @@
-import assert from 'node:assert'
-import {AddressInfo} from 'node:net'
-import {after, before, describe, it} from 'node:test'
-
-import {Database, envToCfg, LinkService, readEnv} from '../src/index.js'
-
-describe('link service', async () => {
-  let linkService: LinkService
-  let baseUrl: string
-  before(async () => {
-    const env = readEnv()
-    const cfg = envToCfg({
-      ...env,
-      hostnames: ['test.bsky.link'],
-      appHostname: 'test.bsky.app',
-      dbPostgresSchema: 'link_test',
-      dbPostgresUrl: process.env.DB_POSTGRES_URL,
-    })
-    const migrateDb = Database.postgres({
-      url: cfg.db.url,
-      schema: cfg.db.schema,
-    })
-    await migrateDb.migrateToLatestOrThrow()
-    await migrateDb.close()
-    linkService = await LinkService.create(cfg)
-    await linkService.start()
-    const {port} = linkService.server?.address() as AddressInfo
-    baseUrl = `http://localhost:${port}`
-  })
-
-  after(async () => {
-    await linkService?.destroy()
-  })
-
-  it('creates a starter pack link', async () => {
-    const link = await getLink('/start/did:example:alice/xxx')
-    const url = new URL(link)
-    assert.strictEqual(url.origin, 'https://test.bsky.link')
-    assert.match(url.pathname, /^\/[a-z0-9]+$/i)
-  })
-
-  it('normalizes input paths and provides same link each time.', async () => {
-    const link1 = await getLink('/start/did%3Aexample%3Abob/yyy')
-    const link2 = await getLink('/start/did:example:bob/yyy/')
-    assert.strictEqual(link1, link2)
-  })
-
-  it('serves permanent redirect, preserving query params.', async () => {
-    const link = await getLink('/start/did:example:carol/zzz/')
-    const [status, location] = await getRedirect(`${link}?a=b`)
-    assert.strictEqual(status, 301)
-    const locationUrl = new URL(location)
-    assert.strictEqual(
-      locationUrl.pathname + locationUrl.search,
-      '/start/did:example:carol/zzz?a=b',
-    )
-  })
-
-  it('returns json object with url when requested', async () => {
-    const link = await getLink('/start/did:example:carol/zzz/')
-    const [status, json] = await getJsonRedirect(link)
-    assert.strictEqual(status, 200)
-    assert(json.url)
-    const url = new URL(json.url)
-    assert.strictEqual(url.pathname, '/start/did:example:carol/zzz')
-  })
-
-  it('returns 404 for unknown link when requesting json', async () => {
-    const [status, json] = await getJsonRedirect(
-      'https://test.bsky.link/unknown',
-    )
-    assert(json.error)
-    assert(json.message)
-    assert.strictEqual(status, 404)
-    assert.strictEqual(json.error, 'NotFound')
-    assert.strictEqual(json.message, 'Link not found')
-  })
-
-  async function getRedirect(link: string): Promise<[number, string]> {
-    const url = new URL(link)
-    const base = new URL(baseUrl)
-    url.protocol = base.protocol
-    url.host = base.host
-    const res = await fetch(url, {redirect: 'manual'})
-    await res.arrayBuffer() // drain
-    assert(
-      res.status === 301 || res.status === 303,
-      'response was not a redirect',
-    )
-    return [res.status, res.headers.get('location') ?? '']
-  }
-
-  async function getJsonRedirect(
-    link: string,
-  ): Promise<[number, {url?: string; error?: string; message?: string}]> {
-    const url = new URL(link)
-    const base = new URL(baseUrl)
-    url.protocol = base.protocol
-    url.host = base.host
-    const res = await fetch(url, {
-      redirect: 'manual',
-      headers: {accept: 'application/json,text/html'},
-    })
-    assert(
-      res.headers.get('content-type')?.startsWith('application/json'),
-      'content type was not json',
-    )
-    const json = await res.json()
-    return [res.status, json]
-  }
-
-  async function getLink(path: string): Promise<string> {
-    const res = await fetch(new URL('/link', baseUrl), {
-      method: 'post',
-      headers: {'content-type': 'application/json'},
-      body: JSON.stringify({path}),
-    })
-    assert.strictEqual(res.status, 200)
-    const payload = await res.json()
-    assert(typeof payload.url === 'string')
-    return payload.url
-  }
-})

bskylink/tests/infra/_common.sh

@@ -1,157 +0,0 @@
-#!/usr/bin/env sh
-
-# Exit if any command fails
-set -e
-
-get_container_id() {
-  local compose_file=$1
-  local service=$2
-  if [ -z "${compose_file}" ] || [ -z "${service}" ]; then
-    echo "usage: get_container_id <compose_file> <service>"
-    exit 1
-  fi
-
- # first line of jq normalizes for docker compose breaking change, see docker/compose#10958
-  docker compose --file $compose_file ps --format json --status running \
-    | jq -sc '.[] | if type=="array" then .[] else . end' | jq -s \
-    | jq -r '.[]? | select(.Service == "'${service}'") | .ID'
-}
-
-# Exports all environment variables
-export_env() {
-  export_pg_env
-}
-
-# Exports postgres environment variables
-export_pg_env() {
-  # Based on creds in compose.yaml
-  export PGPORT=5433
-  export PGHOST=localhost
-  export PGUSER=pg
-  export PGPASSWORD=password
-  export PGDATABASE=postgres
-  export DB_POSTGRES_URL="postgresql://pg:password@127.0.0.1:5433/postgres"
-}
-
-
-pg_clear() {
-  local pg_uri=$1
-
-  for schema_name in `psql "${pg_uri}" -c "SELECT schema_name FROM information_schema.schemata WHERE schema_name NOT LIKE 'pg_%' AND schema_name NOT LIKE 'information_schema';" -t`; do
-    psql "${pg_uri}" -c "DROP SCHEMA \"${schema_name}\" CASCADE;"
-  done
-}
-
-pg_init() {
-  local pg_uri=$1
-
-  psql "${pg_uri}" -c "CREATE SCHEMA IF NOT EXISTS \"public\";"
-}
-
-main_native() {
-  local services=${SERVICES}
-  local postgres_url_env_var=`[[ $services == *"db_test"* ]] && echo "DB_TEST_POSTGRES_URL" || echo "DB_POSTGRES_URL"`
-
-  postgres_url="${!postgres_url_env_var}"
-
-  if [ -n "${postgres_url}" ]; then
-    echo "Using ${postgres_url_env_var} (${postgres_url}) to connect to postgres."
-    pg_init "${postgres_url}"
-  else
-    echo "Postgres connection string missing did you set ${postgres_url_env_var}?"
-    exit 1
-  fi
-
-  cleanup() {
-    local services=$@
-
-    if [ -n "${postgres_url}" ] && [[ $services == *"db_test"* ]]; then
-      pg_clear "${postgres_url}" &> /dev/null
-    fi
-  }
-
-  # trap SIGINT and performs cleanup
-  trap "on_sigint ${services}" INT
-  on_sigint() {
-    cleanup $@
-    exit $?
-  }
-
-  # Run the arguments as a command
-  DB_POSTGRES_URL="${postgres_url}" \
-  "$@"
-  code=$?
-
-  cleanup ${services}
-
-  exit ${code}
-}
-
-main_docker() {
-  # Expect a SERVICES env var to be set with the docker service names
-  local services=${SERVICES}
-
-  dir=$(dirname $0)
-  compose_file="${dir}/docker-compose.yaml"
-
-  # whether this particular script started the container(s)
-  started_container=false
-
-  # performs cleanup as necessary, i.e. taking down containers
-  # if this script started them
-  cleanup() {
-    local services=$@
-    echo # newline
-    if $started_container; then
-      docker compose --file $compose_file rm --force --stop --volumes ${services}
-    fi
-  }
-
-  # trap SIGINT and performs cleanup
-  trap "on_sigint ${services}" INT
-  on_sigint() {
-    cleanup $@
-    exit $?
-  }
-
-  # check if all services are running already
-  not_running=false
-  for service in $services; do
-    container_id=$(get_container_id $compose_file $service)
-    if [ -z $container_id ]; then
-      not_running=true
-      break
-    fi
-  done
-
-  # if any are missing, recreate all services
-  if $not_running; then
-    started_container=true
-    docker compose --file $compose_file up --wait --force-recreate ${services}
-  else
-    echo "all services ${services} are already running"
-  fi
-
-  # do not exit when following commands fail, so we can intercept exit code & tear down docker
-  set +e
-
-  # setup environment variables and run args
-  export_env
-  "$@"
-  # save return code for later
-  code=$?
-
-  # performs cleanup as necessary
-  cleanup ${services}
-  exit ${code}
-}
-
-# Main entry point
-main() {
-  if ! docker ps >/dev/null 2>&1; then
-    echo "Docker unavailable. Running on host."
-    main_native $@
-  else
-    main_docker $@
-  fi
-}

bskylink/tests/infra/docker-compose.yaml

@@ -1,27 +0,0 @@
-version: '3.8'
-services:
-  # An ephermerally-stored postgres database for single-use test runs
-  db_test: &db_test
-    image: postgres:14.11-alpine
-    environment:
-      - POSTGRES_USER=pg
-      - POSTGRES_PASSWORD=password
-    ports:
-      - '5433:5432'
-    # Healthcheck ensures db is queryable when `docker-compose up --wait` completes
-    healthcheck:
-      test: 'pg_isready -U pg'
-      interval: 500ms
-      timeout: 10s
-      retries: 20
-  # A persistently-stored postgres database
-  db:
-    <<: *db_test
-    ports:
-      - '5432:5432'
-    healthcheck:
-      disable: true
-    volumes:
-      - link_db:/var/lib/postgresql/data
-volumes:
-  link_db:

bskylink/tests/infra/with-test-db.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-# Example usage:
-# ./with-test-db.sh psql postgresql://pg:password@localhost:5433/postgres -c 'select 1;'
-
-dir=$(dirname $0)
-. ${dir}/_common.sh
-
-SERVICES="db_test" main "$@"

bskylink/tsconfig.json

@@ -1,10 +0,0 @@
-{
-    "compilerOptions": {
-      "module": "NodeNext",
-      "esModuleInterop": true,
-      "moduleResolution": "NodeNext",
-      "outDir": "dist",
-      "lib": ["ES2021.String"]
-    },
-    "include": ["./src/index.ts", "./src/bin.ts"]
-  }

bskyogcard/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "bskyogcard",
-  "version": "0.0.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "scripts": {
-    "start": "node --loader ts-node/esm ./src/bin.ts",
-    "dev": "node --watch-path ./src --loader ts-node/esm ./src/bin.ts",
-    "build": "tsc && cp -r src/assets dist/",
-    "install-fonts": "node --loader ts-node/esm scripts/install-fonts.ts"
-  },
-  "dependencies": {
-    "@atproto/api": "0.12.19-next.0",
-    "@atproto/common": "^0.4.0",
-    "@resvg/resvg-js": "^2.6.2",
-    "express": "^4.19.2",
-    "http-terminator": "^3.2.0",
-    "pino": "^9.2.0",
-    "react": "^18.3.1",
-    "satori": "^0.10.13",
-    "twemoji": "^14.0.2"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.3",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
-  }
-}

bskyogcard/scripts/install-fonts.ts

@@ -1,40 +0,0 @@
-import {writeFile} from 'node:fs/promises'
-import * as path from 'node:path'
-import {fileURLToPath} from 'node:url'
-
-const __DIRNAME = path.dirname(fileURLToPath(import.meta.url))
-
-const FONTS = [
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-jp@5.0/japanese-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-tc@5.0/chinese-traditional-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-sc@5.0/chinese-simplified-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-hk@5.0/chinese-hongkong-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-kr@5.0/korean-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-thai@5.0/thai-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-arabic@5.0/arabic-700-normal.ttf',
-  'https://cdn.jsdelivr.net/fontsource/fonts/noto-sans-hebrew@5.0/hebrew-700-normal.ttf',
-]
-
-async function main() {
-  await Promise.all(
-    FONTS.map(async urlStr => {
-      const url = new URL(urlStr)
-      const res = await fetch(url)
-      const font = await res.arrayBuffer()
-      const filename = url.pathname
-        .split('/')
-        .slice(-2)
-        .join('/')
-        .replace(/@[\d.]+\//, '-')
-      if (!res.ok) {
-        throw new Error(`HTTP ${res.status}: fetching failed for ${filename}`)
-      }
-      await writeFile(
-        path.join(__DIRNAME, '..', 'src', 'assets', 'fonts', filename),
-        Buffer.from(font),
-      )
-    }),
-  )
-}
-
-main()

bskyogcard/src/bin.ts

@@ -1,48 +0,0 @@
-import cluster, {Worker} from 'node:cluster'
-
-import {envInt} from '@atproto/common'
-
-import {CardService, envToCfg, httpLogger, readEnv} from './index.js'
-
-async function main() {
-  const env = readEnv()
-  const cfg = envToCfg(env)
-  const card = await CardService.create(cfg)
-  await card.start()
-  httpLogger.info('card service is running')
-  process.on('SIGTERM', async () => {
-    httpLogger.info('card service is stopping')
-    await card.destroy()
-    httpLogger.info('card service is stopped')
-    if (cluster.isWorker) process.exit(0)
-  })
-}
-
-const workerCount = envInt('CARD_CLUSTER_WORKER_COUNT')
-
-if (workerCount) {
-  if (cluster.isPrimary) {
-    httpLogger.info(`primary ${process.pid} is running`)
-    const workers = new Set<Worker>()
-    for (let i = 0; i < workerCount; ++i) {
-      workers.add(cluster.fork())
-    }
-    let teardown = false
-    cluster.on('exit', worker => {
-      workers.delete(worker)
-      if (!teardown) {
-        workers.add(cluster.fork()) // restart on crash
-      }
-    })
-    process.on('SIGTERM', () => {
-      teardown = true
-      httpLogger.info('disconnecting workers')
-      workers.forEach(w => w.kill('SIGTERM'))
-    })
-  } else {
-    httpLogger.info(`worker ${process.pid} is running`)
-    main()
-  }
-} else {
-  main() // non-clustering
-}

bskyogcard/src/components/Butterfly.tsx

@@ -1,16 +0,0 @@
-import React from 'react'
-
-export function Butterfly(props: React.SVGAttributes<SVGSVGElement>) {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      fill="none"
-      viewBox="0 0 568 501"
-      {...props}>
-      <path
-        fill="currentColor"
-        d="M123.121 33.664C188.241 82.553 258.281 181.68 284 234.873c25.719-53.192 95.759-152.32 160.879-201.21C491.866-1.611 568-28.906 568 57.947c0 17.346-9.945 145.713-15.778 166.555-20.275 72.453-94.155 90.933-159.875 79.748C507.222 323.8 536.444 388.56 473.333 453.32c-119.86 122.992-172.272-30.859-185.702-70.281-2.462-7.227-3.614-10.608-3.631-7.733-.017-2.875-1.169.506-3.631 7.733-13.43 39.422-65.842 193.273-185.702 70.281-63.111-64.76-33.89-129.52 80.986-149.071-65.72 11.185-139.6-7.295-159.875-79.748C9.945 203.659 0 75.291 0 57.946 0-28.906 76.135-1.612 123.121 33.664Z"
-      />
-    </svg>
-  )
-}

bskyogcard/src/components/Img.tsx

@@ -1,10 +0,0 @@
-import React from 'react'
-
-export function Img(
-  props: Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> & {src: Buffer},
-) {
-  const {src, ...others} = props
-  return (
-    <img {...others} src={`data:image/jpeg;base64,${src.toString('base64')}`} />
-  )
-}

bskyogcard/src/components/StarterPack.tsx

@@ -1,152 +0,0 @@
-/* eslint-disable bsky-internal/avoid-unwrapped-text */
-import React from 'react'
-import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
-
-import {Butterfly} from './Butterfly.js'
-import {Img} from './Img.js'
-
-export const STARTERPACK_HEIGHT = 630
-export const STARTERPACK_WIDTH = 1200
-export const TILE_SIZE = STARTERPACK_HEIGHT / 3
-
-const GRADIENT_TOP = '#0A7AFF'
-const GRADIENT_BOTTOM = '#59B9FF'
-const IMAGE_STROKE = '#359CFF'
-
-export function StarterPack(props: {
-  starterPack: AppBskyGraphDefs.StarterPackView
-  images: Map<string, Buffer>
-}) {
-  const {starterPack, images} = props
-  const record = AppBskyGraphStarterpack.isRecord(starterPack.record)
-    ? starterPack.record
-    : null
-  const imagesArray = [...images.values()]
-  const imageOfCreator = images.get(starterPack.creator.did)
-  const imagesExceptCreator = [...images.entries()]
-    .filter(([did]) => did !== starterPack.creator.did)
-    .map(([, image]) => image)
-  const imagesAcross: Buffer[] = []
-  if (imageOfCreator) {
-    if (imagesExceptCreator.length >= 6) {
-      imagesAcross.push(...imagesExceptCreator.slice(0, 3))
-      imagesAcross.push(imageOfCreator)
-      imagesAcross.push(...imagesExceptCreator.slice(3, 6))
-    } else {
-      const firstHalf = Math.floor(imagesExceptCreator.length / 2)
-      imagesAcross.push(...imagesExceptCreator.slice(0, firstHalf))
-      imagesAcross.push(imageOfCreator)
-      imagesAcross.push(
-        ...imagesExceptCreator.slice(firstHalf, imagesExceptCreator.length),
-      )
-    }
-  } else {
-    imagesAcross.push(...imagesExceptCreator.slice(0, 7))
-  }
-  const isLongTitle = record ? record.name.length > 30 : false
-  return (
-    <div
-      style={{
-        display: 'flex',
-        justifyContent: 'center',
-        width: STARTERPACK_WIDTH,
-        height: STARTERPACK_HEIGHT,
-        backgroundColor: 'black',
-        color: 'white',
-        fontFamily: 'Inter',
-      }}>
-      {/* image tiles */}
-      <div
-        style={{
-          display: 'flex',
-          flexWrap: 'wrap',
-          alignItems: 'stretch',
-          width: TILE_SIZE * 6,
-          height: TILE_SIZE * 3,
-        }}>
-        {[...Array(18)].map((_, i) => {
-          const image = imagesArray.at(i % imagesArray.length)
-          return (
-            <div
-              key={i}
-              style={{
-                display: 'flex',
-                height: TILE_SIZE,
-                width: TILE_SIZE,
-              }}>
-              {image && <Img height="100%" width="100%" src={image} />}
-            </div>
-          )
-        })}
-        {/* background overlay */}
-        <div
-          style={{
-            display: 'flex',
-            width: '100%',
-            height: '100%',
-            position: 'absolute',
-            backgroundImage: `linear-gradient(to bottom, ${GRADIENT_TOP}, ${GRADIENT_BOTTOM})`,
-            opacity: 0.9,
-          }}
-        />
-      </div>
-      {/* foreground text & images */}
-      <div
-        style={{
-          display: 'flex',
-          alignItems: 'center',
-          flexDirection: 'column',
-          width: '100%',
-          height: '100%',
-          position: 'absolute',
-          color: 'white',
-        }}>
-        <div
-          style={{
-            color: 'white',
-            padding: 60,
-            fontSize: 40,
-          }}>
-          JOIN THE CONVERSATION
-        </div>
-        <div style={{display: 'flex'}}>
-          {imagesAcross.map((image, i) => {
-            return (
-              <div
-                key={i}
-                style={{
-                  display: 'flex',
-                  height: 172 + 15 * 2,
-                  width: 172 + 15 * 2,
-                  margin: -15,
-                  border: `15px solid ${IMAGE_STROKE}`,
-                  borderRadius: '50%',
-                  overflow: 'hidden',
-                }}>
-                <Img height="100%" width="100%" src={image} />
-              </div>
-            )
-          })}
-        </div>
-        <div
-          style={{
-            padding: '75px 30px 0px',
-            fontSize: isLongTitle ? 55 : 65,
-            display: 'flex',
-            textAlign: 'center',
-          }}>
-          {record?.name || 'Starter Pack'}
-        </div>
-        <div
-          style={{
-            display: 'flex',
-            fontSize: 40,
-            justifyContent: 'center',
-            padding: '30px 30px 10px',
-          }}>
-          on <Butterfly width="65" style={{margin: '-7px 10px 0'}} /> Bluesky
-        </div>
-      </div>
-    </div>
-  )
-}

bskyogcard/src/config.ts

@@ -1,40 +0,0 @@
-import {envInt, envStr} from '@atproto/common'
-
-export type Config = {
-  service: ServiceConfig
-}
-
-export type ServiceConfig = {
-  port: number
-  version?: string
-  appviewUrl: string
-  originVerify?: string
-}
-
-export type Environment = {
-  port?: number
-  version?: string
-  appviewUrl?: string
-  originVerify?: string
-}
-
-export const readEnv = (): Environment => {
-  return {
-    port: envInt('CARD_PORT'),
-    version: envStr('CARD_VERSION'),
-    appviewUrl: envStr('CARD_APPVIEW_URL'),
-    originVerify: envStr('CARD_ORIGIN_VERIFY'),
-  }
-}
-
-export const envToCfg = (env: Environment): Config => {
-  const serviceCfg: ServiceConfig = {
-    port: env.port ?? 3000,
-    version: env.version,
-    appviewUrl: env.appviewUrl ?? 'https://api.bsky.app',
-    originVerify: env.originVerify,
-  }
-  return {
-    service: serviceCfg,
-  }
-}