@atproto/api 0.14.0-next.2 → 0.14.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @atproto/api
 
+## 0.13.32
+
+### Patch Changes
+
+- [#3352](https://github.com/bluesky-social/atproto/pull/3352) [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905) Thanks [@foysalit](https://github.com/foysalit)! - Auto resolve appeals when taking down
+
+- Updated dependencies [[`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9)]:
+  - @atproto/xrpc@0.6.7
+
+## 0.13.31
+
+### Patch Changes
+
+- [#3441](https://github.com/bluesky-social/atproto/pull/3441) [`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce) Thanks [@mozzius](https://github.com/mozzius)! - Allow passing `allowTakendown` to createSession
+
+## 0.13.30
+
+### Patch Changes
+
+- [#3429](https://github.com/bluesky-social/atproto/pull/3429) [`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - add feedViewPost.threadContext defs
+
+- [#3390](https://github.com/bluesky-social/atproto/pull/3390) [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - posts_with_video filter in getAuthorFeed
+
+## 0.13.29
+
+### Patch Changes
+
+- [#3416](https://github.com/bluesky-social/atproto/pull/3416) [`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update `tools.ozone.moderation.queryStatuses` lexicon
+
+## 0.13.28
+
+### Patch Changes
+
+- [#3389](https://github.com/bluesky-social/atproto/pull/3389) [`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - add feedgen content mode lexicon spec
+
+## 0.13.27
+
+### Patch Changes
+
+- [#3364](https://github.com/bluesky-social/atproto/pull/3364) [`e277158f7`](https://github.com/bluesky-social/atproto/commit/e277158f70a831b04fde3ec84b3c1eaa6ce82e9d) Thanks [@iwsmith](https://github.com/iwsmith)! - add recId to getSuggestions
+
 ## 0.13.26
 
 ### Patch Changes

package/README.md

@@ -85,7 +85,7 @@ are available:
 - [@atproto/oauth-client-node](https://www.npmjs.com/package/@atproto/oauth-client-node): for
   Node.js.
 - [@atproto/oauth-client](https://www.npmjs.com/package/@atproto/oauth-client):
-  Lower lever; compatible with most JS engines.
+  Lower level; compatible with most JS engines.
 
 Every `@atproto/oauth-client-*` implementation has a different way to obtain an
 `OAuthSession` instance that can be used to instantiate an `Agent` (from

package/dist/agent.d.ts

@@ -1,6 +1,7 @@
 import { FetchHandler, XrpcClient } from '@atproto/xrpc';
 import { AppBskyActorDefs, AppBskyActorProfile, AppBskyFeedPost, AppNS, ChatNS, ComNS, ToolsNS } from './client/index';
 import { MutedWord, Nux } from './client/types/app/bsky/actor/defs';
+import { Un$Typed } from './client/util';
 import { InterpretedLabelValueDefinition, LabelPreference, ModerationPrefs } from './moderation/types';
 import { SessionManager } from './session-manager';
 import { AtpAgentGlobalOpts, AtprotoServiceType, BskyFeedViewPreference, BskyInterestsPreference, BskyPreferences, BskyThreadViewPreference } from './types';
@@ -121,7 +122,11 @@ export declare class Agent extends XrpcClient {
         cid: string;
     }>;
     deleteFollow(followUri: string): Promise<void>;
-    upsertProfile(updateFn: (existing: AppBskyActorProfile.Record | undefined) => AppBskyActorProfile.Record | Promise<AppBskyActorProfile.Record>): Promise<void>;
+    /**
+     * @note: Using this method will reset the whole profile record if it
+     * previously contained invalid values (wrt to the profile lexicon).
+     */
+    upsertProfile(updateFn: (existing: AppBskyActorProfile.Record | undefined) => Un$Typed<AppBskyActorProfile.Record> | Promise<Un$Typed<AppBskyActorProfile.Record>>): Promise<void>;
     mute(actor: string): Promise<import("./client/types/app/bsky/graph/muteActor").Response>;
     unmute(actor: string): Promise<import("./client/types/app/bsky/graph/unmuteActor").Response>;
     muteModList(uri: string): Promise<import("./client/types/app/bsky/graph/muteActorList").Response>;

package/dist/agent.d.ts.map

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

package/dist/agent.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -10,15 +33,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _Agent_prefsLock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agent = void 0;
+const await_lock_1 = __importDefault(require("await-lock"));
 const common_web_1 = require("@atproto/common-web");
 const syntax_1 = require("@atproto/syntax");
 const xrpc_1 = require("@atproto/xrpc");
-const await_lock_1 = __importDefault(require("await-lock"));
 const index_1 = require("./client/index");
 const lexicons_1 = require("./client/lexicons");
 const const_1 = require("./const");
 const moderation_1 = require("./moderation");
 const labels_1 = require("./moderation/const/labels");
+const predicate = __importStar(require("./predicate"));
 const util_1 = require("./util");
 const FEED_VIEW_PREF_DEFAULTS = {
     hideReplies: false,
@@ -440,51 +464,42 @@ class Agent extends xrpc_1.XrpcClient {
             rkey: followUrip.rkey,
         });
     }
+    /**
+     * @note: Using this method will reset the whole profile record if it
+     * previously contained invalid values (wrt to the profile lexicon).
+     */
     async upsertProfile(updateFn) {
-        const repo = this.accountDid;
-        let retriesRemaining = 5;
-        while (retriesRemaining >= 0) {
-            // fetch existing
+        const upsert = async () => {
+            const repo = this.assertDid;
+            const collection = 'app.bsky.actor.profile';
             const existing = await this.com.atproto.repo
-                .getRecord({
-                repo,
-                collection: 'app.bsky.actor.profile',
-                rkey: 'self',
-            })
+                .getRecord({ repo, collection, rkey: 'self' })
                 .catch((_) => undefined);
+            const existingRecord = existing && predicate.isValidProfile(existing.data.value)
+                ? existing.data.value
+                : undefined;
             // run the update
-            const updated = await updateFn(existing?.data.value);
-            if (updated) {
-                updated.$type = 'app.bsky.actor.profile';
-            }
-            // validate the record
-            const validation = index_1.AppBskyActorProfile.validateRecord(updated);
+            const updated = await updateFn(existingRecord);
+            // validate the value returned by the update function
+            const validation = index_1.AppBskyActorProfile.validateRecord({
+                $type: collection,
+                ...updated,
+            });
             if (!validation.success) {
                 throw validation.error;
             }
-            try {
-                // attempt the put
-                await this.com.atproto.repo.putRecord({
-                    repo,
-                    collection: 'app.bsky.actor.profile',
-                    rkey: 'self',
-                    record: updated,
-                    swapRecord: existing?.data.cid || null,
-                });
-            }
-            catch (e) {
-                if (retriesRemaining > 0 &&
-                    e instanceof index_1.ComAtprotoRepoPutRecord.InvalidSwapError) {
-                    // try again
-                    retriesRemaining--;
-                    continue;
-                }
-                else {
-                    throw e;
-                }
-            }
-            break;
-        }
+            await this.com.atproto.repo.putRecord({
+                repo,
+                collection,
+                rkey: 'self',
+                record: validation.value,
+                swapRecord: existing?.data.cid || null,
+            });
+        };
+        return (0, common_web_1.retry)(upsert, {
+            maxRetries: 5,
+            retryable: (e) => e instanceof index_1.ComAtprotoRepoPutRecord.InvalidSwapError,
+        });
     }
     async mute(actor) {
         return this.app.bsky.graph.muteActor({ actor });
@@ -559,16 +574,16 @@ class Agent extends xrpc_1.XrpcClient {
         const res = await this.app.bsky.actor.getPreferences({});
         const labelPrefs = [];
         for (const pref of res.data.preferences) {
-            if (index_1.AppBskyActorDefs.isValidAdultContentPref(pref)) {
+            if (predicate.isValidAdultContentPref(pref)) {
                 // adult content preferences
                 prefs.moderationPrefs.adultContentEnabled = pref.enabled;
             }
-            else if (index_1.AppBskyActorDefs.isValidContentLabelPref(pref)) {
+            else if (predicate.isValidContentLabelPref(pref)) {
                 // content label preference
                 const adjustedPref = adjustLegacyContentLabelPref(pref);
                 labelPrefs.push(adjustedPref);
             }
-            else if (index_1.AppBskyActorDefs.isValidLabelersPref(pref)) {
+            else if (predicate.isValidLabelersPref(pref)) {
                 // labelers preferences
                 prefs.moderationPrefs.labelers = this.appLabelers
                     .map((did) => ({ did, labels: {} }))
@@ -577,35 +592,35 @@ class Agent extends xrpc_1.XrpcClient {
                     labels: {},
                 })));
             }
-            else if (index_1.AppBskyActorDefs.isValidSavedFeedsPrefV2(pref)) {
+            else if (predicate.isValidSavedFeedsPrefV2(pref)) {
                 prefs.savedFeeds = pref.items;
             }
-            else if (index_1.AppBskyActorDefs.isValidSavedFeedsPref(pref)) {
+            else if (predicate.isValidSavedFeedsPref(pref)) {
                 // saved and pinned feeds
                 prefs.feeds.saved = pref.saved;
                 prefs.feeds.pinned = pref.pinned;
             }
-            else if (index_1.AppBskyActorDefs.isValidPersonalDetailsPref(pref)) {
+            else if (predicate.isValidPersonalDetailsPref(pref)) {
                 // birth date (irl)
                 if (pref.birthDate) {
                     prefs.birthDate = new Date(pref.birthDate);
                 }
             }
-            else if (index_1.AppBskyActorDefs.isValidFeedViewPref(pref)) {
+            else if (predicate.isValidFeedViewPref(pref)) {
                 // feed view preferences
                 const { $type: _, feed, ...v } = pref;
                 prefs.feedViewPrefs[feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isValidThreadViewPref(pref)) {
+            else if (predicate.isValidThreadViewPref(pref)) {
                 // thread view preferences
                 const { $type: _, ...v } = pref;
                 prefs.threadViewPrefs = { ...prefs.threadViewPrefs, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isValidInterestsPref(pref)) {
+            else if (predicate.isValidInterestsPref(pref)) {
                 const { $type: _, ...v } = pref;
                 prefs.interests = { ...prefs.interests, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isValidMutedWordsPref(pref)) {
+            else if (predicate.isValidMutedWordsPref(pref)) {
                 prefs.moderationPrefs.mutedWords = pref.items;
                 if (prefs.moderationPrefs.mutedWords.length) {
                     prefs.moderationPrefs.mutedWords =
@@ -615,10 +630,10 @@ class Agent extends xrpc_1.XrpcClient {
                         });
                 }
             }
-            else if (index_1.AppBskyActorDefs.isValidHiddenPostsPref(pref)) {
+            else if (predicate.isValidHiddenPostsPref(pref)) {
                 prefs.moderationPrefs.hiddenPosts = pref.items;
             }
-            else if (index_1.AppBskyActorDefs.isValidBskyAppStatePref(pref)) {
+            else if (predicate.isValidBskyAppStatePref(pref)) {
                 prefs.bskyAppState.queuedNudges = pref.queuedNudges || [];
                 prefs.bskyAppState.activeProgressGuide = pref.activeProgressGuide;
                 prefs.bskyAppState.nuxs = pref.nuxs || [];
@@ -795,7 +810,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async setAdultContentEnabled(v) {
         await this.updatePreferences((prefs) => {
-            const adultContentPref = prefs.findLast(index_1.AppBskyActorDefs.isValidAdultContentPref) || {
+            const adultContentPref = prefs.findLast(predicate.isValidAdultContentPref) || {
                 $type: 'app.bsky.actor.defs#adultContentPref',
                 enabled: v,
             };
@@ -811,7 +826,7 @@ class Agent extends xrpc_1.XrpcClient {
         }
         await this.updatePreferences((prefs) => {
             const labelPref = prefs
-                .filter(index_1.AppBskyActorDefs.isValidContentLabelPref)
+                .filter(predicate.isValidContentLabelPref)
                 .findLast((pref) => pref.label === key && pref.labelerDid === labelerDid) || {
                 $type: 'app.bsky.actor.defs#contentLabelPref',
                 label: key,
@@ -833,7 +848,7 @@ class Agent extends xrpc_1.XrpcClient {
                     // if it's a legacy label, double-write the legacy label
                     if (legacyLabelValue) {
                         legacyLabelPref = prefs
-                            .filter(index_1.AppBskyActorDefs.isValidContentLabelPref)
+                            .filter(predicate.isValidContentLabelPref)
                             .findLast((pref) => pref.label === legacyLabelValue &&
                             pref.labelerDid === undefined) || {
                             $type: 'app.bsky.actor.defs#contentLabelPref',
@@ -861,7 +876,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async addLabeler(did) {
         const prefs = await this.updatePreferences((prefs) => {
-            const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref) || {
+            const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
                 $type: 'app.bsky.actor.defs#labelersPref',
                 labelers: [],
             };
@@ -877,7 +892,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async removeLabeler(did) {
         const prefs = await this.updatePreferences((prefs) => {
-            const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref) || {
+            const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
                 $type: 'app.bsky.actor.defs#labelersPref',
                 labelers: [],
             };
@@ -892,7 +907,7 @@ class Agent extends xrpc_1.XrpcClient {
     async setPersonalDetails({ birthDate, }) {
         birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate;
         await this.updatePreferences((prefs) => {
-            const personalDetailsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidPersonalDetailsPref) || {
+            const personalDetailsPref = prefs.findLast(predicate.isValidPersonalDetailsPref) || {
                 $type: 'app.bsky.actor.defs#personalDetailsPref',
                 birthDate,
             };
@@ -905,7 +920,7 @@ class Agent extends xrpc_1.XrpcClient {
     async setFeedViewPrefs(feed, pref) {
         await this.updatePreferences((prefs) => {
             const existing = prefs
-                .filter(index_1.AppBskyActorDefs.isValidFeedViewPref)
+                .filter(predicate.isValidFeedViewPref)
                 .findLast((pref) => pref.feed === feed);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isFeedViewPref(p) || p.feed !== feed)
@@ -919,7 +934,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async setThreadViewPrefs(pref) {
         await this.updatePreferences((prefs) => {
-            const existing = prefs.findLast(index_1.AppBskyActorDefs.isValidThreadViewPref);
+            const existing = prefs.findLast(predicate.isValidThreadViewPref);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isThreadViewPref(p))
                 .concat({
@@ -931,7 +946,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async setInterestsPref(pref) {
         await this.updatePreferences((prefs) => {
-            const existing = prefs.findLast(index_1.AppBskyActorDefs.isValidInterestsPref);
+            const existing = prefs.findLast(predicate.isValidInterestsPref);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isInterestsPref(p))
                 .concat({
@@ -949,7 +964,7 @@ class Agent extends xrpc_1.XrpcClient {
         if (!sanitizedValue)
             return;
         await this.updatePreferences((prefs) => {
-            let mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
+            let mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref);
             const newMutedWord = {
                 id: common_web_1.TID.nextStr(),
                 value: sanitizedValue,
@@ -993,7 +1008,7 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async updateMutedWord(mutedWord) {
         await this.updatePreferences((prefs) => {
-            const mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
+            const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref);
             if (mutedWordsPref && index_1.AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
                 mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
                     const match = matchMutedWord(existingItem, mutedWord);
@@ -1033,7 +1048,7 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async removeMutedWord(mutedWord) {
         await this.updatePreferences((prefs) => {
-            const mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
+            const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref);
             if (mutedWordsPref && index_1.AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
                 for (let i = 0; i < mutedWordsPref.items.length; i++) {
                     const match = matchMutedWord(mutedWordsPref.items[i], mutedWord);
@@ -1070,7 +1085,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async bskyAppQueueNudges(nudges) {
         await this.updatePreferences((prefs) => {
-            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+            const bskyAppStatePref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
                 $type: 'app.bsky.actor.defs#bskyAppStatePref',
             };
             bskyAppStatePref.queuedNudges = (bskyAppStatePref.queuedNudges || []).concat(nudges);
@@ -1081,7 +1096,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async bskyAppDismissNudges(nudges) {
         await this.updatePreferences((prefs) => {
-            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+            const bskyAppStatePref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
                 $type: 'app.bsky.actor.defs#bskyAppStatePref',
             };
             nudges = Array.isArray(nudges) ? nudges : [nudges];
@@ -1092,12 +1107,13 @@ class Agent extends xrpc_1.XrpcClient {
         });
     }
     async bskyAppSetActiveProgressGuide(guide) {
-        if (guide &&
-            !index_1.AppBskyActorDefs.validateBskyAppProgressGuide(guide).success) {
-            throw new Error('Invalid progress guide');
+        if (guide) {
+            const result = index_1.AppBskyActorDefs.validateBskyAppProgressGuide(guide);
+            if (!result.success)
+                throw result.error;
         }
         await this.updatePreferences((prefs) => {
-            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+            const bskyAppStatePref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
                 $type: 'app.bsky.actor.defs#bskyAppStatePref',
             };
             bskyAppStatePref.activeProgressGuide = guide;
@@ -1112,7 +1128,7 @@ class Agent extends xrpc_1.XrpcClient {
     async bskyAppUpsertNux(nux) {
         (0, util_1.validateNux)(nux);
         await this.updatePreferences((prefs) => {
-            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+            const bskyAppStatePref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
                 $type: 'app.bsky.actor.defs#bskyAppStatePref',
             };
             bskyAppStatePref.nuxs = bskyAppStatePref.nuxs || [];
@@ -1145,7 +1161,7 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async bskyAppRemoveNuxs(ids) {
         await this.updatePreferences((prefs) => {
-            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+            const bskyAppStatePref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
                 $type: 'app.bsky.actor.defs#bskyAppStatePref',
             };
             bskyAppStatePref.nuxs = (bskyAppStatePref.nuxs || []).filter((nux) => {
@@ -1183,7 +1199,7 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async updateHiddenPost(postUri, action) {
         await this.updatePreferences((prefs) => {
-            const pref = prefs.findLast(index_1.AppBskyActorDefs.isValidHiddenPostsPref) || {
+            const pref = prefs.findLast(predicate.isValidHiddenPostsPref) || {
                 $type: 'app.bsky.actor.defs#hiddenPostsPref',
                 items: [],
             };
@@ -1204,7 +1220,7 @@ class Agent extends xrpc_1.XrpcClient {
     async updateFeedPreferences(cb) {
         let res;
         await this.updatePreferences((prefs) => {
-            const feedsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPref) || {
+            const feedsPref = prefs.findLast(predicate.isValidSavedFeedsPref) || {
                 $type: 'app.bsky.actor.defs#savedFeedsPref',
                 saved: [],
                 pinned: [],
@@ -1221,8 +1237,8 @@ class Agent extends xrpc_1.XrpcClient {
     async updateSavedFeedsV2Preferences(cb) {
         let maybeMutatedSavedFeeds = [];
         await this.updatePreferences((prefs) => {
-            let existingV2Pref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPrefV2);
-            let existingV1Pref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPref);
+            let existingV2Pref = prefs.findLast(predicate.isValidSavedFeedsPrefV2);
+            let existingV1Pref = prefs.findLast(predicate.isValidSavedFeedsPref);
             if (existingV2Pref) {
                 maybeMutatedSavedFeeds = cb(existingV2Pref.items);
                 existingV2Pref = {
@@ -1314,7 +1330,7 @@ function remapLegacyLabels(labels) {
  * A helper to get the currently enabled labelers from the full preferences array
  */
 function prefsArrayToLabelerDids(prefs) {
-    const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref);
+    const labelersPref = prefs.findLast(predicate.isValidLabelersPref);
     let dids = [];
     if (labelersPref) {
         dids = labelersPref.labelers.map((labeler) => labeler.did);