@atproto/bsky 0.0.200 → 0.0.202

package/dist/stash.d.ts

@@ -1,11 +1,12 @@
 import { LexValue } from '@atproto/lexicon';
 import { BsyncClient } from './bsync';
 export declare const Namespaces: {
+    AppBskyAgeassuranceDefsEvent: string;
     AppBskyBookmarkDefsBookmark: string;
+    AppBskyContactDefsNotification: string;
     AppBskyNotificationDefsPreferences: string;
     AppBskyNotificationDefsSubjectActivitySubscription: string;
     AppBskyUnspeccedDefsAgeAssuranceEvent: string;
-    AppBskyAgeassuranceDefsEvent: string;
 };
 export type Namespace = (typeof Namespaces)[keyof typeof Namespaces];
 export declare const createStashClient: (bsyncClient: BsyncClient) => StashClient;

package/dist/stash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stash.d.ts","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAgB,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAarC,eAAO,MAAM,UAAU;;;;;;CAWtB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAA;AAEpE,eAAO,MAAM,iBAAiB,GAAI,aAAa,WAAW,KAAG,WAE5D,CAAA;AAID,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAErD,MAAM,CAAC,KAAK,EAAE,WAAW;IAKzB,MAAM,CAAC,KAAK,EAAE,WAAW;IAKzB,MAAM,CAAC,KAAK,EAAE,WAAW;IAIzB,OAAO,CAAC,eAAe;YAOT,YAAY;CAiB3B;AASD,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAA;AAED,KAAK,WAAW,GAAG,WAAW,CAAA;AAE9B,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA"}
+{"version":3,"file":"stash.d.ts","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAgB,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAcrC,eAAO,MAAM,UAAU;;;;;;;CAatB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAA;AAEpE,eAAO,MAAM,iBAAiB,GAAI,aAAa,WAAW,KAAG,WAE5D,CAAA;AAID,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAErD,MAAM,CAAC,KAAK,EAAE,WAAW;IAKzB,MAAM,CAAC,KAAK,EAAE,WAAW;IAKzB,MAAM,CAAC,KAAK,EAAE,WAAW;IAIzB,OAAO,CAAC,eAAe;YAOT,YAAY;CAiB3B;AASD,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAA;AAED,KAAK,WAAW,GAAG,WAAW,CAAA;AAE9B,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA"}

package/dist/stash.js

