@atproto/api 0.19.3 → 0.19.5

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EACL,OAAO,EACP,eAAe,EACf,SAAS,EACT,SAAS,EACT,YAAY,GACb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO;AACL,kBAAkB;AAClB,QAAQ,IAAI,OAAO,GACpB,MAAM,aAAa,CAAA;AAIpB,eAAO,MAAM,QAAQ,UAAiC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EACL,OAAO,EACP,eAAe,EACf,SAAS,EACT,SAAS,EACT,YAAY,GACb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAEzC,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO;AACL,kBAAkB;AAClB,QAAQ,IAAI,OAAO,GACpB,MAAM,aAAa,CAAA;AAIpB,eAAO,MAAM,QAAQ,UAAiC,CAAA"}

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lexicons = exports.default = exports.BskyAgent = exports.CredentialSession = exports.AtpAgent = exports.Agent = exports.LABELS = exports.DEFAULT_LABEL_SETTINGS = exports.asPredicate = exports.schemas = exports.parseLanguage = exports.stringifyLex = exports.lexToJson = exports.jsonToLex = exports.jsonStringToLex = exports.BlobRef = exports.AtUri = void 0;
+exports.lexicons = exports.default = exports.BskyAgent = exports.CredentialSession = exports.AtpAgent = exports.Agent = exports.LABELS = exports.DEFAULT_LABEL_SETTINGS = exports.asPredicate = exports.schemas = exports.ids = exports.XRPCError = exports.parseLanguage = exports.stringifyLex = exports.lexToJson = exports.jsonToLex = exports.jsonStringToLex = exports.BlobRef = exports.AtUri = void 0;
 const lexicon_1 = require("@atproto/lexicon");
 const lexicons_1 = require("./client/lexicons");
 var syntax_1 = require("@atproto/syntax");
