Appview: apply hosting status in getRecord (bluesky-social#2620)

appview: apply hosting status in getRecord
andypeng2015 · Jul 2, 2024 · f05539d · f05539d
1 parent 0529bec
commit f05539d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/.github/workflows/build-and-push-bsky-ghcr.yaml b/.github/workflows/build-and-push-bsky-ghcr.yaml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-      - divy/starter-packs
+      - divy/appview-getrecord-nohost
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

diff --git a/packages/bsky/src/api/com/atproto/repo/getRecord.ts b/packages/bsky/src/api/com/atproto/repo/getRecord.ts
@@ -4,27 +4,36 @@ import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.repo.getRecord(async ({ params }) => {
-    const { repo, collection, rkey, cid } = params
-    const [did] = await ctx.hydrator.actor.getDids([repo])
-    if (!did) {
-      throw new InvalidRequestError(`Could not find repo: ${repo}`)
-    }
+  server.com.atproto.repo.getRecord({
+    auth: ctx.authVerifier.optionalStandardOrRole,
+    handler: async ({ auth, params }) => {
+      const { repo, collection, rkey, cid } = params
+      const { includeTakedowns } = ctx.authVerifier.parseCreds(auth)
+      const [did] = await ctx.hydrator.actor.getDids([repo])
+      if (!did) {
+        throw new InvalidRequestError(`Could not find repo: ${repo}`)
+      }
 
-    const uri = AtUri.make(did, collection, rkey).toString()
-    const result = await ctx.hydrator.getRecord(uri, true)
+      const actors = await ctx.hydrator.actor.getActors([did], includeTakedowns)
+      if (!actors.get(did)) {
+        throw new InvalidRequestError(`Could not find repo: ${repo}`)
+      }
 
-    if (!result || (cid && result.cid !== cid)) {
-      throw new InvalidRequestError(`Could not locate record: ${uri}`)
-    }
+      const uri = AtUri.make(did, collection, rkey).toString()
+      const result = await ctx.hydrator.getRecord(uri, includeTakedowns)
 
-    return {
-      encoding: 'application/json' as const,
-      body: {
-        uri: uri,
-        cid: result.cid,
-        value: result.record,
-      },
-    }
+      if (!result || (cid && result.cid !== cid)) {
+        throw new InvalidRequestError(`Could not locate record: ${uri}`)
+      }
+
+      return {
+        encoding: 'application/json' as const,
+        body: {
+          uri: uri,
+          cid: result.cid,
+          value: result.record,
+        },
+      }
+    },
   })
 }
diff --git a/packages/ozone/tests/get-record.test.ts b/packages/ozone/tests/get-record.test.ts
@@ -64,6 +64,9 @@ describe('admin get record view', () => {
         cid: sc.posts[sc.dids.alice][0].ref.cidStr,
       },
     })
+    await network.bsky.ctx.dataplane.takedownRecord({
+      recordUri: sc.posts[sc.dids.alice][0].ref.uriStr,
+    })
   })
 
   it('gets a record by uri, even when taken down.', async () => {