@atproto/bsky 0.0.207 → 0.0.209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.207",
+  "version": "0.0.209",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -52,8 +52,8 @@
     "undici": "^6.19.8",
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.2.0",
-    "@atproto/common": "^0.5.6",
-    "@atproto/api": "^0.18.12",
+    "@atproto/api": "^0.18.13",
+    "@atproto/common": "^0.5.7",
     "@atproto-labs/xrpc-utils": "0.0.24",
     "@atproto/crypto": "^0.4.5",
     "@atproto/did": "^0.2.4",
@@ -62,7 +62,7 @@
     "@atproto/repo": "^0.8.12",
     "@atproto/sync": "^0.1.39",
     "@atproto/syntax": "^0.4.2",
-    "@atproto/xrpc-server": "^0.10.7"
+    "@atproto/xrpc-server": "^0.10.8"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -78,9 +78,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.18.12",
+    "@atproto/api": "^0.18.13",
     "@atproto/lex-cli": "^0.9.8",
-    "@atproto/pds": "^0.4.202",
+    "@atproto/pds": "^0.4.203",
     "@atproto/xrpc": "^0.7.7"
   },
   "scripts": {

package/src/api/well-known.ts

@@ -1,13 +1,13 @@
 import { Router } from 'express'
+import { didWebToUrl, isDidWeb } from '@atproto/did'
 import { AppContext } from '../context'
 
 export const createRouter = (ctx: AppContext): Router => {
   const router = Router()
 
   const did = ctx.cfg.serverDid
-  if (did.startsWith('did:web:')) {
-    const hostname = did.slice('did:web:'.length)
-    const serviceEndpoint = `https://${hostname}`
+  if (isDidWeb(did)) {
+    const serviceEndpoint = didWebToUrl(did).origin
 
     router.get('/.well-known/did.json', (_req, res) => {
       res.json({

package/src/hydration/actor.ts

@@ -160,20 +160,10 @@ export class ActorHydrator {
     dids: string[],
     opts: {
       includeTakedowns?: boolean
-      /**
-       * The raw `HydrationCtx.includeTakedowns` value, independent of any
-       * special casing that may apply to `includeTakedowns` within this
-       * method.
-       */
-      includeTakedownsBase?: boolean
       skipCacheForDids?: string[]
     } = {},
   ): Promise<Actors> {
-    const {
-      includeTakedowns = false,
-      skipCacheForDids,
-      includeTakedownsBase = false,
-    } = opts
+    const { includeTakedowns = false, skipCacheForDids } = opts
     if (!dids.length) return new HydrationMap<Actor>()
     const res = await this.dataplane.getActors({ dids, skipCacheForDids })
     return dids.reduce((acc, did, i) => {
@@ -194,7 +184,14 @@ export class ActorHydrator {
         : undefined
 
       const status = actor.statusRecord
-        ? parseRecord<StatusRecord>(actor.statusRecord, includeTakedownsBase)
+        ? parseRecord<StatusRecord>(
+            actor.statusRecord,
+            /*
+             * Always true, we filter this out in the `Views.status()`. If we
+             * ever remove that filter, we'll want to reinstate this here.
+             */
+            true,
+          )
         : undefined
 
       const verifications = mapDefined(

package/src/hydration/hydrator.ts

@@ -234,11 +234,9 @@ export class Hydrator {
      */
     const includeTakedowns =
       ctx.includeTakedowns || ctx.overrideIncludeTakedownsForActor
-    const includeTakedownsBase = ctx.includeTakedowns
     const [actors, labels, profileViewersState] = await Promise.all([
       this.actor.getActors(dids, {
         includeTakedowns,
-        includeTakedownsBase,
         skipCacheForDids: ctx.skipCacheForViewer,
       }),
       this.label.getLabelsForSubjects(labelSubjectsForDid(dids), ctx.labelers),

package/src/lexicon/lexicons.ts

@@ -844,6 +844,11 @@ export const schemaDict = {
             description:
               'True if the status is not expired, false if it is expired. Only present if expiration was set.',
           },
+          isDisabled: {
+            type: 'boolean',
+            description:
+              "True if the user's go-live access has been disabled by a moderator, false otherwise.",
+          },
         },
       },
     },

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -662,6 +662,8 @@ export interface StatusView {
   expiresAt?: string
   /** True if the status is not expired, false if it is expired. Only present if expiration was set. */
   isActive?: boolean
+  /** True if the user's go-live access has been disabled by a moderator, false otherwise. */
+  isDisabled?: boolean
 }
 
 const hashStatusView = 'statusView'

package/src/views/index.ts

@@ -544,8 +544,20 @@ export class Views {
     const actor = state.actors?.get(did)
     if (!actor?.status) return
 
+    const isViewerStatusOwner = did === state.ctx?.viewer
     const { status } = actor
-    const { record, sortedAt, cid } = status
+    const { record, sortedAt, cid, takedownRef } = status
+    const isTakenDown = !!takedownRef
+
+    /*
+     * Manual filter for takendown status records. If this is ever removed, we
+     * need to reinstate `includeTakedowns` handling in the `Actor.getActors`
+     * hydrator.
+     */
+    if (isTakenDown && !isViewerStatusOwner) {
+      return undefined
+    }
+
     const uri = AtUri.make(did, ids.AppBskyActorStatus, 'self').toString()
 
     const minDuration = 5 * MINUTE
@@ -564,7 +576,7 @@ export class Views {
 
     const isActive = expiresAtMs ? expiresAtMs > Date.now() : undefined
 
-    return {
+    const response: StatusView = {
       uri,
       cid,
       record: record,
@@ -575,6 +587,12 @@ export class Views {
       expiresAt,
       isActive,
     }
+
+    if (isViewerStatusOwner) {
+      response.isDisabled = isTakenDown
+    }
+
+    return response
   }
 
   blockedProfileViewer(

package/tests/views/__snapshots__/profile.test.ts.snap

@@ -714,6 +714,7 @@ Object {
   },
   "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": true,
+  "isDisabled": false,
   "record": Object {
     "$type": "app.bsky.actor.status",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -746,6 +747,40 @@ Object {
   },
   "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": false,
+  "isDisabled": false,
+  "record": Object {
+    "$type": "app.bsky.actor.status",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "durationMinutes": 10,
+    "embed": Object {
+      "$type": "app.bsky.embed.external",
+      "external": Object {
+        "description": "testLink",
+        "title": "TestImage",
+        "uri": "https://example.com",
+      },
+    },
+    "status": "app.bsky.actor.status#live",
+  },
+  "status": "app.bsky.actor.status#live",
+  "uri": "record(0)",
+}
+`;
+
+exports[`pds profile views status when taken down it returns the live status with isDisabled=true for status owner 1`] = `
+Object {
+  "cid": "cids(0)",
+  "embed": Object {
+    "$type": "app.bsky.embed.external#view",
+    "external": Object {
+      "description": "testLink",
+      "title": "TestImage",
+      "uri": "https://example.com",
+    },
+  },
+  "expiresAt": "1970-01-01T00:00:00.000Z",
+  "isActive": true,
+  "isDisabled": true,
   "record": Object {
     "$type": "app.bsky.actor.status",
     "createdAt": "1970-01-01T00:00:00.000Z",

package/tests/views/profile.test.ts

@@ -495,7 +495,7 @@ describe('pds profile views', () => {
     })
 
     describe('when taken down', () => {
-      it('it does not return the live status', async () => {
+      beforeAll(async () => {
         const res = await sc.agent.com.atproto.repo.putRecord(
           {
             repo: alice,
@@ -519,7 +519,9 @@ describe('pds profile views', () => {
           recordUri: res.data.uri,
         })
         await network.processAll()
+      })
 
+      it('it returns the live status with isDisabled=true for status owner', async () => {
         const { data } = await agent.api.app.bsky.actor.getProfile(
           { actor: alice },
           {
@@ -530,6 +532,21 @@ describe('pds profile views', () => {
           },
         )
 
+        expect(data.status?.isDisabled).toBe(true)
+        expect(forSnapshot(data.status)).toMatchSnapshot()
+      })
+
+      it('it does not return the live status for non-owner', async () => {
+        const { data } = await agent.api.app.bsky.actor.getProfile(
+          { actor: alice },
+          {
+            headers: await network.serviceHeaders(
+              bob,
+              ids.AppBskyActorGetProfile,
+            ),
+          },
+        )
+
         expect(forSnapshot(data.status)).toBeUndefined()
       })
     })