@atproto/api 0.10.0 → 0.11.0-next.0

package/dist/rich-text/sanitization.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeRichText = void 0;
+const unicode_1 = require("./unicode");
+// this regex is intentionally matching on the zero-with-separator codepoint
+// eslint-disable-next-line no-misleading-character-class
+const EXCESS_SPACE_RE = /[\r\n]([\u00AD\u2060\u200D\u200C\u200B\s]*[\r\n]){2,}/;
+const REPLACEMENT_STR = '\n\n';
+function sanitizeRichText(richText, opts) {
+    if (opts.cleanNewlines) {
+        richText = clean(richText, EXCESS_SPACE_RE, REPLACEMENT_STR);
+    }
+    return richText;
+}
+exports.sanitizeRichText = sanitizeRichText;
+function clean(richText, targetRegexp, replacementString) {
+    richText = richText.clone();
+    let match = richText.unicodeText.utf16.match(targetRegexp);
+    while (match && typeof match.index !== 'undefined') {
+        const oldText = richText.unicodeText;
+        const removeStartIndex = richText.unicodeText.utf16IndexToUtf8Index(match.index);
+        const removeEndIndex = removeStartIndex + new unicode_1.UnicodeString(match[0]).length;
+        richText.delete(removeStartIndex, removeEndIndex);
+        if (richText.unicodeText.utf16 === oldText.utf16) {
+            break; // sanity check
+        }
+        richText.insert(removeStartIndex, replacementString);
+        match = richText.unicodeText.utf16.match(targetRegexp);
+    }
+    return richText;
+}
+//# sourceMappingURL=sanitization.js.map

