@atproto/pds 0.5.1 → 0.5.3

package/dist/lexicons/tools/ozone/moderation/queryStatuses.defs.d.ts

@@ -59,7 +59,7 @@ export declare const $params: l.ParamsSchema<{
         readonly format: "nsid";
     }>>>;
     readonly subjectType: l.OptionalSchema<l.StringSchema<{
-        knownValues: ["account", "record"];
+        knownValues: ["account", "record", "conversation"];
     }>>;
     readonly minAccountSuspendCount: l.OptionalSchema<l.IntegerSchema>;
     readonly minReportedRecordsCount: l.OptionalSchema<l.IntegerSchema>;
@@ -135,7 +135,7 @@ declare const main: l.Query<"tools.ozone.moderation.queryStatuses", l.ParamsSche
         readonly format: "nsid";
     }>>>;
     readonly subjectType: l.OptionalSchema<l.StringSchema<{
-        knownValues: ["account", "record"];
+        knownValues: ["account", "record", "conversation"];
     }>>;
     readonly minAccountSuspendCount: l.OptionalSchema<l.IntegerSchema>;
     readonly minReportedRecordsCount: l.OptionalSchema<l.IntegerSchema>;

package/dist/lexicons/tools/ozone/moderation/queryStatuses.defs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryStatuses.defs.d.ts","sourceRoot":"","sources":["../../../../../src/lexicons/tools/ozone/moderation/queryStatuses.defs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAChC,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAA;AAEhD,QAAA,MAAM,KAAK,yCAAyC,CAAA;AAEpD,OAAO,EAAE,KAAK,EAAE,CAAA;AAEhB,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwGlB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAA;AAEnD,eAAO,MAAM,OAAO;;;GAOlB,CAAA;AAEF,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAA;AACzE,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,gBAAgB,CAC5D,OAAO,OAAO,EACd,CAAC,CACF,CAAA;AAED,6DAA6D;AAC7D,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAiD,CAAA;AAE3D,OAAO,EAAE,IAAI,EAAE,CAAA;AAEf,eAAO,MAAM,IAAI,yCAAQ,CAAA"}
+{"version":3,"file":"queryStatuses.defs.d.ts","sourceRoot":"","sources":["../../../../../src/lexicons/tools/ozone/moderation/queryStatuses.defs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAChC,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAA;AAEhD,QAAA,MAAM,KAAK,yCAAyC,CAAA;AAEpD,OAAO,EAAE,KAAK,EAAE,CAAA;AAEhB,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0GlB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAA;AAEnD,eAAO,MAAM,OAAO;;;GAOlB,CAAA;AAEF,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAA;AACzE,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,gBAAgB,CAC5D,OAAO,OAAO,EACd,CAAC,CACF,CAAA;AAED,6DAA6D;AAC7D,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAiD,CAAA;AAE3D,OAAO,EAAE,IAAI,EAAE,CAAA;AAEf,eAAO,MAAM,IAAI,yCAAQ,CAAA"}

package/dist/lexicons/tools/ozone/moderation/queryStatuses.defs.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryStatuses.defs.js","sourceRoot":"","sources":["../../../../../src/lexicons/tools/ozone/moderation/queryStatuses.defs.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAChC,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAA;AAEhD,MAAM,KAAK,GAAG,sCAAsC,CAAA;AAEpD,OAAO,EAAE,KAAK,EAAE,CAAA;AAEhB,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7D,qBAAqB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1E,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5E,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3D,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC3C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC3C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACvC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAChD;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,MAAM,EAOlB,CACL;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CACjE;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAC1C;IACD,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACjC,aAAa,CAAC,CAAC,CAAC,WAAW;IACzB,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QACnB,gBAAgB;QAChB,gBAAgB;QAChB,sBAAsB;QACtB,uBAAuB;QACvB,eAAe;KAChB,CAAC,EACF,gBAAgB,CACjB,CACF;IACD,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAC3E;IACD,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9D,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7D,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC7B,aAAa,CAAC,CAAC,CAAC,WAAW;IACzB,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EACrD,EAAE,CACH,CACF;IACD,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5B,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CACnE;IACD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAChD;IACD,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE;QAChE,SAAS,EAAE,EAAE;KACd,CAAC,CACH;IACD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,MAAM,EAA0C,CACjE;IACD,sBAAsB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3E,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5E,wBAAwB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7E,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACxC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CACtD;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CACxC;IACD,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACzC,aAAa,CAAC,CAAC,CAAC,MAAM,EAElB,CACL;CACF,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC;IACjD,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1D,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK;IACpC,aAAa,CAAC,CAAC,CAAC,GAAG,CACjB,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAQ,CAChD,CACF;CACF,CAAC,CAAA;AAQF,6DAA6D;AAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;AAE3D,OAAO,EAAE,IAAI,EAAE,CAAA;AAEf,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAA","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nimport { l } from '@atproto/lex'\nimport * as ModerationDefs from './defs.defs.js'\n\nconst $nsid = 'tools.ozone.moderation.queryStatuses'\n\nexport { $nsid }\n\nexport const $params = /*#__PURE__*/ l.params({\n  queueCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  queueIndex: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  queueSeed: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  includeAllUserRecords: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  subject: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),\n  comment: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  reportedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  reportedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  reviewedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingDeletedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingDeletedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingUpdatedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingUpdatedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingStatuses: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string()),\n  ),\n  reviewedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  includeMuted: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  onlyMuted: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  reviewState: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{\n      knownValues: [\n        'tools.ozone.moderation.defs#reviewOpen',\n        'tools.ozone.moderation.defs#reviewClosed',\n        'tools.ozone.moderation.defs#reviewEscalated',\n        'tools.ozone.moderation.defs#reviewNone',\n      ]\n    }>(),\n  ),\n  ignoreSubjects: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string({ format: 'uri' })),\n  ),\n  lastReviewedBy: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'did' }),\n  ),\n  sortField: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(\n      /*#__PURE__*/ l.enum([\n        'lastReviewedAt',\n        'lastReportedAt',\n        'reportedRecordsCount',\n        'takendownRecordsCount',\n        'priorityScore',\n      ]),\n      'lastReportedAt',\n    ),\n  ),\n  sortDirection: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.enum(['asc', 'desc']), 'desc'),\n  ),\n  takendown: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  appealed: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  limit: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(\n      /*#__PURE__*/ l.integer({ minimum: 1, maximum: 100 }),\n      50,\n    ),\n  ),\n  tags: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string(), { maxLength: 25 }),\n  ),\n  excludeTags: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string()),\n  ),\n  cursor: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  collections: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string({ format: 'nsid' }), {\n      maxLength: 20,\n    }),\n  ),\n  subjectType: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{ knownValues: ['account', 'record'] }>(),\n  ),\n  minAccountSuspendCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minReportedRecordsCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minTakendownRecordsCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minPriorityScore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.integer({ minimum: 0, maximum: 100 }),\n  ),\n  minStrikeCount: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.integer({ minimum: 1 }),\n  ),\n  ageAssuranceState: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{\n      knownValues: ['pending', 'assured', 'unknown', 'reset', 'blocked']\n    }>(),\n  ),\n})\n\nexport type $Params = l.InferOutput<typeof $params>\n\nexport const $output = /*#__PURE__*/ l.jsonPayload({\n  cursor: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  subjectStatuses: /*#__PURE__*/ l.array(\n    /*#__PURE__*/ l.ref<ModerationDefs.SubjectStatusView>(\n      (() => ModerationDefs.subjectStatusView) as any,\n    ),\n  ),\n})\n\nexport type $Output<B = l.BinaryData> = l.InferPayload<typeof $output, B>\nexport type $OutputBody<B = l.BinaryData> = l.InferPayloadBody<\n  typeof $output,\n  B\n>\n\n/** View moderation statuses of subjects (record or repo). */\nconst main = /*#__PURE__*/ l.query($nsid, $params, $output)\n\nexport { main }\n\nexport const $lxm = $nsid\n"]}
+{"version":3,"file":"queryStatuses.defs.js","sourceRoot":"","sources":["../../../../../src/lexicons/tools/ozone/moderation/queryStatuses.defs.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,cAAc,CAAA;AAChC,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAA;AAEhD,MAAM,KAAK,GAAG,sCAAsC,CAAA;AAEpD,OAAO,EAAE,KAAK,EAAE,CAAA;AAEhB,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7D,qBAAqB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1E,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5E,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3D,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC3C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC3C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5C,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACvC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAChD;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC/C;IACD,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,MAAM,EAOlB,CACL;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CACjE;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAC1C;IACD,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACjC,aAAa,CAAC,CAAC,CAAC,WAAW;IACzB,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QACnB,gBAAgB;QAChB,gBAAgB;QAChB,sBAAsB;QACtB,uBAAuB;QACvB,eAAe;KAChB,CAAC,EACF,gBAAgB,CACjB,CACF;IACD,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACrC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAC3E;IACD,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9D,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7D,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC7B,aAAa,CAAC,CAAC,CAAC,WAAW;IACzB,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EACrD,EAAE,CACH,CACF;IACD,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IAC5B,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CACnE;IACD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAChD;IACD,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE;QAChE,SAAS,EAAE,EAAE;KACd,CAAC,CACH;IACD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACnC,aAAa,CAAC,CAAC,CAAC,MAAM,EAElB,CACL;IACD,sBAAsB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3E,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5E,wBAAwB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7E,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACxC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CACtD;IACD,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACtC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CACxC;IACD,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ;IACzC,aAAa,CAAC,CAAC,CAAC,MAAM,EAElB,CACL;CACF,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC;IACjD,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1D,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK;IACpC,aAAa,CAAC,CAAC,CAAC,GAAG,CACjB,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAQ,CAChD,CACF;CACF,CAAC,CAAA;AAQF,6DAA6D;AAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;AAE3D,OAAO,EAAE,IAAI,EAAE,CAAA;AAEf,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAA","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nimport { l } from '@atproto/lex'\nimport * as ModerationDefs from './defs.defs.js'\n\nconst $nsid = 'tools.ozone.moderation.queryStatuses'\n\nexport { $nsid }\n\nexport const $params = /*#__PURE__*/ l.params({\n  queueCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  queueIndex: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  queueSeed: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  includeAllUserRecords: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  subject: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),\n  comment: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  reportedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  reportedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  reviewedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingDeletedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingDeletedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingUpdatedAfter: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingUpdatedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  hostingStatuses: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string()),\n  ),\n  reviewedBefore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'datetime' }),\n  ),\n  includeMuted: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  onlyMuted: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  reviewState: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{\n      knownValues: [\n        'tools.ozone.moderation.defs#reviewOpen',\n        'tools.ozone.moderation.defs#reviewClosed',\n        'tools.ozone.moderation.defs#reviewEscalated',\n        'tools.ozone.moderation.defs#reviewNone',\n      ]\n    }>(),\n  ),\n  ignoreSubjects: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string({ format: 'uri' })),\n  ),\n  lastReviewedBy: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string({ format: 'did' }),\n  ),\n  sortField: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(\n      /*#__PURE__*/ l.enum([\n        'lastReviewedAt',\n        'lastReportedAt',\n        'reportedRecordsCount',\n        'takendownRecordsCount',\n        'priorityScore',\n      ]),\n      'lastReportedAt',\n    ),\n  ),\n  sortDirection: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.enum(['asc', 'desc']), 'desc'),\n  ),\n  takendown: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  appealed: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.boolean()),\n  limit: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.withDefault(\n      /*#__PURE__*/ l.integer({ minimum: 1, maximum: 100 }),\n      50,\n    ),\n  ),\n  tags: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string(), { maxLength: 25 }),\n  ),\n  excludeTags: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string()),\n  ),\n  cursor: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  collections: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.array(/*#__PURE__*/ l.string({ format: 'nsid' }), {\n      maxLength: 20,\n    }),\n  ),\n  subjectType: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{\n      knownValues: ['account', 'record', 'conversation']\n    }>(),\n  ),\n  minAccountSuspendCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minReportedRecordsCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minTakendownRecordsCount: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.integer()),\n  minPriorityScore: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.integer({ minimum: 0, maximum: 100 }),\n  ),\n  minStrikeCount: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.integer({ minimum: 1 }),\n  ),\n  ageAssuranceState: /*#__PURE__*/ l.optional(\n    /*#__PURE__*/ l.string<{\n      knownValues: ['pending', 'assured', 'unknown', 'reset', 'blocked']\n    }>(),\n  ),\n})\n\nexport type $Params = l.InferOutput<typeof $params>\n\nexport const $output = /*#__PURE__*/ l.jsonPayload({\n  cursor: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string()),\n  subjectStatuses: /*#__PURE__*/ l.array(\n    /*#__PURE__*/ l.ref<ModerationDefs.SubjectStatusView>(\n      (() => ModerationDefs.subjectStatusView) as any,\n    ),\n  ),\n})\n\nexport type $Output<B = l.BinaryData> = l.InferPayload<typeof $output, B>\nexport type $OutputBody<B = l.BinaryData> = l.InferPayloadBody<\n  typeof $output,\n  B\n>\n\n/** View moderation statuses of subjects (record or repo). */\nconst main = /*#__PURE__*/ l.query($nsid, $params, $output)\n\nexport { main }\n\nexport const $lxm = $nsid\n"]}