@@ -27,11 +27,14 @@ Object.defineProperty(exports, "lexToJson", { enumerable: true, get: function ()
 Object.defineProperty(exports, "stringifyLex", { enumerable: true, get: function () { return lexicon_2.stringifyLex; } });
 var common_web_1 = require("@atproto/common-web");
 Object.defineProperty(exports, "parseLanguage", { enumerable: true, get: function () { return common_web_1.parseLanguage; } });
+var xrpc_1 = require("@atproto/xrpc");
+Object.defineProperty(exports, "XRPCError", { enumerable: true, get: function () { return xrpc_1.XRPCError; } });
 __exportStar(require("./types"), exports);
 __exportStar(require("./const"), exports);
 __exportStar(require("./util"), exports);
 __exportStar(require("./client"), exports);
 var lexicons_2 = require("./client/lexicons");
+Object.defineProperty(exports, "ids", { enumerable: true, get: function () { return lexicons_2.ids; } });
 Object.defineProperty(exports, "schemas", { enumerable: true, get: function () { return lexicons_2.schemas; } });
 var util_1 = require("./client/util");
 Object.defineProperty(exports, "asPredicate", { enumerable: true, get: function () { return util_1.asPredicate; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAC3C,gDAAgE;AAEhE,0CAAuC;AAA9B,+FAAA,KAAK,OAAA;AACd,4CAMyB;AALvB,kGAAA,OAAO,OAAA;AACP,0GAAA,eAAe,OAAA;AACf,oGAAA,SAAS,OAAA;AACT,oGAAA,SAAS,OAAA;AACT,uGAAA,YAAY,OAAA;AAEd,kDAAmD;AAA1C,2GAAA,aAAa,OAAA;AACtB,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,2CAAwB;AACxB,8CAA2C;AAAlC,mGAAA,OAAO,OAAA;AAEhB,sCAA2C;AAAlC,mGAAA,WAAW,OAAA;AACpB,wDAAqC;AACrC,2DAAwC;AACxC,sDAAmC;AACnC,mDAAgC;AAChC,+CAA4B;AAC5B,qDAAkC;AAClC,2CAAwB;AACxB,kDAA+B;AAC/B,oDAA0E;AAAjE,gHAAA,sBAAsB,OAAA;AAAE,gGAAA,MAAM,OAAA;AACvC,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AAEd,yCAA4D;AAAnD,qGAAA,QAAQ,OAAA;AACjB,yCAA+C;AAAtC,8GAAA,iBAAiB,OAAA;AAC1B,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,yCAGoB;AAFlB,kBAAkB;AAClB,oGAAA,QAAQ,OAAW;AAGrB,+EAA+E;AAC/E,2BAA2B;AACd,QAAA,QAAQ,GAAG,IAAI,kBAAQ,CAAC,mBAAgB,CAAC,CAAA","sourcesContent":["import { Lexicons } from '@atproto/lexicon'\nimport { lexicons as internalLexicons } from './client/lexicons'\n\nexport { AtUri } from '@atproto/syntax'\nexport {\n  BlobRef,\n  jsonStringToLex,\n  jsonToLex,\n  lexToJson,\n  stringifyLex,\n} from '@atproto/lexicon'\nexport { parseLanguage } from '@atproto/common-web'\nexport * from './types'\nexport * from './const'\nexport * from './util'\nexport * from './client'\nexport { schemas } from './client/lexicons'\nexport type { $Typed, Un$Typed } from './client/util'\nexport { asPredicate } from './client/util'\nexport * from './rich-text/rich-text'\nexport * from './rich-text/sanitization'\nexport * from './rich-text/unicode'\nexport * from './rich-text/util'\nexport * from './moderation'\nexport * from './moderation/types'\nexport * from './mocker'\nexport * from './age-assurance'\nexport { DEFAULT_LABEL_SETTINGS, LABELS } from './moderation/const/labels'\nexport { Agent } from './agent'\n\nexport { AtpAgent, type AtpAgentOptions } from './atp-agent'\nexport { CredentialSession } from './atp-agent'\nexport { BskyAgent } from './bsky-agent'\n\nexport {\n  /** @deprecated */\n  AtpAgent as default,\n} from './atp-agent'\n\n// Expose a copy to prevent alteration of the internal Lexicon instance used by\n// the AtpBaseClient class.\nexport const lexicons = new Lexicons(internalLexicons)\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAC3C,gDAAgE;AAEhE,0CAAuC;AAA9B,+FAAA,KAAK,OAAA;AACd,4CAMyB;AALvB,kGAAA,OAAO,OAAA;AACP,0GAAA,eAAe,OAAA;AACf,oGAAA,SAAS,OAAA;AACT,oGAAA,SAAS,OAAA;AACT,uGAAA,YAAY,OAAA;AAEd,kDAAmD;AAA1C,2GAAA,aAAa,OAAA;AACtB,sCAAyC;AAAhC,iGAAA,SAAS,OAAA;AAElB,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,2CAAwB;AACxB,8CAAgD;AAAvC,+FAAA,GAAG,OAAA;AAAE,mGAAA,OAAO,OAAA;AAErB,sCAA2C;AAAlC,mGAAA,WAAW,OAAA;AACpB,wDAAqC;AACrC,2DAAwC;AACxC,sDAAmC;AACnC,mDAAgC;AAChC,+CAA4B;AAC5B,qDAAkC;AAClC,2CAAwB;AACxB,kDAA+B;AAC/B,oDAA0E;AAAjE,gHAAA,sBAAsB,OAAA;AAAE,gGAAA,MAAM,OAAA;AACvC,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AAEd,yCAA4D;AAAnD,qGAAA,QAAQ,OAAA;AACjB,yCAA+C;AAAtC,8GAAA,iBAAiB,OAAA;AAC1B,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,yCAGoB;AAFlB,kBAAkB;AAClB,oGAAA,QAAQ,OAAW;AAGrB,+EAA+E;AAC/E,2BAA2B;AACd,QAAA,QAAQ,GAAG,IAAI,kBAAQ,CAAC,mBAAgB,CAAC,CAAA","sourcesContent":["import { Lexicons } from '@atproto/lexicon'\nimport { lexicons as internalLexicons } from './client/lexicons'\n\nexport { AtUri } from '@atproto/syntax'\nexport {\n  BlobRef,\n  jsonStringToLex,\n  jsonToLex,\n  lexToJson,\n  stringifyLex,\n} from '@atproto/lexicon'\nexport { parseLanguage } from '@atproto/common-web'\nexport { XRPCError } from '@atproto/xrpc'\n\nexport * from './types'\nexport * from './const'\nexport * from './util'\nexport * from './client'\nexport { ids, schemas } from './client/lexicons'\nexport type { $Typed, Un$Typed } from './client/util'\nexport { asPredicate } from './client/util'\nexport * from './rich-text/rich-text'\nexport * from './rich-text/sanitization'\nexport * from './rich-text/unicode'\nexport * from './rich-text/util'\nexport * from './moderation'\nexport * from './moderation/types'\nexport * from './mocker'\nexport * from './age-assurance'\nexport { DEFAULT_LABEL_SETTINGS, LABELS } from './moderation/const/labels'\nexport { Agent } from './agent'\n\nexport { AtpAgent, type AtpAgentOptions } from './atp-agent'\nexport { CredentialSession } from './atp-agent'\nexport { BskyAgent } from './bsky-agent'\n\nexport {\n  /** @deprecated */\n  AtpAgent as default,\n} from './atp-agent'\n\n// Expose a copy to prevent alteration of the internal Lexicon instance used by\n// the AtpBaseClient class.\nexport const lexicons = new Lexicons(internalLexicons)\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.19.3",
+  "version": "0.19.5",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -21,10 +21,10 @@
     "multiformats": "^9.9.0",
     "tlds": "^1.234.0",
     "zod": "^3.23.8",
-    "@atproto/common-web": "^0.4.18",
+    "@atproto/common-web": "^0.4.19",
     "@atproto/lexicon": "^0.6.2",
-    "@atproto/xrpc": "^0.7.7",
-    "@atproto/syntax": "^0.5.0"
+    "@atproto/syntax": "^0.5.2",
+    "@atproto/xrpc": "^0.7.7"
   },
   "devDependencies": {
     "@jest/globals": "^28.1.3",
@@ -34,7 +34,8 @@
     "@atproto/lex-cli": "^0.9.9"
   },
   "scripts": {
-    "codegen": "node ./scripts/generate-code.mjs && lex gen-api --yes ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/* ../../lexicons/com/germnetwork/*",
+    "codegen": "lex gen-api --yes ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/* ../../lexicons/com/germnetwork/*",
+    "prebuild": "node ./scripts/generate-code.mjs && ([ -f ./src/client/index.ts ] || pnpm run codegen)",
     "build": "tsc --build tsconfig.build.json",
     "test": "jest"
   }

package/scripts/code/labels.mjs

@@ -1,22 +1,27 @@
-import * as url from 'url'
-import { readFileSync, writeFileSync } from 'fs'
-import { join } from 'path'
+import { mkdir, writeFile } from 'node:fs/promises'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import * as prettier from 'prettier'
+import labelsDef from '../../definitions/labels.json' with { type: 'json' }
 
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url))
 
-const labelsDef = JSON.parse(
-  readFileSync(
-    join(__dirname, '..', '..', 'definitions', 'labels.json'),
-    'utf8',
-  ),
-)
+export async function labels() {
+  const content = await gen()
 
-writeFileSync(
-  join(__dirname, '..', '..', 'src', 'moderation', 'const', 'labels.ts'),
-  await gen(),
-  'utf8',
-)
+  const path = join(
+    __dirname,
+    '..',
+    '..',
+    'src',
+    'moderation',
+    'const',
+    'labels.ts',
+  )
+
+  await mkdir(dirname(path), { recursive: true })
+  await writeFile(path, content, 'utf8')
+}
 
 async function gen() {
   const knownValues = new Set()
@@ -70,5 +75,3 @@ async function gen() {
     { semi: false, parser: 'typescript', singleQuote: true },
   )
 }
-
-export {}

package/scripts/generate-code.mjs

@@ -1,3 +1,4 @@
-import './code/labels.mjs'
+import { labels } from './code/labels.mjs'
+export { labels }
 
-export {}
+labels()

package/src/agent.ts

@@ -1,6 +1,6 @@
 import AwaitLock from 'await-lock'
 import { TID, retry } from '@atproto/common-web'
-import { AtUri, ensureValidDid } from '@atproto/syntax'
+import { AtUri, DidString, ensureValidDidRegex } from '@atproto/syntax'
 import {
   FetchHandler,
   FetchHandlerOptions,
@@ -63,7 +63,7 @@ const THREAD_VIEW_PREF_DEFAULTS = {
   sort: 'hotness',
 }
 
-export type { FetchHandler }
+export type { DidString, FetchHandler }
 
 /**
  * An {@link Agent} is an {@link AtpBaseClient} with the following
@@ -207,8 +207,11 @@ export class Agent extends XrpcClient {
   /**
    * Get the authenticated user's DID, if any.
    */
-  get did() {
-    return this.sessionManager.did
+  get did(): DidString | undefined {
+    const { did } = this.sessionManager
+    if (!did) return undefined
+    ensureValidDidRegex(did)
+    return did
   }
 
   /** @deprecated Use {@link Agent.assertDid} instead */
@@ -219,7 +222,7 @@ export class Agent extends XrpcClient {
   /**
    * Get the authenticated user's DID, or throw an error if not authenticated.
    */
-  get assertDid(): string {
+  get assertDid(): DidString {
     this.assertAuthenticated()
     return this.did
   }
@@ -227,7 +230,7 @@ export class Agent extends XrpcClient {
   /**
    * Assert that the user is authenticated.
    */
-  public assertAuthenticated(): asserts this is { did: string } {
+  public assertAuthenticated(): asserts this is { did: DidString } {
     if (!this.did) throw new Error('Not logged in')
   }
 
@@ -890,7 +893,7 @@ export class Agent extends XrpcClient {
     labelerDid?: string,
   ) {
     if (labelerDid) {
-      ensureValidDid(labelerDid)
+      ensureValidDidRegex(labelerDid)
     }
     await this.updatePreferences((prefs) => {
       const labelPref = prefs

package/src/atp-agent.ts

@@ -88,10 +88,6 @@ export class AtpAgent extends Agent {
     return this.sessionManager.hasSession
   }
 
-  get did() {
-    return this.sessionManager.did
-  }
-
   get serviceUrl() {
     return this.sessionManager.serviceUrl
   }

package/src/client/lexicons.ts

@@ -6243,21 +6243,21 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.actor.defs#profileView',
                 },
               },
+              recIdStr: {
+                type: 'string',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
               isFallback: {
                 type: 'boolean',
                 description:
-                  'If true, response has fallen-back to generic results, and is not scoped using relativeToDid',
+                  'DEPRECATED, unused. Previously: if true, response has fallen-back to generic results, and is not scoped using relativeToDid',
                 default: false,
               },
               recId: {
                 type: 'integer',
                 description: 'DEPRECATED: use recIdStr instead.',
               },
-              recIdStr: {
-                type: 'string',
-                description:
-                  'Snowflake for this recommendation, use when submitting recommendation events.',
-              },
             },
           },
         },
@@ -11842,16 +11842,13 @@ export const schemaDict = {
         type: 'string',
         knownValues: [
           '!hide',
-          '!no-promote',
           '!warn',
           '!no-unauthenticated',
-          'dmca-violation',
-          'doxxing',
           'porn',
           'sexual',
           'nudity',
-          'nsfl',
-          'gore',
+          'graphic-media',
+          'bot',
         ],
       },
     },
@@ -16018,6 +16015,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventPriorityScore',
               'lex:tools.ozone.moderation.defs#ageAssuranceEvent',
               'lex:tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+              'lex:tools.ozone.moderation.defs#ageAssurancePurgeEvent',
               'lex:tools.ozone.moderation.defs#revokeAccountCredentialsEvent',
               'lex:tools.ozone.moderation.defs#scheduleTakedownEvent',
               'lex:tools.ozone.moderation.defs#cancelScheduledTakedownEvent',
@@ -16095,6 +16093,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventPriorityScore',
               'lex:tools.ozone.moderation.defs#ageAssuranceEvent',
               'lex:tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+              'lex:tools.ozone.moderation.defs#ageAssurancePurgeEvent',
               'lex:tools.ozone.moderation.defs#revokeAccountCredentialsEvent',
               'lex:tools.ozone.moderation.defs#scheduleTakedownEvent',
               'lex:tools.ozone.moderation.defs#cancelScheduledTakedownEvent',
@@ -16661,6 +16660,19 @@ export const schemaDict = {
           },
         },
       },
+      ageAssurancePurgeEvent: {
+        type: 'object',
+        description:
+          'Purges all age assurance events for the subject. Only works on DID subjects. Moderator-only.',
+        required: ['comment'],
+        properties: {
+          comment: {
+            type: 'string',
+            minLength: 1,
+            description: 'Comment describing the reason for the purge.',
+          },
+        },
+      },
       revokeAccountCredentialsEvent: {
         type: 'object',
         description:
@@ -17534,6 +17546,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventPriorityScore',
                   'lex:tools.ozone.moderation.defs#ageAssuranceEvent',
                   'lex:tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+                  'lex:tools.ozone.moderation.defs#ageAssurancePurgeEvent',
                   'lex:tools.ozone.moderation.defs#revokeAccountCredentialsEvent',
                   'lex:tools.ozone.moderation.defs#scheduleTakedownEvent',
                   'lex:tools.ozone.moderation.defs#cancelScheduledTakedownEvent',

package/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts

@@ -23,12 +23,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: AppBskyActorDefs.ProfileView[]
-  /** If true, response has fallen-back to generic results, and is not scoped using relativeToDid */
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
+  /** DEPRECATED, unused. Previously: if true, response has fallen-back to generic results, and is not scoped using relativeToDid */
   isFallback: boolean
   /** DEPRECATED: use recIdStr instead. */
   recId?: number
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
-  recIdStr?: string
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/label/defs.ts

@@ -133,14 +133,11 @@ export function validateLabelValueDefinitionStrings<V>(v: V) {
 
 export type LabelValue =
   | '!hide'
-  | '!no-promote'
   | '!warn'
   | '!no-unauthenticated'
-  | 'dmca-violation'
-  | 'doxxing'
   | 'porn'
   | 'sexual'
   | 'nudity'
-  | 'nsfl'
-  | 'gore'
+  | 'graphic-media'
+  | 'bot'
   | (string & {})

package/src/client/types/tools/ozone/moderation/defs.ts

@@ -46,6 +46,7 @@ export interface ModEventView {
     | $Typed<ModEventPriorityScore>
     | $Typed<AgeAssuranceEvent>
     | $Typed<AgeAssuranceOverrideEvent>
+    | $Typed<AgeAssurancePurgeEvent>
     | $Typed<RevokeAccountCredentialsEvent>
     | $Typed<ScheduleTakedownEvent>
     | $Typed<CancelScheduledTakedownEvent>
@@ -98,6 +99,7 @@ export interface ModEventViewDetail {
     | $Typed<ModEventPriorityScore>
     | $Typed<AgeAssuranceEvent>
     | $Typed<AgeAssuranceOverrideEvent>
+    | $Typed<AgeAssurancePurgeEvent>
     | $Typed<RevokeAccountCredentialsEvent>
     | $Typed<ScheduleTakedownEvent>
     | $Typed<CancelScheduledTakedownEvent>
@@ -503,6 +505,23 @@ export function validateAgeAssuranceOverrideEvent<V>(v: V) {
   )
 }
 
+/** Purges all age assurance events for the subject. Only works on DID subjects. Moderator-only. */
+export interface AgeAssurancePurgeEvent {
+  $type?: 'tools.ozone.moderation.defs#ageAssurancePurgeEvent'
+  /** Comment describing the reason for the purge. */
+  comment: string
+}
+
+const hashAgeAssurancePurgeEvent = 'ageAssurancePurgeEvent'
+
+export function isAgeAssurancePurgeEvent<V>(v: V) {
+  return is$typed(v, id, hashAgeAssurancePurgeEvent)
+}
+
+export function validateAgeAssurancePurgeEvent<V>(v: V) {
+  return validate<AgeAssurancePurgeEvent & V>(v, id, hashAgeAssurancePurgeEvent)
+}
+
 /** Account credentials revocation by moderators. Only works on DID subjects. */
 export interface RevokeAccountCredentialsEvent {
   $type?: 'tools.ozone.moderation.defs#revokeAccountCredentialsEvent'

package/src/client/types/tools/ozone/moderation/emitEvent.ts

@@ -43,6 +43,7 @@ export interface InputSchema {
     | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore>
     | $Typed<ToolsOzoneModerationDefs.AgeAssuranceEvent>
     | $Typed<ToolsOzoneModerationDefs.AgeAssuranceOverrideEvent>
+    | $Typed<ToolsOzoneModerationDefs.AgeAssurancePurgeEvent>
     | $Typed<ToolsOzoneModerationDefs.RevokeAccountCredentialsEvent>
     | $Typed<ToolsOzoneModerationDefs.ScheduleTakedownEvent>
     | $Typed<ToolsOzoneModerationDefs.CancelScheduledTakedownEvent>

package/src/index.ts

@@ -10,11 +10,13 @@ export {
   stringifyLex,
 } from '@atproto/lexicon'
 export { parseLanguage } from '@atproto/common-web'
+export { XRPCError } from '@atproto/xrpc'
+
 export * from './types'
 export * from './const'
 export * from './util'
 export * from './client'
-export { schemas } from './client/lexicons'
+export { ids, schemas } from './client/lexicons'
 export type { $Typed, Un$Typed } from './client/util'
 export { asPredicate } from './client/util'
 export * from './rich-text/rich-text'

package/tests/errors.test.ts

@@ -9,7 +9,7 @@ describe('errors', () => {
     network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'known_errors',
     })
-    client = network.pds.getClient()
+    client = network.pds.getAgent()
   })
 
   afterAll(async () => {

package/tests/moderation-prefs.test.ts

@@ -17,7 +17,7 @@ describe('agent', () => {
   })
 
   it('migrates legacy content-label prefs (no mutations)', async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user1.test',
@@ -101,7 +101,7 @@ describe('agent', () => {
   })
 
   it('adds/removes moderation services', async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user5.test',
@@ -207,7 +207,7 @@ describe('agent', () => {
   })
 
   it('sets label preferences globally and per-moderator', async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user7.test',
@@ -273,7 +273,7 @@ describe('agent', () => {
   })
 
   it(`updates label pref`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user8.test',
@@ -297,7 +297,7 @@ describe('agent', () => {
   })
 
   it(`double-write for legacy: 'graphic-media' in sync with 'gore'`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user9.test',
@@ -319,7 +319,7 @@ describe('agent', () => {
   })
 
   it(`double-write for legacy: 'porn' in sync with 'nsfw'`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user10.test',
@@ -341,7 +341,7 @@ describe('agent', () => {
   })
 
   it(`double-write for legacy: 'sexual' in sync with 'suggestive'`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user11.test',
@@ -363,7 +363,7 @@ describe('agent', () => {
   })
 
   it(`double-write for legacy: filters out existing old label pref if double-written`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user12.test',
@@ -382,7 +382,7 @@ describe('agent', () => {
   })
 
   it(`remaps old values to new on read`, async () => {
-    const agent = network.pds.getClient()
+    const agent = network.pds.getAgent()
 
     await agent.createAccount({
       handle: 'user13.test',