package/dist/rich-text/sanitization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitization.js","sourceRoot":"","sources":["../../src/rich-text/sanitization.ts"],"names":[],"mappings":";;;AACA,uCAAyC;AAEzC,4EAA4E;AAC5E,yDAAyD;AACzD,MAAM,eAAe,GAAG,uDAAuD,CAAA;AAC/E,MAAM,eAAe,GAAG,MAAM,CAAA;AAE9B,SAAgB,gBAAgB,CAC9B,QAAkB,EAClB,IAAiC;IAEjC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AARD,4CAQC;AAED,SAAS,KAAK,CACZ,QAAkB,EAClB,YAAoB,EACpB,iBAAyB;IAEzB,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;IAE3B,IAAI,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IAC1D,OAAO,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAA;QACpC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,qBAAqB,CACjE,KAAK,CAAC,KAAK,CACZ,CAAA;QACD,MAAM,cAAc,GAAG,gBAAgB,GAAG,IAAI,uBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QAC5E,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;QACjD,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;YACjD,MAAK,CAAC,eAAe;QACvB,CAAC;QACD,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAA;QACpD,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/dist/rich-text/unicode.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Javascript uses utf16-encoded strings while most environments and specs
+ * have standardized around utf8 (including JSON).
+ *
+ * After some lengthy debated we decided that richtext facets need to use
+ * utf8 indices. This means we need tools to convert indices between utf8
+ * and utf16, and that's precisely what this library handles.
+ */
 export declare class UnicodeString {
     utf16: string;
     utf8: Uint8Array;
@@ -9,3 +17,4 @@ export declare class UnicodeString {
     utf16IndexToUtf8Index(i: number): number;
     toString(): string;
 }
+//# sourceMappingURL=unicode.d.ts.map

package/dist/rich-text/unicode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unicode.d.ts","sourceRoot":"","sources":["../../src/rich-text/unicode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,qBAAa,aAAa;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,CAAC,YAAY,CAAC,CAAoB;gBAE7B,KAAK,EAAE,MAAM;IAKzB,IAAI,MAAM,WAET;IAED,IAAI,cAAc,WAKjB;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAI3C,qBAAqB,CAAC,CAAC,EAAE,MAAM;IAI/B,QAAQ;CAGT"}

package/dist/rich-text/unicode.js

@@ -0,0 +1,58 @@
+"use strict";
+/**
+ * Javascript uses utf16-encoded strings while most environments and specs
+ * have standardized around utf8 (including JSON).
+ *
+ * After some lengthy debated we decided that richtext facets need to use
+ * utf8 indices. This means we need tools to convert indices between utf8
+ * and utf16, and that's precisely what this library handles.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnicodeString = void 0;
+const common_web_1 = require("@atproto/common-web");
+const encoder = new TextEncoder();
+const decoder = new TextDecoder();
+class UnicodeString {
+    constructor(utf16) {
+        Object.defineProperty(this, "utf16", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "utf8", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_graphemeLen", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.utf16 = utf16;
+        this.utf8 = encoder.encode(utf16);
+    }
+    get length() {
+        return this.utf8.byteLength;
+    }
+    get graphemeLength() {
+        if (!this._graphemeLen) {
+            this._graphemeLen = (0, common_web_1.graphemeLen)(this.utf16);
+        }
+        return this._graphemeLen;
+    }
+    slice(start, end) {
+        return decoder.decode(this.utf8.slice(start, end));
+    }
+    utf16IndexToUtf8Index(i) {
+        return encoder.encode(this.utf16.slice(0, i)).byteLength;
+    }
+    toString() {
+        return this.utf16;
+    }
+}
+exports.UnicodeString = UnicodeString;
+//# sourceMappingURL=unicode.js.map

package/dist/rich-text/unicode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unicode.js","sourceRoot":"","sources":["../../src/rich-text/unicode.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,oDAAiD;AAEjD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;AACjC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;AAEjC,MAAa,aAAa;IAKxB,YAAY,KAAa;QAJzB;;;;;WAAa;QACb;;;;;WAAgB;QACR;;;;;WAAiC;QAGvC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;IAC7B,CAAC;IAED,IAAI,cAAc;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,GAAG,IAAA,wBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,KAAc,EAAE,GAAY;QAChC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;IACpD,CAAC;IAED,qBAAqB,CAAC,CAAS;QAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC1D,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF;AAhCD,sCAgCC"}

package/dist/types.d.ts

@@ -1,6 +1,12 @@
 import { AppBskyActorDefs } from './client';
 import { LabelPreference } from './moderation/types';
+/**
+ * Used by the PersistSessionHandler to indicate what change occurred
+ */
 export type AtpSessionEvent = 'create' | 'create-failed' | 'update' | 'expired' | 'network-error';
+/**
+ * Used by AtpAgent to store active sessions
+ */
 export interface AtpSessionData {
     refreshJwt: string;
     accessJwt: string;
@@ -9,15 +15,27 @@ export interface AtpSessionData {
     email?: string;
     emailConfirmed?: boolean;
 }
+/**
+ * Handler signature passed to AtpAgent to store session data
+ */
 export type AtpPersistSessionHandler = (evt: AtpSessionEvent, session: AtpSessionData | undefined) => void | Promise<void>;
+/**
+ * AtpAgent constructor() opts
+ */
 export interface AtpAgentOpts {
     service: string | URL;
     persistSession?: AtpPersistSessionHandler;
 }
+/**
+ * AtpAgent login() opts
+ */
 export interface AtpAgentLoginOpts {
     identifier: string;
     password: string;
 }
+/**
+ * AtpAgent global fetch handler
+ */
 type AtpAgentFetchHeaders = Record<string, string>;
 export interface AtpAgentFetchHandlerResponse {
     status: number;
@@ -25,10 +43,19 @@ export interface AtpAgentFetchHandlerResponse {
     body: any;
 }
 export type AtpAgentFetchHandler = (httpUri: string, httpMethod: string, httpHeaders: AtpAgentFetchHeaders, httpReqBody: any) => Promise<AtpAgentFetchHandlerResponse>;
+/**
+ * AtpAgent global config opts
+ */
 export interface AtpAgentGlobalOpts {
     fetch: AtpAgentFetchHandler;
 }
+/**
+ * Content-label preference
+ */
 export type BskyLabelPreference = LabelPreference | 'show';
+/**
+ * Bluesky feed view preferences
+ */
 export interface BskyFeedViewPreference {
     hideReplies: boolean;
     hideRepliesByUnfollowed: boolean;
@@ -37,15 +64,24 @@ export interface BskyFeedViewPreference {
     hideQuotePosts: boolean;
     [key: string]: any;
 }
+/**
+ * Bluesky thread view preferences
+ */
 export interface BskyThreadViewPreference {
     sort: string;
     prioritizeFollowedUsers: boolean;
     [key: string]: any;
 }
+/**
+ * Bluesky interests preferences
+ */
 export interface BskyInterestsPreference {
     tags: string[];
     [key: string]: any;
 }
+/**
+ * Bluesky preferences
+ */
 export interface BskyPreferences {
     feeds: {
         saved?: string[];
@@ -61,3 +97,4 @@ export interface BskyPreferences {
     hiddenPosts: string[];
 }
 export {};
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/jest.config.js

@@ -1,6 +1,9 @@
-const base = require('../../jest.config.base.js')
-
+/** @type {import('jest').Config} */
 module.exports = {
-  ...base,
   displayName: 'API',
+  transform: { '^.+\\.(t|j)s$': '@swc/jest' },
+  transformIgnorePatterns: [`<rootDir>/node_modules/(?!get-port)`],
+  testTimeout: 60000,
+  setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
 }

package/jest.d.ts

@@ -0,0 +1,20 @@
+declare namespace jest {
+  // eslint-disable-next-line
+  interface Matchers<R, T = {}> {
+    toBeModerationResult(
+      expected: ModerationBehaviorResult | undefined,
+      context: string,
+      stringifiedResult: string,
+      ignoreCause?: boolean,
+    ): R
+  }
+
+  interface Expect {
+    toBeModerationResult(
+      expected: ModerationBehaviorResult | undefined,
+      context: string,
+      stringifiedResult: string,
+      ignoreCause?: boolean,
+    ): void
+  }
+}

package/jest.setup.ts

@@ -0,0 +1,79 @@
+import { ModerationBehaviorResult } from './definitions/moderation-behaviors'
+import { ModerationUI } from './src'
+
+expect.extend({
+  toBeModerationResult(
+    actual: ModerationUI,
+    expected: ModerationBehaviorResult | undefined,
+    context: string,
+    stringifiedResult: string,
+    ignoreCause = false,
+  ) {
+    const fail = (msg: string) => ({
+      pass: false,
+      message: () => `${msg}. Full result: ${stringifiedResult}`,
+    })
+    let cause = actual.cause?.type as string
+    if (actual.cause?.type === 'label') {
+      cause = `label:${actual.cause.labelDef.id}`
+    } else if (actual.cause?.type === 'muted') {
+      if (actual.cause.source.type === 'list') {
+        cause = 'muted-by-list'
+      }
+    } else if (actual.cause?.type === 'blocking') {
+      if (actual.cause.source.type === 'list') {
+        cause = 'blocking-by-list'
+      }
+    }
+    if (!expected) {
+      if (!ignoreCause && actual.cause) {
+        return fail(`${context} expected to be a no-op, got ${cause}`)
+      }
+      if (actual.alert) {
+        return fail(`${context} expected to be a no-op, got alert=true`)
+      }
+      if (actual.blur) {
+        return fail(`${context} expected to be a no-op, got blur=true`)
+      }
+      if (actual.filter) {
+        return fail(`${context} expected to be a no-op, got filter=true`)
+      }
+      if (actual.noOverride) {
+        return fail(`${context} expected to be a no-op, got noOverride=true`)
+      }
+    } else {
+      if (!ignoreCause && cause !== expected.cause) {
+        return fail(`${context} expected to be ${expected.cause}, got ${cause}`)
+      }
+      if (!!actual.alert !== !!expected.alert) {
+        return fail(
+          `${context} expected to be alert=${expected.alert || false}, got ${
+            actual.alert || false
+          }`,
+        )
+      }
+      if (!!actual.blur !== !!expected.blur) {
+        return fail(
+          `${context} expected to be blur=${expected.blur || false}, got ${
+            actual.blur || false
+          }`,
+        )
+      }
+      if (!!actual.filter !== !!expected.filter) {
+        return fail(
+          `${context} expected to be filter=${expected.filter || false}, got ${
+            actual.filter || false
+          }`,
+        )
+      }
+      if (!!actual.noOverride !== !!expected.noOverride) {
+        return fail(
+          `${context} expected to be noOverride=${
+            expected.noOverride || false
+          }, got ${actual.noOverride || false}`,
+        )
+      }
+    }
+    return { pass: true, message: () => '' }
+  },
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.10.0",
+  "version": "0.11.0-next.0",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -15,6 +15,7 @@
     "directory": "packages/api"
   },
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "dependencies": {
     "multiformats": "^9.9.0",
     "tlds": "^1.234.0",
@@ -27,18 +28,13 @@
   },
   "devDependencies": {
     "common-tags": "^1.8.2",
-    "@atproto/lex-cli": "^0.3.0",
-    "@atproto/dev-env": "^0.2.32"
+    "jest": "^28.1.2",
+    "@atproto/lex-cli": "^0.3.0"
   },
   "scripts": {
     "codegen": "pnpm docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",
     "docgen": "node ./scripts/generate-docs.mjs",
-    "build": "node ./build.js",
-    "postbuild": "tsc --build tsconfig.build.json",
-    "update-main-to-dist": "node ../../update-main-to-dist.js packages/api",
-    "test": "jest",
-    "bench": "jest --config jest.bench.config.js",
-    "bench:profile": "node --inspect-brk ../../node_modules/.bin/jest --config jest.bench.config.js"
-  },
-  "types": "dist/index.d.ts"
+    "build": "tsc --build tsconfig.build.json",
+    "test": "jest"
+  }
 }

package/src/bsky-agent.ts

@@ -668,24 +668,24 @@ async function updateMutedWords(
 
     if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
       if (action === 'upsert' || action === 'update') {
-        for (const newItem of mutedWords) {
+        for (const word of mutedWords) {
           let foundMatch = false
 
           for (const existingItem of mutedWordsPref.items) {
-            if (existingItem.value === newItem.value) {
+            if (existingItem.value === sanitizeMutedWord(word).value) {
               existingItem.targets =
                 action === 'upsert'
                   ? Array.from(
-                      new Set([...existingItem.targets, ...newItem.targets]),
+                      new Set([...existingItem.targets, ...word.targets]),
                     )
-                  : newItem.targets
+                  : word.targets
               foundMatch = true
               break
             }
           }
 
           if (action === 'upsert' && !foundMatch) {
-            mutedWordsPref.items.push(sanitizeMutedWord(newItem))
+            mutedWordsPref.items.push(sanitizeMutedWord(word))
           }
         }
       } else if (action === 'remove') {

package/src/client/index.ts

@@ -29,6 +29,7 @@ import * as ComAtprotoAdminSearchRepos from './types/com/atproto/admin/searchRep
 import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
 import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
 import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
+import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
 import * as ComAtprotoAdminUpdateCommunicationTemplate from './types/com/atproto/admin/updateCommunicationTemplate'
 import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
 import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
@@ -182,6 +183,7 @@ export * as ComAtprotoAdminSearchRepos from './types/com/atproto/admin/searchRep
 export * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
 export * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
 export * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
+export * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
 export * as ComAtprotoAdminUpdateCommunicationTemplate from './types/com/atproto/admin/updateCommunicationTemplate'
 export * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
 export * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
@@ -654,6 +656,17 @@ export class ComAtprotoAdminNS {
       })
   }
 
+  updateAccountPassword(
+    data?: ComAtprotoAdminUpdateAccountPassword.InputSchema,
+    opts?: ComAtprotoAdminUpdateAccountPassword.CallOptions,
+  ): Promise<ComAtprotoAdminUpdateAccountPassword.Response> {
+    return this._service.xrpc
+      .call('com.atproto.admin.updateAccountPassword', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoAdminUpdateAccountPassword.toKnownErr(e)
+      })
+  }
+
   updateCommunicationTemplate(
     data?: ComAtprotoAdminUpdateCommunicationTemplate.InputSchema,
     opts?: ComAtprotoAdminUpdateCommunicationTemplate.CallOptions,

package/src/client/lexicons.ts

@@ -1863,6 +1863,33 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoAdminUpdateAccountPassword: {
+    lexicon: 1,
+    id: 'com.atproto.admin.updateAccountPassword',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Update the password for a user account as an administrator.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['did', 'password'],
+            properties: {
+              did: {
+                type: 'string',
+                format: 'did',
+              },
+              password: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoAdminUpdateCommunicationTemplate: {
     lexicon: 1,
     id: 'com.atproto.admin.updateCommunicationTemplate',
@@ -4840,7 +4867,7 @@ export const schemaDict = {
       main: {
         type: 'query',
         description:
-          'Fetch all labels from a labeler created after a certain date. DEPRECATED: use queryLabels or subscribeLabels instead',
+          'DEPRECATED: use queryLabels or subscribeLabels instead -- Fetch all labels from a labeler created after a certain date.',
         parameters: {
           type: 'params',
           properties: {
@@ -5075,6 +5102,8 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#feedViewPref',
             'lex:app.bsky.actor.defs#threadViewPref',
             'lex:app.bsky.actor.defs#interestsPref',
+            'lex:app.bsky.actor.defs#mutedWordsPref',
+            'lex:app.bsky.actor.defs#hiddenPostsPref',
           ],
         },
       },
@@ -8860,6 +8889,8 @@ export const ids = {
   ComAtprotoAdminSendEmail: 'com.atproto.admin.sendEmail',
   ComAtprotoAdminUpdateAccountEmail: 'com.atproto.admin.updateAccountEmail',
   ComAtprotoAdminUpdateAccountHandle: 'com.atproto.admin.updateAccountHandle',
+  ComAtprotoAdminUpdateAccountPassword:
+    'com.atproto.admin.updateAccountPassword',
   ComAtprotoAdminUpdateCommunicationTemplate:
     'com.atproto.admin.updateCommunicationTemplate',
   ComAtprotoAdminUpdateSubjectStatus: 'com.atproto.admin.updateSubjectStatus',

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

@@ -114,6 +114,8 @@ export type Preferences = (
   | FeedViewPref
   | ThreadViewPref
   | InterestsPref
+  | MutedWordsPref
+  | HiddenPostsPref
   | { $type: string; [k: string]: unknown }
 )[]
 

package/src/client/types/com/atproto/admin/updateAccountPassword.ts

@@ -0,0 +1,33 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  did: string
+  password: string
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+  qp?: QueryParams
+  encoding: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

package/src/types.ts

@@ -1,4 +1,4 @@
-import { AppBskyActorNS, AppBskyActorDefs } from './client'
+import { AppBskyActorDefs } from './client'
 import { LabelPreference } from './moderation/types'
 
 /**

package/tests/bsky-agent.test.ts

@@ -1199,10 +1199,17 @@ describe('agent', () => {
       })
 
       it('upsertMutedWords with #', async () => {
+        await agent.upsertMutedWords([
+          { value: 'hashtag', targets: ['content'] },
+        ])
         await agent.upsertMutedWords([{ value: '#hashtag', targets: ['tag'] }])
         const { mutedWords } = await agent.getPreferences()
         expect(mutedWords.find((m) => m.value === '#hashtag')).toBeFalsy()
-        expect(mutedWords.find((m) => m.value === 'hashtag')).toBeTruthy()
+        expect(mutedWords.find((m) => m.value === 'hashtag')).toStrictEqual({
+          value: 'hashtag',
+          targets: ['content', 'tag'],
+        })
+        expect(mutedWords.filter((m) => m.value === 'hashtag').length).toBe(1)
       })
 
       it('updateMutedWord', async () => {

package/tests/moderation.test.ts

@@ -1,6 +1,5 @@
 import { moderateProfile, moderatePost } from '../src'
 import { mock } from './util'
-import './util/moderation-behavior'
 
 describe('Moderation', () => {
   it('Applies self-labels on profiles according to the global preferences', () => {

package/tests/profile-moderation.test.ts

@@ -26,11 +26,13 @@ describe('Post moderation behaviors', () => {
         suiteRunner.moderationOpts(scenario),
       )
       expect(res.account).toBeModerationResult(
+        // @ts-expect-error FIXME remove this comment (and fix the TS error)
         scenario.behaviors.account,
         'account',
         JSON.stringify(res, null, 2),
       )
       expect(res.profile).toBeModerationResult(
+        // @ts-expect-error FIXME remove this comment (and fix the TS error)
         scenario.behaviors.profile,
         'profile content',
         JSON.stringify(res, null, 2),