package/dist/read-after-write/viewer.d.ts

@@ -38,7 +38,7 @@ export declare class LocalViewer {
     } | {
         $type: "app.bsky.embed.recordWithMedia#view";
         record: app.bsky.embed.record.View;
-        media: import("@atproto/lex").$Typed<app.bsky.embed.images.View> | import("@atproto/lex").$Typed<app.bsky.embed.video.View> | import("@atproto/lex").$Typed<app.bsky.embed.external.View> | import("@atproto/lex").Unknown$TypedObject;
+        media: import("@atproto/lex").$Typed<app.bsky.embed.images.View> | import("@atproto/lex").$Typed<app.bsky.embed.video.View> | import("@atproto/lex").$Typed<app.bsky.embed.gallery.View> | import("@atproto/lex").$Typed<app.bsky.embed.external.View> | import("@atproto/lex").Unknown$TypedObject;
     } | undefined>;
     formatImageEmbed(embed: app.bsky.embed.images.Main): {
         $type: "app.bsky.embed.images#view";
@@ -56,7 +56,7 @@ export declare class LocalViewer {
     formatRecordWithMediaEmbed(embed: app.bsky.embed.recordWithMedia.Main): Promise<{
         $type: "app.bsky.embed.recordWithMedia#view";
         record: app.bsky.embed.record.View;
-        media: import("@atproto/lex").$Typed<app.bsky.embed.images.View> | import("@atproto/lex").$Typed<app.bsky.embed.video.View> | import("@atproto/lex").$Typed<app.bsky.embed.external.View> | import("@atproto/lex").Unknown$TypedObject;
+        media: import("@atproto/lex").$Typed<app.bsky.embed.images.View> | import("@atproto/lex").$Typed<app.bsky.embed.video.View> | import("@atproto/lex").$Typed<app.bsky.embed.gallery.View> | import("@atproto/lex").$Typed<app.bsky.embed.external.View> | import("@atproto/lex").Unknown$TypedObject;
     } | undefined>;
     updateProfileViewBasic<T extends app.bsky.actor.defs.ProfileViewDetailed | app.bsky.actor.defs.ProfileViewBasic | app.bsky.actor.defs.ProfileView>(view: T, record: app.bsky.actor.profile.Main): T;
     updateProfileView<T extends app.bsky.actor.defs.ProfileViewDetailed | app.bsky.actor.defs.ProfileViewBasic | app.bsky.actor.defs.ProfileView>(view: T, record: app.bsky.actor.profile.Main): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -48,20 +48,20 @@
     "@atproto-labs/simple-store-redis": "^0.1.0",
     "@atproto-labs/xrpc-utils": "^0.1.0",
     "@atproto/aws": "^0.3.0",
-    "@atproto/common": "^0.6.1",
     "@atproto/crypto": "^0.5.0",
+    "@atproto/common": "^0.6.2",
     "@atproto/did": "^0.5.0",
-    "@atproto/lex": "^0.1.3",
     "@atproto/identity": "^0.5.0",
+    "@atproto/lex": "^0.1.3",
     "@atproto/lex-cbor": "^0.1.0",
-    "@atproto/lex-data": "^0.1.1",
-    "@atproto/oauth-provider": "^0.18.1",
     "@atproto/lex-json": "^0.1.0",
+    "@atproto/oauth-provider": "^0.18.2",
+    "@atproto/oauth-scopes": "^0.5.0",
+    "@atproto/lex-data": "^0.1.1",
     "@atproto/repo": "^0.10.0",
     "@atproto/xrpc-server": "^0.11.1",
-    "@atproto/xrpc": "^0.8.0",
-    "@atproto/oauth-scopes": "^0.5.0",
-    "@atproto/syntax": "^0.6.1"
+    "@atproto/syntax": "^0.6.1",
+    "@atproto/xrpc": "^0.8.0"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -79,10 +79,10 @@
     "ts-node": "^10.8.2",
     "typescript": "^6.0.3",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.20.6",
-    "@atproto/bsky": "^0.0.235",
-    "@atproto/oauth-client-browser-example": "^0.1.1",
-    "@atproto/lex-document": "^0.1.0"
+    "@atproto/api": "^0.20.14",
+    "@atproto/bsky": "^0.0.241",
+    "@atproto/lex-document": "^0.1.0",
+    "@atproto/oauth-client-browser-example": "^0.1.1"
   },
   "type": "module",
   "exports": {

package/src/account-manager/account-manager.ts

@@ -1,7 +1,9 @@
 import { KeyObject } from 'node:crypto'
+import { Client as PlcClient } from '@did-plc/lib'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
 import { HOUR, wait } from '@atproto/common'
+import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
 import {
   AtIdentifierString,
@@ -21,7 +23,9 @@ import {
   isServiceDomain,
 } from '../handle/index.js'
 import { com } from '../lexicons/index.js'
+import { httpLogger } from '../logger.js'
 import { ServerMailer } from '../mailer/index.js'
+import { Sequencer } from '../sequencer/index.js'
 import { AccountDb, EmailTokenPurpose, getDb, getMigrator } from './db/index.js'
 import * as account from './helpers/account.js'
 import { AccountStatus, ActorAccount } from './helpers/account.js'
@@ -68,6 +72,9 @@ export class AccountManager {
     readonly idResolver: IdResolver,
     readonly jwtKey: KeyObject,
     readonly mailer: ServerMailer,
+    readonly sequencer: Sequencer,
+    readonly plcClient: PlcClient,
+    readonly plcRotationKey: Keypair,
     readonly serviceDid: string,
     readonly serviceHandleDomains: string[],
     db: AccountManagerDbConfig,
@@ -117,7 +124,7 @@ export class AccountManager {
   async getDidForActor(
     handleOrDid: AtIdentifierString,
     flags?: account.AvailabilityFlags,
-  ): Promise<string | null> {
+  ): Promise<DidString | null> {
     const got = await this.getAccount(handleOrDid, flags)
     return got?.did ?? null
   }
@@ -138,7 +145,7 @@ export class AccountManager {
     handle: string,
     {
       did,
-      allowAnyValid,
+      allowAnyValid = false,
     }: {
       did?: string
       allowAnyValid?: boolean
@@ -168,15 +175,20 @@ export class AccountManager {
         allowAnyValid,
       )
     } else {
+      // When creating an account (no did yet), we require the handle to be a
+      // local service domain. Updating to a custom handle will be possible once
+      // the account was created.
       if (did == null) {
         throw new InvalidRequestError(
           'Not a supported handle domain',
           'UnsupportedDomain',
         )
       }
+
       // verify resolution of a non-service domain
       const resolvedDid = await this.idResolver.handle.resolve(normalized)
       if (resolvedDid !== did) {
+        // @TODO This should use a distinct error code
         throw new InvalidRequestError('External handle did not resolve to DID')
       }
     }
@@ -261,10 +273,96 @@ export class AccountManager {
     return { accessJwt, refreshJwt }
   }
 
-  // @NOTE should always be paired with a sequenceHandle().
-  // the token output from this method should be passed to sequenceHandle().
-  async updateHandle(did: DidString, handle: HandleString) {
-    return account.updateHandle(this.db, did, handle)
+  /**
+   * Validates the requested handle, updates the PLC document if needed, persists
+   * the new handle locally, and emits an identity event.
+   *
+   * @throws {InvalidRequestError} when the handle is invalid, taken by another
+   * account, or cannot be resolved for non-service domains.
+   *
+   * @see {@link AccountManager.updateAccountHandle} for behavior when the PLC update fails.
+   */
+  async updateHandle(
+    did: DidString,
+    newHandle: string,
+    options?: { allowAnyValid?: boolean },
+  ): Promise<ActorAccount & { handle: HandleString }> {
+    const { account, handle } = await this.validateHandleUpdate(
+      did,
+      newHandle,
+      options,
+    )
+
+    if (did.startsWith('did:plc:')) {
+      // @TODO We should verify the status before issuing a PLC update.
+      await this.plcClient.updateHandle(did, this.plcRotationKey, handle)
+    } else {
+      const resolved = await this.idResolver.did.resolveAtprotoData(did, true)
+      if (resolved.handle !== handle) {
+        throw new InvalidRequestError(
+          'DID is not properly configured for handle',
+        )
+      }
+    }
+
+    // @NOTE If the next line fails (for any reason), we don't "rollback" the
+    // PLC update above. The caller can just call this method again.
+    await this.updateAccountHandle(did, handle)
+
+    return { ...account, handle }
+  }
+
+  async validateHandleUpdate(
+    did: DidString,
+    newHandle: string,
+    options?: { allowAnyValid?: boolean },
+  ): Promise<{
+    did: DidString
+    handle: HandleString
+    // Returned for convenience
+    account: ActorAccount
+  }> {
+    const account = await this.getAccount(did, { includeDeactivated: true })
+    if (!account) {
+      throw new InvalidRequestError('Account not found')
+    }
+
+    const handle = await this.normalizeAndValidateHandle(newHandle, {
+      allowAnyValid: options?.allowAnyValid,
+      did,
+    })
+
+    // Pessimistic check to handle spam: also enforced by updateAccountHandle() and the db.
+    const existing = await this.getAccount(handle, {
+      includeDeactivated: true,
+      includeTakenDown: true,
+    })
+
+    if (existing && existing.did !== did) {
+      throw new InvalidRequestError(
+        `Handle already taken: ${handle}`,
+        'HandleNotAvailable',
+      )
+    }
+
+    return { did, handle, account }
+  }
+
+  /**
+   * @note Failure to emit the identity event will silently be ignored. Users
+   * can emit the event again by updating their handle to the same value.
+   */
+  async updateAccountHandle(
+    did: DidString,
+    handle: HandleString,
+  ): Promise<void> {
+    await account.updateHandle(this.db, did, handle)
+
+    try {
+      await this.sequencer.sequenceIdentityEvt(did, handle)
+    } catch (err) {
+      httpLogger.error({ err, did, handle }, 'failed to sequence handle update')
+    }
   }
 
   async deleteAccount(did: DidString) {
@@ -637,7 +735,7 @@ export class AccountManager {
     email: string,
     token?: string,
     opts?: { locale?: string; sendConfirmationEmail?: boolean },
-  ) {
+  ): Promise<ActorAccount> {
     if (!isEmailValid(email) || isDisposableEmail(email)) {
       throw new InvalidRequestError(
         'This email address is not supported, please use a different email.',

package/src/account-manager/helpers/account.ts

@@ -13,11 +13,11 @@ import { AccountDb, ActorEntry } from '../db/index.js'
 
 export class UserAlreadyExistsError extends Error {
   name = 'UserAlreadyExistsError'
-  constructor(options?: ErrorOptions) {
-    super(
-      'This email address is already in use, please use a different email.',
-      options,
-    )
+  constructor(
+    message = 'This email address is already in use, please use a different email.',
+    options?: ErrorOptions,
+  ) {
+    super(message, options)
   }
 }
 
@@ -195,17 +195,25 @@ export const updateHandle = async (
   did: DidString,
   handle: HandleString,
 ) => {
+  // No-op if the handle is the same, but still returns 1 row affected, so that
+  // it can be used to check for existence of the account.
   const [res] = await db.executeWithRetry(
     db.db
       .updateTable('actor')
       .set({ handle })
       .where('did', '=', did)
       .whereNotExists(
-        db.db.selectFrom('actor').where('handle', '=', handle).selectAll(),
+        db.db
+          .selectFrom('actor')
+          .where('handle', '=', handle)
+          .where('did', '!=', did)
+          .selectAll(),
       ),
   )
   if (res.numUpdatedRows < 1) {
-    throw new UserAlreadyExistsError()
+    throw new UserAlreadyExistsError(
+      'Handle is already in use, please choose a different handle.',
+    )
   }
 }
 

package/src/account-manager/oauth-store.ts

@@ -23,6 +23,7 @@ import {
   DeviceStore,
   FoundRequestResult,
   HandleUnavailableError,
+  HandleUnavailableReason,
   InvalidCredentialsError,
   InvalidInviteCodeError,
   InvalidRequestError,
@@ -44,6 +45,7 @@ import {
   UpdateEmailConfirmInput,
   UpdateEmailRequestInput,
   UpdateEmailRequestOutput,
+  UpdateHandleData,
   UpdateRequestData,
   VerifyEmailConfirmInput,
   VerifyEmailRequestInput,
@@ -62,8 +64,11 @@ import { Sequencer, syncEvtDataFromCommit } from '../sequencer/index.js'
 import { AccountManager, InvalidPasswordError } from './account-manager.js'
 import * as schemas from './db/schema/index.js'
 import * as accountDeviceHelper from './helpers/account-device.js'
-import * as accountHelper from './helpers/account.js'
-import { AccountStatus, UserAlreadyExistsError } from './helpers/account.js'
+import {
+  AccountStatus,
+  ActorAccount,
+  UserAlreadyExistsError,
+} from './helpers/account.js'
 import * as authRequestHelper from './helpers/authorization-request.js'
 import * as authorizedClientHelper from './helpers/authorized-client.js'
 import * as deviceHelper from './helpers/device.js'
@@ -268,11 +273,13 @@ export class OAuthStore
     account: Account
     authorizedClients: AuthorizedClients
   }> {
-    const accountRow = await accountHelper.getAccount(
-      this.db,
+    const accountRow = await this.accountManager.getAccount(
       // @TODO @atproto/oauth-provider should strongly type `Sub` as `DidString`
       asAtIdentifierString(sub),
-      { includeDeactivated: true },
+      {
+        includeDeactivated: true,
+        includeTakenDown: false,
+      },
     )
 
     assert(accountRow, 'Account not found')
@@ -360,7 +367,7 @@ export class OAuthStore
   }: ResetPasswordRequestInput): Promise<Account | null> {
     const account = await this.accountManager.getAccountByEmail(email, {
       includeDeactivated: true,
-      includeTakenDown: true,
+      includeTakenDown: false,
     })
 
     if (!account?.email || !account?.handle) return null
@@ -387,7 +394,7 @@ export class OAuthStore
       const did = await this.accountManager.resetPassword(data)
       const account = await this.accountManager.getAccount(did, {
         includeDeactivated: true,
-        includeTakenDown: true,
+        includeTakenDown: false,
       })
 
       return account ? this.buildAccount(account) : null
@@ -422,13 +429,7 @@ export class OAuthStore
         throw new HandleUnavailableError('taken')
       }
     } catch (err) {
-      if (err instanceof XrpcInvalidRequestError) {
-        throw err.customErrorName === 'HandleNotAvailable'
-          ? new HandleUnavailableError('taken', err.message)
-          : new HandleUnavailableError('syntax', err.message)
-      }
-
-      throw err
+      throw toHandleUnavailableError(err)
     }
   }
 
@@ -682,8 +683,21 @@ export class OAuthStore
     }
   }
 
+  async updateHandle({ sub: did, handle }: UpdateHandleData): Promise<Account> {
+    // @TODO @atproto/oauth-provider should strongly type `Sub` as `DidString`
+    assert(isDidString(did), 'sub must be a valid DID string')
+
+    try {
+      const account = await this.accountManager.updateHandle(did, handle)
+
+      return this.buildAccount(account)
+    } catch (err) {
+      throw toHandleUnavailableError(err)
+    }
+  }
+
   private async toTokenInfo(
-    row: accountHelper.ActorAccount & Selectable<schemas.Token>,
+    row: ActorAccount & Selectable<schemas.Token>,
   ): Promise<TokenInfo> {
     return {
       id: row.tokenId,
@@ -693,9 +707,7 @@ export class OAuthStore
     }
   }
 
-  private async buildAccount(
-    row: accountHelper.ActorAccount,
-  ): Promise<Account> {
+  private async buildAccount(row: ActorAccount): Promise<Account> {
     const account: Account = {
       sub: row.did,
       aud: this.serviceDid,
@@ -729,3 +741,49 @@ export class OAuthStore
     return account
   }
 }
+
+function toHandleUnavailableError(err: unknown): unknown {
+  if (err instanceof XrpcInvalidRequestError) {
+    const reason = toHandleUnavailableReason(err)
+    if (reason) throw new HandleUnavailableError(reason, err.message, err)
+
+    return new InvalidRequestError(err.message, err)
+  }
+
+  return err
+}
+
+/**
+ * This function maps specific `XrpcInvalidRequestError`, thrown by the
+ * `AccountManager` when validating a handle, to a more specific
+ * `HandleUnavailableError` with a reason. This allows the OAuthProvider to
+ * provide properly localized and specific error messages to the user when a
+ * handle is not available.
+ */
+function toHandleUnavailableReason(
+  err: XrpcInvalidRequestError,
+): HandleUnavailableReason | undefined {
+  switch (err.error) {
+    case 'HandleNotAvailable': {
+      if (err.message === 'Reserved handle') return 'reserved'
+      return 'taken'
+    }
+
+    case 'UnsupportedDomain': {
+      return 'unsupported'
+    }
+
+    case 'InvalidHandle': {
+      if (err.message === 'Inappropriate language in handle') return 'slur'
+      if (err.message === 'Handle TLD is invalid or disallowed') return 'domain'
+      return 'syntax'
+    }
+
+    case 'InvalidRequest': {
+      if (err.message === 'External handle did not resolve to DID') {
+        return 'resolution'
+      }
+      return undefined
+    }
+  }
+}

package/src/actor-store/record/reader.ts

@@ -119,7 +119,7 @@ export class RecordReader {
   }
 
   async getRecord(
-    uri: AtUri,
+    uri: AtUri | AtUriString,
     cid: string | null,
     includeSoftDeleted = false,
   ): Promise<{

package/src/api/com/atproto/admin/updateAccountHandle.ts

@@ -1,56 +1,47 @@
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context.js'
 import { com } from '../../../../lexicons/index.js'
-import { httpLogger } from '../../../../logger.js'
 
 export default function (server: Server, ctx: AppContext) {
-  server.add(com.atproto.admin.updateAccountHandle, {
-    auth: ctx.authVerifier.adminToken,
-    handler: async ({ input }) => {
-      const { did } = input.body
-      const handle = await ctx.accountManager.normalizeAndValidateHandle(
-        input.body.handle,
-        {
-          did,
-          allowAnyValid: true,
-        },
-      )
+  const { entrywayClient } = ctx
 
-      // Pessimistic check to handle spam: also enforced by updateHandle() and the db.
-      const account = await ctx.accountManager.getAccount(handle, {
-        includeDeactivated: true,
-        includeTakenDown: true,
-      })
+  if (entrywayClient) {
+    server.add(com.atproto.admin.updateAccountHandle, {
+      auth: ctx.authVerifier.adminToken,
+      handler: async ({ input: { body } }) => {
+        const { did, handle } = await ctx.accountManager.validateHandleUpdate(
+          body.did,
+          body.handle,
+          { allowAnyValid: true },
+        )
 
-      if (account) {
-        if (account.did !== did) {
-          throw new InvalidRequestError(`Handle already taken: ${handle}`)
-        }
-      } else {
-        if (ctx.cfg.entryway) {
-          // the pds defers to the entryway for updating the handle in the user's did doc.
-          // here was just check that the handle is already bidirectionally confirmed.
-          // @TODO if handle is taken according to this PDS, should we force-update?
-          const doc = await ctx.idResolver.did
-            .resolveAtprotoData(did, true)
-            .catch(() => undefined)
-          if (doc?.handle !== handle) {
-            throw new InvalidRequestError('Handle does not match DID doc')
-          }
-        } else {
-          await ctx.plcClient.updateHandle(did, ctx.plcRotationKey, handle)
+        // the pds defers to the entryway for updating the handle in the user's
+        // did doc. here was just check that the handle is already
+        // bidirectionally confirmed.
+        //
+        // -> entryway(identity.updateHandle) [update handle, submit plc op]
+        // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]
+        //
+        // @TODO if handle is taken according to this PDS, should we force-update?
+        const doc = await ctx.idResolver.did
+          .resolveAtprotoData(did, true)
+          .catch(() => undefined)
+
+        if (!doc || doc.handle !== handle) {
+          throw new InvalidRequestError('Handle does not match DID doc')
         }
-        await ctx.accountManager.updateHandle(did, handle)
-      }
 
-      try {
-        await ctx.sequencer.sequenceIdentityEvt(did, handle)
-      } catch (err) {
-        httpLogger.error(
-          { err, did, handle },
-          'failed to sequence handle update',
-        )
-      }
-    },
-  })
+        await ctx.accountManager.updateAccountHandle(did, handle)
+      },
+    })
+  } else {
+    server.add(com.atproto.admin.updateAccountHandle, {
+      auth: ctx.authVerifier.adminToken,
+      handler: async ({ input: { body } }) => {
+        await ctx.accountManager.updateHandle(body.did, body.handle, {
+          allowAnyValid: true,
+        })
+      },
+    })
+  }
 }