@@ -6,11 +6,12 @@ const lexicon_1 = require("@atproto/lexicon");
 const lexicons_1 = require("./lexicon/lexicons");
 const bsync_pb_1 = require("./proto/bsync_pb");
 exports.Namespaces = {
+    AppBskyAgeassuranceDefsEvent: 'app.bsky.ageassurance.defs#event',
     AppBskyBookmarkDefsBookmark: 'app.bsky.bookmark.defs#bookmark',
+    AppBskyContactDefsNotification: 'app.bsky.contact.defs#notification',
     AppBskyNotificationDefsPreferences: 'app.bsky.notification.defs#preferences',
     AppBskyNotificationDefsSubjectActivitySubscription: 'app.bsky.notification.defs#subjectActivitySubscription',
     AppBskyUnspeccedDefsAgeAssuranceEvent: 'app.bsky.unspecced.defs#ageAssuranceEvent',
-    AppBskyAgeassuranceDefsEvent: 'app.bsky.ageassurance.defs#event',
 };
 const createStashClient = (bsyncClient) => {
     return new StashClient(bsyncClient);

package/dist/stash.js.map

@@ -1 +1 @@
-{"version":3,"file":"stash.js","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":";AAAA,yCAAyC;;;AAEzC,8CAAyD;AAEzD,iDAA6C;AAQ7C,+CAAyC;AAI5B,QAAA,UAAU,GAAG;IACxB,2BAA2B,EACzB,iCAA8D;IAChE,kCAAkC,EAChC,wCAAwE;IAC1E,kDAAkD,EAChD,wDAAwG;IAC1G,qCAAqC,EACnC,2CAAiF;IACnF,4BAA4B,EAC1B,kCAA0E;CAC7E,CAAA;AAIM,MAAM,iBAAiB,GAAG,CAAC,WAAwB,EAAe,EAAE;IACzE,OAAO,IAAI,WAAW,CAAC,WAAW,CAAC,CAAA;AACrC,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED,8EAA8E;AAC9E,2FAA2F;AAC3F,MAAa,WAAW;IACtB,YAA6B,WAAwB;QAAzC;;;;mBAAiB,WAAW;WAAa;IAAG,CAAC;IAEzD,MAAM,CAAC,KAAkB;QACvB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAkB;QACvB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAkB;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IAC3E,CAAC;IAEO,eAAe,CAAC,SAAoB,EAAE,OAAiB;QAC7D,MAAM,MAAM,GAAG,mBAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QACpD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,MAAM,CAAC,KAAK,CAAA;QACpB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,KAAwB;QACjE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;QACnD,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;YAClC,QAAQ;YACR,SAAS;YACT,GAAG;YACH,MAAM;YACN,OAAO,EAAE,OAAO;gBACd,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAA,sBAAY,EAAC;oBACX,KAAK,EAAE,SAAS;oBAChB,GAAG,OAAO;iBACX,CAAC,CACH;gBACH,CAAC,CAAC,SAAS;SACd,CAAC,CAAA;IACJ,CAAC;CACF;AAzCD,kCAyCC","sourcesContent":["/* eslint-disable import/no-deprecated */\n\nimport { LexValue, stringifyLex } from '@atproto/lexicon'\nimport { BsyncClient } from './bsync'\nimport { lexicons } from './lexicon/lexicons'\nimport { Event as AgeAssuranceEventV2 } from './lexicon/types/app/bsky/ageassurance/defs'\nimport { Bookmark } from './lexicon/types/app/bsky/bookmark/defs'\nimport {\n  Preferences,\n  SubjectActivitySubscription,\n} from './lexicon/types/app/bsky/notification/defs'\nimport { AgeAssuranceEvent } from './lexicon/types/app/bsky/unspecced/defs'\nimport { Method } from './proto/bsync_pb'\n\ntype PickNSID<T extends { $type?: string }> = Exclude<T['$type'], undefined>\n\nexport const Namespaces = {\n  AppBskyBookmarkDefsBookmark:\n    'app.bsky.bookmark.defs#bookmark' satisfies PickNSID<Bookmark>,\n  AppBskyNotificationDefsPreferences:\n    'app.bsky.notification.defs#preferences' satisfies PickNSID<Preferences>,\n  AppBskyNotificationDefsSubjectActivitySubscription:\n    'app.bsky.notification.defs#subjectActivitySubscription' satisfies PickNSID<SubjectActivitySubscription>,\n  AppBskyUnspeccedDefsAgeAssuranceEvent:\n    'app.bsky.unspecced.defs#ageAssuranceEvent' satisfies PickNSID<AgeAssuranceEvent>,\n  AppBskyAgeassuranceDefsEvent:\n    'app.bsky.ageassurance.defs#event' satisfies PickNSID<AgeAssuranceEventV2>,\n}\n\nexport type Namespace = (typeof Namespaces)[keyof typeof Namespaces]\n\nexport const createStashClient = (bsyncClient: BsyncClient): StashClient => {\n  return new StashClient(bsyncClient)\n}\n\n// An abstraction over the BsyncClient, that uses the bsync `PutOperation` RPC\n// to store private data, which can be indexed by the dataplane and queried by the appview.\nexport class StashClient {\n  constructor(private readonly bsyncClient: BsyncClient) {}\n\n  create(input: CreateInput) {\n    this.validateLexicon(input.namespace, input.payload)\n    return this.putOperation(Method.CREATE, input)\n  }\n\n  update(input: UpdateInput) {\n    this.validateLexicon(input.namespace, input.payload)\n    return this.putOperation(Method.UPDATE, input)\n  }\n\n  delete(input: DeleteInput) {\n    return this.putOperation(Method.DELETE, { ...input, payload: undefined })\n  }\n\n  private validateLexicon(namespace: Namespace, payload: LexValue) {\n    const result = lexicons.validate(namespace, payload)\n    if (!result.success) {\n      throw result.error\n    }\n  }\n\n  private async putOperation(method: Method, input: PutOperationInput) {\n    const { actorDid, namespace, key, payload } = input\n    await this.bsyncClient.putOperation({\n      actorDid,\n      namespace,\n      key,\n      method,\n      payload: payload\n        ? Buffer.from(\n            stringifyLex({\n              $type: namespace,\n              ...payload,\n            }),\n          )\n        : undefined,\n    })\n  }\n}\n\ntype PutOperationInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n  payload: LexValue | undefined\n}\n\ntype CreateInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n  payload: LexValue\n}\n\ntype UpdateInput = CreateInput\n\ntype DeleteInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n}\n"]}
+{"version":3,"file":"stash.js","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":";AAAA,yCAAyC;;;AAEzC,8CAAyD;AAEzD,iDAA6C;AAS7C,+CAAyC;AAI5B,QAAA,UAAU,GAAG;IACxB,4BAA4B,EAC1B,kCAA0E;IAC5E,2BAA2B,EACzB,iCAA8D;IAChE,8BAA8B,EAC5B,oCAAqE;IACvE,kCAAkC,EAChC,wCAAwE;IAC1E,kDAAkD,EAChD,wDAAwG;IAC1G,qCAAqC,EACnC,2CAAiF;CACpF,CAAA;AAIM,MAAM,iBAAiB,GAAG,CAAC,WAAwB,EAAe,EAAE;IACzE,OAAO,IAAI,WAAW,CAAC,WAAW,CAAC,CAAA;AACrC,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED,8EAA8E;AAC9E,2FAA2F;AAC3F,MAAa,WAAW;IACtB,YAA6B,WAAwB;QAAzC;;;;mBAAiB,WAAW;WAAa;IAAG,CAAC;IAEzD,MAAM,CAAC,KAAkB;QACvB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAkB;QACvB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAkB;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAM,CAAC,MAAM,EAAE,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IAC3E,CAAC;IAEO,eAAe,CAAC,SAAoB,EAAE,OAAiB;QAC7D,MAAM,MAAM,GAAG,mBAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QACpD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,MAAM,CAAC,KAAK,CAAA;QACpB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,KAAwB;QACjE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;QACnD,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;YAClC,QAAQ;YACR,SAAS;YACT,GAAG;YACH,MAAM;YACN,OAAO,EAAE,OAAO;gBACd,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAA,sBAAY,EAAC;oBACX,KAAK,EAAE,SAAS;oBAChB,GAAG,OAAO;iBACX,CAAC,CACH;gBACH,CAAC,CAAC,SAAS;SACd,CAAC,CAAA;IACJ,CAAC;CACF;AAzCD,kCAyCC","sourcesContent":["/* eslint-disable import/no-deprecated */\n\nimport { LexValue, stringifyLex } from '@atproto/lexicon'\nimport { BsyncClient } from './bsync'\nimport { lexicons } from './lexicon/lexicons'\nimport { Event as AgeAssuranceEventV2 } from './lexicon/types/app/bsky/ageassurance/defs'\nimport { Bookmark } from './lexicon/types/app/bsky/bookmark/defs'\nimport { Notification } from './lexicon/types/app/bsky/contact/defs'\nimport {\n  Preferences,\n  SubjectActivitySubscription,\n} from './lexicon/types/app/bsky/notification/defs'\nimport { AgeAssuranceEvent } from './lexicon/types/app/bsky/unspecced/defs'\nimport { Method } from './proto/bsync_pb'\n\ntype PickNSID<T extends { $type?: string }> = Exclude<T['$type'], undefined>\n\nexport const Namespaces = {\n  AppBskyAgeassuranceDefsEvent:\n    'app.bsky.ageassurance.defs#event' satisfies PickNSID<AgeAssuranceEventV2>,\n  AppBskyBookmarkDefsBookmark:\n    'app.bsky.bookmark.defs#bookmark' satisfies PickNSID<Bookmark>,\n  AppBskyContactDefsNotification:\n    'app.bsky.contact.defs#notification' satisfies PickNSID<Notification>,\n  AppBskyNotificationDefsPreferences:\n    'app.bsky.notification.defs#preferences' satisfies PickNSID<Preferences>,\n  AppBskyNotificationDefsSubjectActivitySubscription:\n    'app.bsky.notification.defs#subjectActivitySubscription' satisfies PickNSID<SubjectActivitySubscription>,\n  AppBskyUnspeccedDefsAgeAssuranceEvent:\n    'app.bsky.unspecced.defs#ageAssuranceEvent' satisfies PickNSID<AgeAssuranceEvent>,\n}\n\nexport type Namespace = (typeof Namespaces)[keyof typeof Namespaces]\n\nexport const createStashClient = (bsyncClient: BsyncClient): StashClient => {\n  return new StashClient(bsyncClient)\n}\n\n// An abstraction over the BsyncClient, that uses the bsync `PutOperation` RPC\n// to store private data, which can be indexed by the dataplane and queried by the appview.\nexport class StashClient {\n  constructor(private readonly bsyncClient: BsyncClient) {}\n\n  create(input: CreateInput) {\n    this.validateLexicon(input.namespace, input.payload)\n    return this.putOperation(Method.CREATE, input)\n  }\n\n  update(input: UpdateInput) {\n    this.validateLexicon(input.namespace, input.payload)\n    return this.putOperation(Method.UPDATE, input)\n  }\n\n  delete(input: DeleteInput) {\n    return this.putOperation(Method.DELETE, { ...input, payload: undefined })\n  }\n\n  private validateLexicon(namespace: Namespace, payload: LexValue) {\n    const result = lexicons.validate(namespace, payload)\n    if (!result.success) {\n      throw result.error\n    }\n  }\n\n  private async putOperation(method: Method, input: PutOperationInput) {\n    const { actorDid, namespace, key, payload } = input\n    await this.bsyncClient.putOperation({\n      actorDid,\n      namespace,\n      key,\n      method,\n      payload: payload\n        ? Buffer.from(\n            stringifyLex({\n              $type: namespace,\n              ...payload,\n            }),\n          )\n        : undefined,\n    })\n  }\n}\n\ntype PutOperationInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n  payload: LexValue | undefined\n}\n\ntype CreateInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n  payload: LexValue\n}\n\ntype UpdateInput = CreateInput\n\ntype DeleteInput = {\n  actorDid: string\n  namespace: Namespace\n  key: string\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.200",
+  "version": "0.0.202",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -51,9 +51,9 @@
     "uint8arrays": "3.0.0",
     "undici": "^6.19.8",
     "zod": "3.23.8",
-    "@atproto-labs/xrpc-utils": "0.0.24",
     "@atproto-labs/fetch-node": "0.2.0",
-    "@atproto/api": "^0.18.5",
+    "@atproto-labs/xrpc-utils": "0.0.24",
+    "@atproto/api": "^0.18.7",
     "@atproto/common": "^0.5.3",
     "@atproto/crypto": "^0.4.5",
     "@atproto/did": "^0.2.3",
@@ -61,8 +61,8 @@
     "@atproto/lexicon": "^0.6.0",
     "@atproto/repo": "^0.8.12",
     "@atproto/sync": "^0.1.39",
-    "@atproto/xrpc-server": "^0.10.3",
-    "@atproto/syntax": "^0.4.2"
+    "@atproto/syntax": "^0.4.2",
+    "@atproto/xrpc-server": "^0.10.3"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -78,10 +78,10 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.18.5",
-    "@atproto/lex-cli": "^0.9.8",
-    "@atproto/pds": "^0.4.198",
-    "@atproto/xrpc": "^0.7.7"
+    "@atproto/api": "^0.18.7",
+    "@atproto/xrpc": "^0.7.7",
+    "@atproto/pds": "^0.4.199",
+    "@atproto/lex-cli": "^0.9.8"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/*",

package/proto/bsky.proto

@@ -1310,6 +1310,33 @@ message GetFollowsFollowingResponse {
   repeated FollowsFollowing results = 1;
 }
 
+message GetSitemapIndexRequest {
+  SitemapPageType type = 1;
+}
+
+message GetSitemapIndexResponse {
+  // GZIP compressed XML sitemap
+  bytes sitemap = 1;
+}
+
+// Sitemap HTTP paths are typically of the form `/type/yyyy-mm-dd/N.xml.gz`, i.e. `/users/2025-01-01/1.xml.gz`
+message GetSitemapPageRequest {
+  SitemapPageType type = 1;
+  google.protobuf.Timestamp date = 2;
+  // One-indexed
+  int32 bucket = 3;
+}
+
+enum SitemapPageType {
+  SITEMAP_PAGE_TYPE_UNSPECIFIED = 0;
+  SITEMAP_PAGE_TYPE_USER = 1;
+}
+
+message GetSitemapPageResponse {
+  // GZIP compressed XML sitemap
+  bytes sitemap = 1;
+}
+
 // Ping
 message PingRequest {}
 message PingResponse {}
@@ -1470,6 +1497,10 @@ service Service {
   // Graph
   rpc GetFollowsFollowing(GetFollowsFollowingRequest) returns (GetFollowsFollowingResponse);
 
+  // Sitemaps
+  rpc GetSitemapIndex(GetSitemapIndexRequest) returns (GetSitemapIndexResponse);
+  rpc GetSitemapPage(GetSitemapPageRequest) returns (GetSitemapPageResponse);
+
   // Ping
   rpc Ping(PingRequest) returns (PingResponse);
 

package/src/api/app/bsky/ageassurance/begin.ts

@@ -37,17 +37,14 @@ export default function (server: Server, ctx: AppContext) {
 
       const actorDid = auth.credentials.iss
       const actorInfo = await getAgeVerificationState(ctx, actorDid)
+      const existingStatus = actorInfo?.ageAssuranceStatus?.status
+      const existingAccess = actorInfo?.ageAssuranceStatus?.access
 
-      if (actorInfo?.ageAssuranceStatus) {
-        if (
-          actorInfo.ageAssuranceStatus.status !== 'unknown' &&
-          actorInfo.ageAssuranceStatus.status !== 'pending'
-        ) {
-          throw new InvalidRequestError(
-            `Cannot initiate age assurance flow from current state: ${actorInfo.ageAssuranceStatus.status}`,
-            'InvalidInitiation',
-          )
-        }
+      if (existingStatus === 'blocked') {
+        throw new InvalidRequestError(
+          `Cannot initiate age assurance flow from current state: ${existingStatus}`,
+          'InvalidInitiation',
+        )
       }
 
       const attemptId = crypto.randomUUID()
@@ -110,14 +107,24 @@ export default function (server: Server, ctx: AppContext) {
         })
       }
 
+      // If we have existing status/access for this region, retain it.
+      const nextStatus =
+        existingStatus && existingStatus !== 'unknown'
+          ? existingStatus
+          : 'pending'
+      const nextAccess =
+        existingAccess && existingAccess !== 'unknown'
+          ? existingAccess
+          : 'unknown'
+
       const event = await createEvent(ctx, actorDid, {
         attemptId,
         email,
         // Assumes `app.set('trust proxy', ...)` configured with `true` or specific values.
         initIp: req.ip,
         initUa: getClientUa(req),
-        status: 'pending',
-        access: 'unknown',
+        status: nextStatus,
+        access: nextAccess,
         countryCode,
         regionCode,
       })
@@ -126,8 +133,8 @@ export default function (server: Server, ctx: AppContext) {
         encoding: 'application/json',
         body: {
           lastInitiatedAt: event.createdAt,
-          status: 'pending',
-          access: 'unknown',
+          status: nextStatus,
+          access: nextAccess,
         },
       }
     },

package/src/api/app/bsky/contact/sendNotification.ts

@@ -0,0 +1,32 @@
+import { TID } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { Namespaces } from '../../../../stash'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.contact.sendNotification({
+    auth: ctx.authVerifier.role,
+    handler: async ({ input }) => {
+      // Assert rolodex even though we don't call it, it is a proxy to whether the app is configured with contact import support.
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const { from, to } = input.body
+
+      await ctx.stashClient.create({
+        actorDid: from,
+        namespace: Namespaces.AppBskyContactDefsNotification,
+        payload: {
+          from,
+          to,
+        },
+        key: TID.nextStr(),
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {},
+      }
+    },
+  })
+}

package/src/api/index.ts

@@ -95,6 +95,8 @@ export * as blobResolver from './blob-resolver'
 
 export * as external from './external'
 
+export * as sitemap from './sitemap'
+
 export default function (server: Server, ctx: AppContext) {
   // app.bsky
   getTimeline(server, ctx)

package/src/api/sitemap.ts

@@ -0,0 +1,76 @@
+import { Readable } from 'node:stream'
+import { Timestamp } from '@bufbuild/protobuf'
+import { Code, ConnectError } from '@connectrpc/connect'
+import express, { RequestHandler, Router } from 'express'
+import { AppContext } from '../context'
+import { httpLogger as log } from '../logger'
+import { SitemapPageType } from '../proto/bsky_pb'
+
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
+  router.get('/external/sitemap/users.xml.gz', userIndexHandler(ctx))
+  router.get(
+    '/external/sitemap/users/:date/:bucket.xml.gz',
+    userPageHandler(ctx),
+  )
+  return router
+}
+
+const userIndexHandler =
+  (ctx: AppContext): RequestHandler =>
+  async (_req: express.Request, res: express.Response) => {
+    try {
+      const result = await ctx.dataplane.getSitemapIndex({
+        type: SitemapPageType.USER,
+      })
+      res.set('Content-Type', 'application/gzip')
+      res.set('Content-Encoding', 'gzip')
+      Readable.from(Buffer.from(result.sitemap)).pipe(res)
+    } catch (err) {
+      log.error({ err }, 'failed to get sitemap index')
+      return res.status(500).send('Internal Server Error')
+    }
+  }
+
+const userPageHandler =
+  (ctx: AppContext): RequestHandler =>
+  async (req: express.Request, res: express.Response) => {
+    const { date, bucket } = req.params
+
+    // Parse date (YYYY-MM-DD format)
+    const dateParts = date.split('-')
+    if (dateParts.length !== 3) {
+      return res.status(400).send('Invalid date format. Expected YYYY-MM-DD')
+    }
+
+    const year = parseInt(dateParts[0], 10)
+    const month = parseInt(dateParts[1], 10)
+    const day = parseInt(dateParts[2], 10)
+
+    if (isNaN(year) || isNaN(month) || isNaN(day)) {
+      return res.status(400).send('Invalid date format. Expected YYYY-MM-DD')
+    }
+
+    // Parse bucket (1-indexed)
+    const bucketNum = parseInt(bucket, 10)
+    if (isNaN(bucketNum) || bucketNum < 1) {
+      return res.status(400).send('Invalid bucket number')
+    }
+
+    try {
+      const result = await ctx.dataplane.getSitemapPage({
+        type: SitemapPageType.USER,
+        date: Timestamp.fromDate(new Date(year, month - 1, day)),
+        bucket: bucketNum,
+      })
+      res.set('Content-Type', 'application/gzip')
+      res.set('Content-Encoding', 'gzip')
+      Readable.from(Buffer.from(result.sitemap)).pipe(res)
+    } catch (err) {
+      if (err instanceof ConnectError && err.code === Code.NotFound) {
+        return res.status(404).send('Sitemap page not found')
+      }
+      log.error({ err }, 'failed to get sitemap page')
+      return res.status(500).send('Internal Server Error')
+    }
+  }

package/src/data-plane/server/routes/index.ts

@@ -22,6 +22,7 @@ import records from './records'
 import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
+import sitemap from './sitemap'
 import starterPacks from './starter-packs'
 import suggestions from './suggestions'
 import sync from './sync'
@@ -50,6 +51,7 @@ export default (db: Database, idResolver: IdResolver) =>
       ...relationships(db),
       ...reposts(db),
       ...search(db),
+      ...sitemap(),
       ...suggestions(db),
       ...sync(db),
       ...threads(db),

package/src/data-plane/server/routes/profile.ts

@@ -136,12 +136,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
 
         const status = row?.ageAssuranceStatus ?? 'unknown'
         let access = row?.ageAssuranceAccess
-        if (status === 'assured') {
-          access = 'full'
-        } else if (status === 'blocked') {
-          access = 'none'
-        } else {
-          access = 'unknown'
+        if (!access || access === 'unknown') {
+          if (status === 'assured') {
+            access = 'full'
+          } else if (status === 'blocked') {
+            access = 'none'
+          } else {
+            access = 'unknown'
+          }
         }
 
         return {

package/src/data-plane/server/routes/sitemap.ts

@@ -0,0 +1,43 @@
+import { gzipSync } from 'node:zlib'
+import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { Service } from '../../../proto/bsky_connect'
+import { GetSitemapPageRequest } from '../../../proto/bsky_pb'
+
+const MOCK_SITEMAP_INDEX = `<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap>
+    <loc>https://bsky.app/sitemap/users/2025-01-01/1.xml.gz</loc>
+  </sitemap>
+</sitemapindex>`
+
+const MOCK_SITEMAP_PAGE = `<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>https://bsky.app/profile/test.bsky.social</loc>
+  </url>
+</urlset>`
+
+export default (): Partial<ServiceImpl<typeof Service>> => ({
+  async getSitemapIndex() {
+    return {
+      sitemap: gzipSync(Buffer.from(MOCK_SITEMAP_INDEX)),
+    }
+  },
+  async getSitemapPage(req: GetSitemapPageRequest) {
+    const date = req.date?.toDate()
+    const isExpectedDate =
+      date &&
+      date.getFullYear() === 2025 &&
+      date.getMonth() === 0 &&
+      date.getDate() === 1
+    const isExpectedBucket = req.bucket === 1
+
+    if (!isExpectedDate || !isExpectedBucket) {
+      throw new ConnectError('Sitemap page not found', Code.NotFound)
+    }
+
+    return {
+      sitemap: gzipSync(Buffer.from(MOCK_SITEMAP_PAGE)),
+    }
+  },
+})

package/src/index.ts

@@ -10,7 +10,7 @@ import { AtpAgent } from '@atproto/api'
 import { DAY, SECOND } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
-import API, { blobResolver, external, health, wellKnown } from './api'
+import API, { blobResolver, external, health, sitemap, wellKnown } from './api'
 import { createBlobDispatcher } from './api/blob-dispatcher'
 import { AuthVerifier, createPublicKeyObject } from './auth-verifier'
 import { authWithApiKey as bsyncAuth, createBsyncClient } from './bsync'
@@ -225,6 +225,11 @@ export class BskyAppView {
     app.use(wellKnown.createRouter(ctx))
     app.use(blobResolver.createMiddleware(ctx))
     app.use(imageServer.createMiddleware(ctx, { prefix: '/img/' }))
+
+    if (config.dataplaneUrls.length > 0 || config.dataplaneUrlsEtcdKeyPrefix) {
+      app.use(sitemap.createRouter(ctx))
+    }
+
     app.use(server.xrpc.router)
     app.use(error.handler)
     app.use('/external', external.createRouter(ctx))

package/src/lexicon/index.ts

@@ -28,6 +28,7 @@ import * as AppBskyContactGetMatches from './types/app/bsky/contact/getMatches.j
 import * as AppBskyContactGetSyncStatus from './types/app/bsky/contact/getSyncStatus.js'
 import * as AppBskyContactImportContacts from './types/app/bsky/contact/importContacts.js'
 import * as AppBskyContactRemoveData from './types/app/bsky/contact/removeData.js'
+import * as AppBskyContactSendNotification from './types/app/bsky/contact/sendNotification.js'
 import * as AppBskyContactStartPhoneVerification from './types/app/bsky/contact/startPhoneVerification.js'
 import * as AppBskyContactVerifyPhone from './types/app/bsky/contact/verifyPhone.js'
 import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
@@ -557,6 +558,18 @@ export class AppBskyContactNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  sendNotification<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactSendNotification.QueryParams,
+      AppBskyContactSendNotification.HandlerInput,
+      AppBskyContactSendNotification.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.sendNotification' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   startPhoneVerification<A extends Auth = void>(
     cfg: MethodConfigOrHandler<
       A,

package/src/lexicon/lexicons.ts

@@ -401,6 +401,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#savedFeedsPref',
             'lex:app.bsky.actor.defs#savedFeedsPrefV2',
             'lex:app.bsky.actor.defs#personalDetailsPref',
+            'lex:app.bsky.actor.defs#declaredAgePref',
             'lex:app.bsky.actor.defs#feedViewPref',
             'lex:app.bsky.actor.defs#threadViewPref',
             'lex:app.bsky.actor.defs#interestsPref',
@@ -507,6 +508,28 @@ export const schemaDict = {
           },
         },
       },
+      declaredAgePref: {
+        type: 'object',
+        description:
+          "Read-only preference containing value(s) inferred from the user's declared birthdate. Absence of this preference object in the response indicates that the user has not made a declaration.",
+        properties: {
+          isOverAge13: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 13 years of age.',
+          },
+          isOverAge16: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 16 years of age.',
+          },
+          isOverAge18: {
+            type: 'boolean',
+            description:
+              'Indicates if the user has declared that they are over 18 years of age.',
+          },
+        },
+      },
       feedViewPref: {
         type: 'object',
         required: ['feed'],
@@ -1776,6 +1799,24 @@ export const schemaDict = {
           },
         },
       },
+      notification: {
+        description:
+          'A stash object to be sent via bsync representing a notification to be created.',
+        type: 'object',
+        required: ['from', 'to'],
+        properties: {
+          from: {
+            description: 'The DID of who this notification comes from.',
+            type: 'string',
+            format: 'did',
+          },
+          to: {
+            description: 'The DID of who this notification should go to.',
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
     },
   },
   AppBskyContactDismissMatch: {
@@ -1991,6 +2032,43 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyContactSendNotification: {
+    lexicon: 1,
+    id: 'app.bsky.contact.sendNotification',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          "WARNING: This is unstable and under active development, don't use it while this warning is here. System endpoint to send notifications related to contact imports. Requires role authentication.",
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['from', 'to'],
+            properties: {
+              from: {
+                description: 'The DID of who this notification comes from.',
+                type: 'string',
+                format: 'did',
+              },
+              to: {
+                description: 'The DID of who this notification should go to.',
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {},
+          },
+        },
+      },
+    },
+  },
   AppBskyContactStartPhoneVerification: {
     lexicon: 1,
     id: 'app.bsky.contact.startPhoneVerification',
@@ -6725,6 +6803,7 @@ export const schemaDict = {
               'like-via-repost',
               'repost-via-repost',
               'subscribed-post',
+              'contact-match',
             ],
           },
           reasonSubject: {
@@ -14793,6 +14872,7 @@ export const ids = {
   AppBskyContactGetSyncStatus: 'app.bsky.contact.getSyncStatus',
   AppBskyContactImportContacts: 'app.bsky.contact.importContacts',
   AppBskyContactRemoveData: 'app.bsky.contact.removeData',
+  AppBskyContactSendNotification: 'app.bsky.contact.sendNotification',
   AppBskyContactStartPhoneVerification:
     'app.bsky.contact.startPhoneVerification',
   AppBskyContactVerifyPhone: 'app.bsky.contact.verifyPhone',

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

@@ -259,6 +259,7 @@ export type Preferences = (
   | $Typed<SavedFeedsPref>
   | $Typed<SavedFeedsPrefV2>
   | $Typed<PersonalDetailsPref>
+  | $Typed<DeclaredAgePref>
   | $Typed<FeedViewPref>
   | $Typed<ThreadViewPref>
   | $Typed<InterestsPref>
@@ -370,6 +371,27 @@ export function validatePersonalDetailsPref<V>(v: V) {
   return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
+/** Read-only preference containing value(s) inferred from the user's declared birthdate. Absence of this preference object in the response indicates that the user has not made a declaration. */
+export interface DeclaredAgePref {
+  $type?: 'app.bsky.actor.defs#declaredAgePref'
+  /** Indicates if the user has declared that they are over 13 years of age. */
+  isOverAge13?: boolean
+  /** Indicates if the user has declared that they are over 16 years of age. */
+  isOverAge16?: boolean
+  /** Indicates if the user has declared that they are over 18 years of age. */
+  isOverAge18?: boolean
+}
+
+const hashDeclaredAgePref = 'declaredAgePref'
+
+export function isDeclaredAgePref<V>(v: V) {
+  return is$typed(v, id, hashDeclaredAgePref)
+}
+
+export function validateDeclaredAgePref<V>(v: V) {
+  return validate<DeclaredAgePref & V>(v, id, hashDeclaredAgePref)
+}
+
 export interface FeedViewPref {
   $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */

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

@@ -50,3 +50,22 @@ export function isSyncStatus<V>(v: V) {
 export function validateSyncStatus<V>(v: V) {
   return validate<SyncStatus & V>(v, id, hashSyncStatus)
 }
+
+/** A stash object to be sent via bsync representing a notification to be created. */
+export interface Notification {
+  $type?: 'app.bsky.contact.defs#notification'
+  /** The DID of who this notification comes from. */
+  from: string
+  /** The DID of who this notification should go to. */
+  to: string
+}
+
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
+}