@atproto/api 0.13.21 → 0.14.0-next.1

package/dist/agent.js

@@ -559,19 +559,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.isAdultContentPref(pref) &&
-                index_1.AppBskyActorDefs.validateAdultContentPref(pref).success) {
+            if (index_1.AppBskyActorDefs.isValidAdultContentPref(pref)) {
                 // adult content preferences
                 prefs.moderationPrefs.adultContentEnabled = pref.enabled;
             }
-            else if (index_1.AppBskyActorDefs.isContentLabelPref(pref) &&
-                index_1.AppBskyActorDefs.validateContentLabelPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidContentLabelPref(pref)) {
                 // content label preference
                 const adjustedPref = adjustLegacyContentLabelPref(pref);
                 labelPrefs.push(adjustedPref);
             }
-            else if (index_1.AppBskyActorDefs.isLabelersPref(pref) &&
-                index_1.AppBskyActorDefs.validateLabelersPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidLabelersPref(pref)) {
                 // labelers preferences
                 prefs.moderationPrefs.labelers = this.appLabelers
                     .map((did) => ({ did, labels: {} }))
@@ -580,48 +577,36 @@ class Agent extends xrpc_1.XrpcClient {
                     labels: {},
                 })));
             }
-            else if (index_1.AppBskyActorDefs.isSavedFeedsPrefV2(pref) &&
-                index_1.AppBskyActorDefs.validateSavedFeedsPrefV2(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidSavedFeedsPrefV2(pref)) {
                 prefs.savedFeeds = pref.items;
             }
-            else if (index_1.AppBskyActorDefs.isSavedFeedsPref(pref) &&
-                index_1.AppBskyActorDefs.validateSavedFeedsPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidSavedFeedsPref(pref)) {
                 // saved and pinned feeds
                 prefs.feeds.saved = pref.saved;
                 prefs.feeds.pinned = pref.pinned;
             }
-            else if (index_1.AppBskyActorDefs.isPersonalDetailsPref(pref) &&
-                index_1.AppBskyActorDefs.validatePersonalDetailsPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidPersonalDetailsPref(pref)) {
                 // birth date (irl)
                 if (pref.birthDate) {
                     prefs.birthDate = new Date(pref.birthDate);
                 }
             }
-            else if (index_1.AppBskyActorDefs.isFeedViewPref(pref) &&
-                index_1.AppBskyActorDefs.validateFeedViewPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidFeedViewPref(pref)) {
                 // feed view preferences
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, feed, ...v } = pref;
-                prefs.feedViewPrefs[pref.feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v };
+                const { $type: _, feed, ...v } = pref;
+                prefs.feedViewPrefs[feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isThreadViewPref(pref) &&
-                index_1.AppBskyActorDefs.validateThreadViewPref(pref).success) {
+            else if (index_1.AppBskyActorDefs.isValidThreadViewPref(pref)) {
                 // thread view preferences
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, ...v } = pref;
+                const { $type: _, ...v } = pref;
                 prefs.threadViewPrefs = { ...prefs.threadViewPrefs, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isInterestsPref(pref) &&
-                index_1.AppBskyActorDefs.validateInterestsPref(pref).success) {
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, ...v } = pref;
+            else if (index_1.AppBskyActorDefs.isValidInterestsPref(pref)) {
+                const { $type: _, ...v } = pref;
                 prefs.interests = { ...prefs.interests, ...v };
             }
-            else if (index_1.AppBskyActorDefs.isMutedWordsPref(pref) &&
-                index_1.AppBskyActorDefs.validateMutedWordsPref(pref).success) {
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, ...v } = pref;
-                prefs.moderationPrefs.mutedWords = v.items;
+            else if (index_1.AppBskyActorDefs.isValidMutedWordsPref(pref)) {
+                prefs.moderationPrefs.mutedWords = pref.items;
                 if (prefs.moderationPrefs.mutedWords.length) {
                     prefs.moderationPrefs.mutedWords =
                         prefs.moderationPrefs.mutedWords.map((word) => {
@@ -630,19 +615,13 @@ class Agent extends xrpc_1.XrpcClient {
                         });
                 }
             }
-            else if (index_1.AppBskyActorDefs.isHiddenPostsPref(pref) &&
-                index_1.AppBskyActorDefs.validateHiddenPostsPref(pref).success) {
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, ...v } = pref;
-                prefs.moderationPrefs.hiddenPosts = v.items;
+            else if (index_1.AppBskyActorDefs.isValidHiddenPostsPref(pref)) {
+                prefs.moderationPrefs.hiddenPosts = pref.items;
             }
-            else if (index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success) {
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const { $type, ...v } = pref;
-                prefs.bskyAppState.queuedNudges = v.queuedNudges || [];
-                prefs.bskyAppState.activeProgressGuide = v.activeProgressGuide;
-                prefs.bskyAppState.nuxs = v.nuxs || [];
+            else if (index_1.AppBskyActorDefs.isValidBskyAppStatePref(pref)) {
+                prefs.bskyAppState.queuedNudges = pref.queuedNudges || [];
+                prefs.bskyAppState.activeProgressGuide = pref.activeProgressGuide;
+                prefs.bskyAppState.nuxs = pref.nuxs || [];
             }
         }
         /*
@@ -816,20 +795,14 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async setAdultContentEnabled(v) {
         await this.updatePreferences((prefs) => {
-            let adultContentPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isAdultContentPref(pref) &&
-                index_1.AppBskyActorDefs.validateAdultContentPref(pref).success);
-            if (adultContentPref) {
-                adultContentPref.enabled = v;
-            }
-            else {
-                adultContentPref = {
-                    $type: 'app.bsky.actor.defs#adultContentPref',
-                    enabled: v,
-                };
-            }
+            const adultContentPref = prefs.findLast(index_1.AppBskyActorDefs.isValidAdultContentPref) || {
+                $type: 'app.bsky.actor.defs#adultContentPref',
+                enabled: v,
+            };
+            adultContentPref.enabled = v;
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isAdultContentPref(pref))
-                .concat([adultContentPref]);
+                .concat(adultContentPref);
         });
     }
     async setContentLabelPref(key, value, labelerDid) {
@@ -837,22 +810,16 @@ class Agent extends xrpc_1.XrpcClient {
             (0, syntax_1.ensureValidDid)(labelerDid);
         }
         await this.updatePreferences((prefs) => {
-            let labelPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isContentLabelPref(pref) &&
-                index_1.AppBskyActorDefs.validateContentLabelPref(pref).success &&
-                pref.label === key &&
-                pref.labelerDid === labelerDid);
+            const labelPref = prefs
+                .filter(index_1.AppBskyActorDefs.isValidContentLabelPref)
+                .findLast((pref) => pref.label === key && pref.labelerDid === labelerDid) || {
+                $type: 'app.bsky.actor.defs#contentLabelPref',
+                label: key,
+                labelerDid,
+                visibility: value,
+            };
+            labelPref.visibility = value;
             let legacyLabelPref;
-            if (labelPref) {
-                labelPref.visibility = value;
-            }
-            else {
-                labelPref = {
-                    $type: 'app.bsky.actor.defs#contentLabelPref',
-                    label: key,
-                    labelerDid,
-                    visibility: value,
-                };
-            }
             if (index_1.AppBskyActorDefs.isContentLabelPref(labelPref)) {
                 // is global
                 if (!labelPref.labelerDid) {
@@ -860,31 +827,28 @@ class Agent extends xrpc_1.XrpcClient {
                         'graphic-media': 'gore',
                         porn: 'nsfw',
                         sexual: 'suggestive',
+                        // Protect against using toString, hasOwnProperty, etc. as a label:
+                        __proto__: null,
                     }[labelPref.label];
                     // if it's a legacy label, double-write the legacy label
                     if (legacyLabelValue) {
-                        legacyLabelPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isContentLabelPref(pref) &&
-                            index_1.AppBskyActorDefs.validateContentLabelPref(pref).success &&
-                            pref.label === legacyLabelValue &&
-                            pref.labelerDid === undefined);
-                        if (legacyLabelPref) {
-                            legacyLabelPref.visibility = value;
-                        }
-                        else {
-                            legacyLabelPref = {
-                                $type: 'app.bsky.actor.defs#contentLabelPref',
-                                label: legacyLabelValue,
-                                labelerDid: undefined,
-                                visibility: value,
-                            };
-                        }
+                        legacyLabelPref = prefs
+                            .filter(index_1.AppBskyActorDefs.isValidContentLabelPref)
+                            .findLast((pref) => pref.label === legacyLabelValue &&
+                            pref.labelerDid === undefined) || {
+                            $type: 'app.bsky.actor.defs#contentLabelPref',
+                            label: legacyLabelValue,
+                            labelerDid: undefined,
+                            visibility: value,
+                        };
+                        legacyLabelPref.visibility = value;
                     }
                 }
             }
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isContentLabelPref(pref) ||
                 !(pref.label === key && pref.labelerDid === labelerDid))
-                .concat([labelPref])
+                .concat(labelPref)
                 .filter((pref) => {
                 if (!legacyLabelPref)
                     return true;
@@ -897,46 +861,30 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async addLabeler(did) {
         const prefs = await this.updatePreferences((prefs) => {
-            let labelersPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isLabelersPref(pref) &&
-                index_1.AppBskyActorDefs.validateLabelersPref(pref).success);
-            if (!labelersPref) {
-                labelersPref = {
-                    $type: 'app.bsky.actor.defs#labelersPref',
-                    labelers: [],
-                };
-            }
-            if (index_1.AppBskyActorDefs.isLabelersPref(labelersPref)) {
-                let labelerPrefItem = labelersPref.labelers.find((labeler) => labeler.did === did);
-                if (!labelerPrefItem) {
-                    labelerPrefItem = {
-                        did,
-                    };
-                    labelersPref.labelers.push(labelerPrefItem);
-                }
+            const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref) || {
+                $type: 'app.bsky.actor.defs#labelersPref',
+                labelers: [],
+            };
+            if (!labelersPref.labelers.some((labeler) => labeler.did === did)) {
+                labelersPref.labelers.push({ did });
             }
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isLabelersPref(pref))
-                .concat([labelersPref]);
+                .concat(labelersPref);
         });
         // automatically configure the client
         this.configureLabelers(prefsArrayToLabelerDids(prefs));
     }
     async removeLabeler(did) {
         const prefs = await this.updatePreferences((prefs) => {
-            let labelersPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isLabelersPref(pref) &&
-                index_1.AppBskyActorDefs.validateLabelersPref(pref).success);
-            if (!labelersPref) {
-                labelersPref = {
-                    $type: 'app.bsky.actor.defs#labelersPref',
-                    labelers: [],
-                };
-            }
-            if (index_1.AppBskyActorDefs.isLabelersPref(labelersPref)) {
-                labelersPref.labelers = labelersPref.labelers.filter((labeler) => labeler.did !== did);
-            }
+            const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref) || {
+                $type: 'app.bsky.actor.defs#labelersPref',
+                labelers: [],
+            };
+            labelersPref.labelers = labelersPref.labelers.filter((labeler) => labeler.did !== did);
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isLabelersPref(pref))
-                .concat([labelersPref]);
+                .concat(labelersPref);
         });
         // automatically configure the client
         this.configureLabelers(prefsArrayToLabelerDids(prefs));
@@ -944,57 +892,53 @@ class Agent extends xrpc_1.XrpcClient {
     async setPersonalDetails({ birthDate, }) {
         birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate;
         await this.updatePreferences((prefs) => {
-            let personalDetailsPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isPersonalDetailsPref(pref) &&
-                index_1.AppBskyActorDefs.validatePersonalDetailsPref(pref).success);
-            if (personalDetailsPref) {
-                personalDetailsPref.birthDate = birthDate;
-            }
-            else {
-                personalDetailsPref = {
-                    $type: 'app.bsky.actor.defs#personalDetailsPref',
-                    birthDate,
-                };
-            }
+            const personalDetailsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidPersonalDetailsPref) || {
+                $type: 'app.bsky.actor.defs#personalDetailsPref',
+                birthDate,
+            };
+            personalDetailsPref.birthDate = birthDate;
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isPersonalDetailsPref(pref))
-                .concat([personalDetailsPref]);
+                .concat(personalDetailsPref);
         });
     }
     async setFeedViewPrefs(feed, pref) {
         await this.updatePreferences((prefs) => {
-            const existing = prefs.findLast((pref) => index_1.AppBskyActorDefs.isFeedViewPref(pref) &&
-                index_1.AppBskyActorDefs.validateFeedViewPref(pref).success &&
-                pref.feed === feed);
-            if (existing) {
-                pref = { ...existing, ...pref };
-            }
+            const existing = prefs
+                .filter(index_1.AppBskyActorDefs.isValidFeedViewPref)
+                .findLast((pref) => pref.feed === feed);
             return prefs
-                .filter((p) => !index_1.AppBskyActorDefs.isFeedViewPref(pref) || p.feed !== feed)
-                .concat([{ ...pref, $type: 'app.bsky.actor.defs#feedViewPref', feed }]);
+                .filter((p) => !index_1.AppBskyActorDefs.isFeedViewPref(p) || p.feed !== feed)
+                .concat({
+                ...existing,
+                ...pref,
+                $type: 'app.bsky.actor.defs#feedViewPref',
+                feed,
+            });
         });
     }
     async setThreadViewPrefs(pref) {
         await this.updatePreferences((prefs) => {
-            const existing = prefs.findLast((pref) => index_1.AppBskyActorDefs.isThreadViewPref(pref) &&
-                index_1.AppBskyActorDefs.validateThreadViewPref(pref).success);
-            if (existing) {
-                pref = { ...existing, ...pref };
-            }
+            const existing = prefs.findLast(index_1.AppBskyActorDefs.isValidThreadViewPref);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isThreadViewPref(p))
-                .concat([{ ...pref, $type: 'app.bsky.actor.defs#threadViewPref' }]);
+                .concat({
+                ...existing,
+                ...pref,
+                $type: 'app.bsky.actor.defs#threadViewPref',
+            });
         });
     }
     async setInterestsPref(pref) {
         await this.updatePreferences((prefs) => {
-            const existing = prefs.findLast((pref) => index_1.AppBskyActorDefs.isInterestsPref(pref) &&
-                index_1.AppBskyActorDefs.validateInterestsPref(pref).success);
-            if (existing) {
-                pref = { ...existing, ...pref };
-            }
+            const existing = prefs.findLast(index_1.AppBskyActorDefs.isValidInterestsPref);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isInterestsPref(p))
-                .concat([{ ...pref, $type: 'app.bsky.actor.defs#interestsPref' }]);
+                .concat({
+                ...existing,
+                ...pref,
+                $type: 'app.bsky.actor.defs#interestsPref',
+            });
         });
     }
     /**
@@ -1005,8 +949,7 @@ class Agent extends xrpc_1.XrpcClient {
         if (!sanitizedValue)
             return;
         await this.updatePreferences((prefs) => {
-            let mutedWordsPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isMutedWordsPref(pref) &&
-                index_1.AppBskyActorDefs.validateMutedWordsPref(pref).success);
+            let mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
             const newMutedWord = {
                 id: common_web_1.TID.nextStr(),
                 value: sanitizedValue,
@@ -1024,14 +967,13 @@ class Agent extends xrpc_1.XrpcClient {
             else {
                 // if the pref doesn't exist, create it
                 mutedWordsPref = {
+                    $type: 'app.bsky.actor.defs#mutedWordsPref',
                     items: [newMutedWord],
                 };
             }
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isMutedWordsPref(p))
-                .concat([
-                { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-            ]);
+                .concat(mutedWordsPref);
         });
     }
     /**
@@ -1051,8 +993,7 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async updateMutedWord(mutedWord) {
         await this.updatePreferences((prefs) => {
-            const mutedWordsPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isMutedWordsPref(pref) &&
-                index_1.AppBskyActorDefs.validateMutedWordsPref(pref).success);
+            const mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
             if (mutedWordsPref && index_1.AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
                 mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
                     const match = matchMutedWord(existingItem, mutedWord);
@@ -1079,9 +1020,10 @@ class Agent extends xrpc_1.XrpcClient {
                 mutedWordsPref.items = migrateLegacyMutedWordsItems(mutedWordsPref.items);
                 return prefs
                     .filter((p) => !index_1.AppBskyActorDefs.isMutedWordsPref(p))
-                    .concat([
-                    { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-                ]);
+                    .concat({
+                    ...mutedWordsPref,
+                    $type: 'app.bsky.actor.defs#mutedWordsPref',
+                });
             }
             return prefs;
         });
@@ -1091,8 +1033,7 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async removeMutedWord(mutedWord) {
         await this.updatePreferences((prefs) => {
-            const mutedWordsPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isMutedWordsPref(pref) &&
-                index_1.AppBskyActorDefs.validateMutedWordsPref(pref).success);
+            const mutedWordsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidMutedWordsPref);
             if (mutedWordsPref && index_1.AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
                 for (let i = 0; i < mutedWordsPref.items.length; i++) {
                     const match = matchMutedWord(mutedWordsPref.items[i], mutedWord);
@@ -1107,9 +1048,10 @@ class Agent extends xrpc_1.XrpcClient {
                 mutedWordsPref.items = migrateLegacyMutedWordsItems(mutedWordsPref.items);
                 return prefs
                     .filter((p) => !index_1.AppBskyActorDefs.isMutedWordsPref(p))
-                    .concat([
-                    { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-                ]);
+                    .concat({
+                    ...mutedWordsPref,
+                    $type: 'app.bsky.actor.defs#mutedWordsPref',
+                });
             }
             return prefs;
         });
@@ -1128,36 +1070,25 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async bskyAppQueueNudges(nudges) {
         await this.updatePreferences((prefs) => {
-            let bskyAppStatePref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success);
-            bskyAppStatePref = bskyAppStatePref || {};
-            nudges = Array.isArray(nudges) ? nudges : [nudges];
+            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+                $type: 'app.bsky.actor.defs#bskyAppStatePref',
+            };
             bskyAppStatePref.queuedNudges = (bskyAppStatePref.queuedNudges || []).concat(nudges);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isBskyAppStatePref(p))
-                .concat([
-                {
-                    ...bskyAppStatePref,
-                    $type: 'app.bsky.actor.defs#bskyAppStatePref',
-                },
-            ]);
+                .concat(bskyAppStatePref);
         });
     }
     async bskyAppDismissNudges(nudges) {
         await this.updatePreferences((prefs) => {
-            let bskyAppStatePref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success);
-            bskyAppStatePref = bskyAppStatePref || {};
+            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+                $type: 'app.bsky.actor.defs#bskyAppStatePref',
+            };
             nudges = Array.isArray(nudges) ? nudges : [nudges];
             bskyAppStatePref.queuedNudges = (bskyAppStatePref.queuedNudges || []).filter((nudge) => !nudges.includes(nudge));
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isBskyAppStatePref(p))
-                .concat([
-                {
-                    ...bskyAppStatePref,
-                    $type: 'app.bsky.actor.defs#bskyAppStatePref',
-                },
-            ]);
+                .concat(bskyAppStatePref);
         });
     }
     async bskyAppSetActiveProgressGuide(guide) {
@@ -1166,18 +1097,13 @@ class Agent extends xrpc_1.XrpcClient {
             throw new Error('Invalid progress guide');
         }
         await this.updatePreferences((prefs) => {
-            let bskyAppStatePref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success);
-            bskyAppStatePref = bskyAppStatePref || {};
+            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+                $type: 'app.bsky.actor.defs#bskyAppStatePref',
+            };
             bskyAppStatePref.activeProgressGuide = guide;
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isBskyAppStatePref(p))
-                .concat([
-                {
-                    ...bskyAppStatePref,
-                    $type: 'app.bsky.actor.defs#bskyAppStatePref',
-                },
-            ]);
+                .concat(bskyAppStatePref);
         });
     }
     /**
@@ -1186,9 +1112,9 @@ class Agent extends xrpc_1.XrpcClient {
     async bskyAppUpsertNux(nux) {
         (0, util_1.validateNux)(nux);
         await this.updatePreferences((prefs) => {
-            let bskyAppStatePref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success);
-            bskyAppStatePref = bskyAppStatePref || {};
+            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+                $type: 'app.bsky.actor.defs#bskyAppStatePref',
+            };
             bskyAppStatePref.nuxs = bskyAppStatePref.nuxs || [];
             const existing = bskyAppStatePref.nuxs?.find((n) => {
                 return n.id === nux.id;
@@ -1211,12 +1137,7 @@ class Agent extends xrpc_1.XrpcClient {
                 .concat(next);
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isBskyAppStatePref(p))
-                .concat([
-                {
-                    ...bskyAppStatePref,
-                    $type: 'app.bsky.actor.defs#bskyAppStatePref',
-                },
-            ]);
+                .concat(bskyAppStatePref);
         });
     }
     /**
@@ -1224,20 +1145,15 @@ class Agent extends xrpc_1.XrpcClient {
      */
     async bskyAppRemoveNuxs(ids) {
         await this.updatePreferences((prefs) => {
-            let bskyAppStatePref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isBskyAppStatePref(pref) &&
-                index_1.AppBskyActorDefs.validateBskyAppStatePref(pref).success);
-            bskyAppStatePref = bskyAppStatePref || {};
+            const bskyAppStatePref = prefs.findLast(index_1.AppBskyActorDefs.isValidBskyAppStatePref) || {
+                $type: 'app.bsky.actor.defs#bskyAppStatePref',
+            };
             bskyAppStatePref.nuxs = (bskyAppStatePref.nuxs || []).filter((nux) => {
                 return !ids.includes(nux.id);
             });
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isBskyAppStatePref(p))
-                .concat([
-                {
-                    ...bskyAppStatePref,
-                    $type: 'app.bsky.actor.defs#bskyAppStatePref',
-                },
-            ]);
+                .concat(bskyAppStatePref);
         });
     }
     /**
@@ -1267,25 +1183,19 @@ class Agent extends xrpc_1.XrpcClient {
     }
     async updateHiddenPost(postUri, action) {
         await this.updatePreferences((prefs) => {
-            let pref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isHiddenPostsPref(pref) &&
-                index_1.AppBskyActorDefs.validateHiddenPostsPref(pref).success);
-            if (pref && index_1.AppBskyActorDefs.isHiddenPostsPref(pref)) {
-                pref.items =
-                    action === 'hide'
-                        ? Array.from(new Set([...pref.items, postUri]))
-                        : pref.items.filter((uri) => uri !== postUri);
-            }
-            else {
-                if (action === 'hide') {
-                    pref = {
-                        $type: 'app.bsky.actor.defs#hiddenPostsPref',
-                        items: [postUri],
-                    };
-                }
-            }
+            const pref = prefs.findLast(index_1.AppBskyActorDefs.isValidHiddenPostsPref) || {
+                $type: 'app.bsky.actor.defs#hiddenPostsPref',
+                items: [],
+            };
+            const hiddenItems = new Set(pref.items);
+            if (action === 'hide')
+                hiddenItems.add(postUri);
+            else
+                hiddenItems.delete(postUri);
+            pref.items = [...hiddenItems];
             return prefs
                 .filter((p) => !index_1.AppBskyActorDefs.isInterestsPref(p))
-                .concat([{ ...pref, $type: 'app.bsky.actor.defs#hiddenPostsPref' }]);
+                .concat(pref);
         });
     }
     /**
@@ -1294,34 +1204,25 @@ class Agent extends xrpc_1.XrpcClient {
     async updateFeedPreferences(cb) {
         let res;
         await this.updatePreferences((prefs) => {
-            let feedsPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isSavedFeedsPref(pref) &&
-                index_1.AppBskyActorDefs.validateSavedFeedsPref(pref).success);
-            if (feedsPref) {
-                res = cb(feedsPref.saved, feedsPref.pinned);
-                feedsPref.saved = res.saved;
-                feedsPref.pinned = res.pinned;
-            }
-            else {
-                res = cb([], []);
-                feedsPref = {
-                    $type: 'app.bsky.actor.defs#savedFeedsPref',
-                    saved: res.saved,
-                    pinned: res.pinned,
-                };
-            }
+            const feedsPref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPref) || {
+                $type: 'app.bsky.actor.defs#savedFeedsPref',
+                saved: [],
+                pinned: [],
+            };
+            res = cb(feedsPref.saved, feedsPref.pinned);
+            feedsPref.saved = res.saved;
+            feedsPref.pinned = res.pinned;
             return prefs
                 .filter((pref) => !index_1.AppBskyActorDefs.isSavedFeedsPref(pref))
-                .concat([feedsPref]);
+                .concat(feedsPref);
         });
         return res;
     }
     async updateSavedFeedsV2Preferences(cb) {
         let maybeMutatedSavedFeeds = [];
         await this.updatePreferences((prefs) => {
-            let existingV2Pref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isSavedFeedsPrefV2(pref) &&
-                index_1.AppBskyActorDefs.validateSavedFeedsPrefV2(pref).success);
-            let existingV1Pref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isSavedFeedsPref(pref) &&
-                index_1.AppBskyActorDefs.validateSavedFeedsPref(pref).success);
+            let existingV2Pref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPrefV2);
+            let existingV1Pref = prefs.findLast(index_1.AppBskyActorDefs.isValidSavedFeedsPref);
             if (existingV2Pref) {
                 maybeMutatedSavedFeeds = cb(existingV2Pref.items);
                 existingV2Pref = {
@@ -1413,8 +1314,7 @@ function remapLegacyLabels(labels) {
  * A helper to get the currently enabled labelers from the full preferences array
  */
 function prefsArrayToLabelerDids(prefs) {
-    const labelersPref = prefs.findLast((pref) => index_1.AppBskyActorDefs.isLabelersPref(pref) &&
-        index_1.AppBskyActorDefs.validateLabelersPref(pref).success);
+    const labelersPref = prefs.findLast(index_1.AppBskyActorDefs.isValidLabelersPref);
     let dids = [];
     if (labelersPref) {
         dids = labelersPref.labelers.map((labeler) => labeler.did);