@atproto/bsky 0.0.205 → 0.0.207

package/package.json

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

package/src/api/age-assurance/const.ts

@@ -16,6 +16,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'GB',
       regionCode: undefined,
+      minAccessAge: 13,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -36,6 +37,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'AU',
       regionCode: undefined,
+      minAccessAge: 16,
       rules: [
         {
           $type: ids.IfAccountNewerThan,
@@ -66,6 +68,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'SD',
+      minAccessAge: 13,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -86,6 +89,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'WY',
+      minAccessAge: 13,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -106,6 +110,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'OH',
+      minAccessAge: 13,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -126,6 +131,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'MS',
+      minAccessAge: 18,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -141,6 +147,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'VA',
+      minAccessAge: 16,
       rules: [
         {
           $type: ids.IfAssuredOverAge,
@@ -161,6 +168,7 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     {
       countryCode: 'US',
       regionCode: 'TN',
+      minAccessAge: 18,
       rules: [
         {
           $type: ids.IfAssuredOverAge,

package/src/api/app/bsky/actor/getProfile.ts

@@ -61,7 +61,7 @@ const hydration = async (input: {
   return ctx.hydrator.hydrateProfilesDetailed(
     [skeleton.did],
     params.hydrateCtx.copy({
-      includeActorTakedowns: true,
+      overrideIncludeTakedownsForActor: true,
     }),
   )
 }

package/src/hydration/actor.ts

@@ -160,10 +160,20 @@ 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 } = opts
+    const {
+      includeTakedowns = false,
+      skipCacheForDids,
+      includeTakedownsBase = false,
+    } = opts
     if (!dids.length) return new HydrationMap<Actor>()
     const res = await this.dataplane.getActors({ dids, skipCacheForDids })
     return dids.reduce((acc, did, i) => {
@@ -184,7 +194,7 @@ export class ActorHydrator {
         : undefined
 
       const status = actor.statusRecord
-        ? parseRecord<StatusRecord>(actor.statusRecord, includeTakedowns)
+        ? parseRecord<StatusRecord>(actor.statusRecord, includeTakedownsBase)
         : undefined
 
       const verifications = mapDefined(

package/src/hydration/hydrator.ts

@@ -80,7 +80,7 @@ export class HydrateCtx {
   labelers = this.vals.labelers
   viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
   includeTakedowns = this.vals.includeTakedowns
-  includeActorTakedowns = this.vals.includeActorTakedowns
+  overrideIncludeTakedownsForActor = this.vals.overrideIncludeTakedownsForActor
   include3pBlocks = this.vals.include3pBlocks
   includeDebugField = this.vals.includeDebugField
   featureGates: CheckedFeatureGatesMap = this.vals.featureGates || new Map()
@@ -99,7 +99,7 @@ export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: string | null
   includeTakedowns?: boolean
-  includeActorTakedowns?: boolean
+  overrideIncludeTakedownsForActor?: boolean
   include3pBlocks?: boolean
   includeDebugField?: boolean
   featureGates?: CheckedFeatureGatesMap
@@ -228,10 +228,17 @@ export class Hydrator {
     dids: string[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
-    const includeTakedowns = ctx.includeTakedowns || ctx.includeActorTakedowns
+    /**
+     * Special case here, we want to include takedowns in special cases, like
+     * `getProfile`, since we throw client-facing errors later in the pipeline.
+     */
+    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

@@ -812,6 +812,14 @@ export const schemaDict = {
         type: 'object',
         required: ['status', 'record'],
         properties: {
+          uri: {
+            type: 'string',
+            format: 'at-uri',
+          },
+          cid: {
+            type: 'string',
+            format: 'cid',
+          },
           status: {
             type: 'string',
             description: 'The status for the account.',
@@ -1345,7 +1353,7 @@ export const schemaDict = {
       configRegion: {
         type: 'object',
         description: 'The Age Assurance configuration for a specific region.',
-        required: ['countryCode', 'rules'],
+        required: ['countryCode', 'minAccessAge', 'rules'],
         properties: {
           countryCode: {
             type: 'string',
@@ -1357,6 +1365,11 @@ export const schemaDict = {
             description:
               'The ISO 3166-2 region code this configuration applies to. If omitted, the configuration applies to the entire country.',
           },
+          minAccessAge: {
+            type: 'integer',
+            description:
+              'The minimum age (as a whole integer) required to use Bluesky in this region.',
+          },
           rules: {
             type: 'array',
             description:

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

@@ -652,6 +652,8 @@ export function validatePostInteractionSettingsPref<V>(v: V) {
 
 export interface StatusView {
   $type?: 'app.bsky.actor.defs#statusView'
+  uri?: string
+  cid?: string
   /** The status for the account. */
   status: 'app.bsky.actor.status#live' | (string & {})
   record: { [_ in string]: unknown }

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

@@ -83,6 +83,8 @@ export interface ConfigRegion {
   countryCode: string
   /** The ISO 3166-2 region code this configuration applies to. If omitted, the configuration applies to the entire country. */
   regionCode?: string
+  /** The minimum age (as a whole integer) required to use Bluesky in this region. */
+  minAccessAge: number
   /** The ordered list of Age Assurance rules that apply to this region. Rules should be applied in order, and the first matching rule determines the access level granted. The rules array should always include a default rule as the last item. */
   rules: (
     | $Typed<ConfigRegionRuleDefault>

package/src/views/index.ts

@@ -545,7 +545,8 @@ export class Views {
     if (!actor?.status) return
 
     const { status } = actor
-    const { record, sortedAt } = status
+    const { record, sortedAt, cid } = status
+    const uri = AtUri.make(did, ids.AppBskyActorStatus, 'self').toString()
 
     const minDuration = 5 * MINUTE
     const maxDuration = 4 * HOUR
@@ -564,6 +565,8 @@ export class Views {
     const isActive = expiresAtMs ? expiresAtMs > Date.now() : undefined
 
     return {
+      uri,
+      cid,
       record: record,
       status: record.status,
       embed: isExternalEmbed(record.embed)

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

@@ -703,6 +703,7 @@ Object {
 
 exports[`pds profile views status returns active status when within the duration 1`] = `
 Object {
+  "cid": "cids(0)",
   "embed": Object {
     "$type": "app.bsky.embed.external#view",
     "external": Object {
@@ -728,11 +729,13 @@ Object {
     "status": "app.bsky.actor.status#live",
   },
   "status": "app.bsky.actor.status#live",
+  "uri": "record(0)",
 }
 `;
 
 exports[`pds profile views status when outside the duration returns inactive status 1`] = `
 Object {
+  "cid": "cids(0)",
   "embed": Object {
     "$type": "app.bsky.embed.external#view",
     "external": Object {
@@ -741,11 +744,11 @@ Object {
       "uri": "https://example.com",
     },
   },
-  "expiresAt": "2021-01-01T01:10:00.000Z",
+  "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": false,
   "record": Object {
     "$type": "app.bsky.actor.status",
-    "createdAt": "2021-01-01T01:00:00.000Z",
+    "createdAt": "1970-01-01T00:00:00.000Z",
     "durationMinutes": 10,
     "embed": Object {
       "$type": "app.bsky.embed.external",
@@ -758,5 +761,6 @@ Object {
     "status": "app.bsky.actor.status#live",
   },
   "status": "app.bsky.actor.status#live",
+  "uri": "record(0)",
 }
 `;

package/tests/views/age-assurance-v2.test.ts

@@ -33,6 +33,7 @@ jest.mock('../../dist/api/age-assurance/const.js', () => {
       {
         countryCode: 'AA',
         regionCode: undefined,
+        minAccessAge: 13,
         rules: [
           {
             $type: ruleIds.IfAssuredOverAge,
@@ -48,6 +49,7 @@ jest.mock('../../dist/api/age-assurance/const.js', () => {
       {
         countryCode: 'BB',
         regionCode: undefined,
+        minAccessAge: 13,
         rules: [
           {
             $type: ruleIds.IfAssuredOverAge,

package/tests/views/profile.test.ts

@@ -490,7 +490,47 @@ describe('pds profile views', () => {
         )
 
         // Doesn't need `forSnapshot` because the dates are already mocked.
-        expect(data.status).toMatchSnapshot()
+        expect(forSnapshot(data.status)).toMatchSnapshot()
+      })
+    })
+
+    describe('when taken down', () => {
+      it('it does not return the live status', async () => {
+        const res = await sc.agent.com.atproto.repo.putRecord(
+          {
+            repo: alice,
+            collection: ids.AppBskyActorStatus,
+            rkey: 'self',
+            record: {
+              status: 'app.bsky.actor.status#live',
+              embed,
+              durationMinutes: 10,
+              createdAt: new Date().toISOString(),
+            },
+          },
+          {
+            headers: sc.getHeaders(alice),
+            encoding: 'application/json',
+          },
+        )
+        await network.processAll()
+
+        await network.bsky.ctx.dataplane.takedownRecord({
+          recordUri: res.data.uri,
+        })
+        await network.processAll()
+
+        const { data } = await agent.api.app.bsky.actor.getProfile(
+          { actor: alice },
+          {
+            headers: await network.serviceHeaders(
+              alice,
+              ids.AppBskyActorGetProfile,
+            ),
+          },
+        )
+
+        expect(forSnapshot(data.status)).toBeUndefined()
       })
     })
   })