@atproto/api 0.11.0-next.0 → 0.11.0

package/tests/bsky-agent.test.ts

@@ -1,5 +1,10 @@
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-import { BskyAgent, ComAtprotoRepoPutRecord, AppBskyActorProfile } from '..'
+import {
+  BskyAgent,
+  ComAtprotoRepoPutRecord,
+  AppBskyActorProfile,
+  DEFAULT_LABEL_SETTINGS,
+} from '..'
 
 describe('agent', () => {
   let network: TestNetworkNoAppView
@@ -28,6 +33,13 @@ describe('agent', () => {
     }
   }
 
+  it('clones correctly', () => {
+    const agent = new BskyAgent({ service: network.pds.url })
+    const agent2 = agent.clone()
+    expect(agent2 instanceof BskyAgent).toBeTruthy()
+    expect(agent.service).toEqual(agent2.service)
+  })
+
   it('upsertProfile correctly creates and updates profiles.', async () => {
     const agent = new BskyAgent({ service: network.pds.url })
 
@@ -218,15 +230,25 @@ describe('agent', () => {
         password: 'password',
       })
 
+      const DEFAULT_LABELERS = BskyAgent.appLabelers.map((did) => ({
+        did,
+        labels: {},
+      }))
+
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
-        adultContentEnabled: false,
-        contentLabels: {},
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: DEFAULT_LABEL_SETTINGS,
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
+        },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -239,20 +261,23 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(true)
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
-        adultContentEnabled: true,
-        contentLabels: {},
+        moderationPrefs: {
+          adultContentEnabled: true,
+          labels: DEFAULT_LABEL_SETTINGS,
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
+        },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -265,20 +290,23 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(false)
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
-        adultContentEnabled: false,
-        contentLabels: {},
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: DEFAULT_LABEL_SETTINGS,
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
+        },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -291,22 +319,23 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
-      await agent.setContentLabelPref('impersonation', 'warn')
+      await agent.setContentLabelPref('misinfo', 'hide')
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'warn',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: { ...DEFAULT_LABEL_SETTINGS, misinfo: 'hide' },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -319,24 +348,27 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
-      await agent.setContentLabelPref('spam', 'show') // will convert to 'ignore'
-      await agent.setContentLabelPref('impersonation', 'hide')
+      await agent.setContentLabelPref('spam', 'ignore')
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -349,8 +381,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -359,16 +389,22 @@ describe('agent', () => {
           pinned: [],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -381,8 +417,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -391,16 +425,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -413,8 +453,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removePinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -423,16 +461,22 @@ describe('agent', () => {
           pinned: [],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -445,8 +489,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -455,16 +497,22 @@ describe('agent', () => {
           pinned: [],
           saved: [],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -477,8 +525,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -487,16 +533,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -509,8 +561,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake2')
@@ -525,16 +575,22 @@ describe('agent', () => {
             'at://bob.com/app.bsky.feed.generator/fake2',
           ],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -547,8 +603,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -557,16 +611,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -579,8 +639,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -589,16 +647,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -611,8 +675,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: true })
@@ -621,16 +683,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -643,8 +711,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: false })
@@ -653,16 +719,22 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -675,8 +747,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('other', { hideReplies: true })
@@ -685,23 +755,29 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
           },
           other: {
             hideReplies: true,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -714,8 +790,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setThreadViewPrefs({ sort: 'random' })
@@ -724,23 +798,29 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
           },
           other: {
             hideReplies: true,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -753,8 +833,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setThreadViewPrefs({ sort: 'oldest' })
@@ -763,23 +841,29 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
           },
           other: {
             hideReplies: true,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -792,8 +876,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setInterestsPref({ tags: ['foo', 'bar'] })
@@ -802,23 +884,29 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake2'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake2'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          impersonation: 'hide',
-          spam: 'ignore',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            misinfo: 'hide',
+            spam: 'ignore',
+          },
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
           },
           other: {
             hideReplies: true,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -831,8 +919,6 @@ describe('agent', () => {
         interests: {
           tags: ['foo', 'bar'],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
     })
 
@@ -849,24 +935,43 @@ describe('agent', () => {
         preferences: [
           {
             $type: 'app.bsky.actor.defs#contentLabelPref',
-            label: 'nsfw',
+            label: 'porn',
             visibility: 'show',
           },
           {
             $type: 'app.bsky.actor.defs#contentLabelPref',
-            label: 'nsfw',
+            label: 'porn',
             visibility: 'hide',
           },
           {
             $type: 'app.bsky.actor.defs#contentLabelPref',
-            label: 'nsfw',
+            label: 'porn',
             visibility: 'show',
           },
           {
             $type: 'app.bsky.actor.defs#contentLabelPref',
-            label: 'nsfw',
+            label: 'porn',
             visibility: 'warn',
           },
+          {
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
+              {
+                did: 'did:plc:first-labeler',
+              },
+            ],
+          },
+          {
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
+              {
+                did: 'did:plc:first-labeler',
+              },
+              {
+                did: 'did:plc:other',
+              },
+            ],
+          },
           {
             $type: 'app.bsky.actor.defs#adultContentPref',
             enabled: true,
@@ -907,7 +1012,7 @@ describe('agent', () => {
             $type: 'app.bsky.actor.defs#feedViewPref',
             feed: 'home',
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -916,7 +1021,7 @@ describe('agent', () => {
             $type: 'app.bsky.actor.defs#feedViewPref',
             feed: 'home',
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -938,15 +1043,31 @@ describe('agent', () => {
           pinned: [],
           saved: [],
         },
-        adultContentEnabled: true,
-        contentLabels: {
-          nsfw: 'warn',
+        moderationPrefs: {
+          adultContentEnabled: true,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            porn: 'warn',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+            {
+              did: 'did:plc:other',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -959,8 +1080,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(false)
@@ -969,15 +1088,31 @@ describe('agent', () => {
           pinned: [],
           saved: [],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          nsfw: 'warn',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            porn: 'warn',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+            {
+              did: 'did:plc:other',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -990,25 +1125,82 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
-      await agent.setContentLabelPref('nsfw', 'hide')
+      await agent.setContentLabelPref('porn', 'ignore')
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: {
           pinned: [],
           saved: [],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          nsfw: 'hide',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
+            porn: 'ignore',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+            {
+              did: 'did:plc:other',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
+            hideRepliesByLikeCount: 10,
+            hideReposts: true,
+            hideQuotePosts: true,
+          },
+        },
+        threadViewPrefs: {
+          sort: 'newest',
+          prioritizeFollowedUsers: false,
+        },
+        interests: {
+          tags: [],
+        },
+      })
+
+      await agent.removeLabeler('did:plc:other')
+      await expect(agent.getPreferences()).resolves.toStrictEqual({
+        feeds: {
+          pinned: [],
+          saved: [],
+        },
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
+            porn: 'ignore',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
+        },
+        birthDate: new Date('2021-09-11T18:05:42.556Z'),
+        feedViewPrefs: {
+          home: {
+            hideReplies: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -1021,8 +1213,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -1031,15 +1221,28 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          nsfw: 'hide',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
+            porn: 'ignore',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -1052,8 +1255,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -1062,15 +1263,28 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          nsfw: 'hide',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
+            porn: 'ignore',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: true,
-            hideRepliesByUnfollowed: true,
+            hideRepliesByUnfollowed: false,
             hideRepliesByLikeCount: 10,
             hideReposts: true,
             hideQuotePosts: true,
@@ -1083,13 +1297,11 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', {
         hideReplies: false,
-        hideRepliesByUnfollowed: false,
+        hideRepliesByUnfollowed: true,
         hideRepliesByLikeCount: 0,
         hideReposts: false,
         hideQuotePosts: false,
@@ -1104,15 +1316,28 @@ describe('agent', () => {
           pinned: ['at://bob.com/app.bsky.feed.generator/fake'],
           saved: ['at://bob.com/app.bsky.feed.generator/fake'],
         },
-        adultContentEnabled: false,
-        contentLabels: {
-          nsfw: 'hide',
+        moderationPrefs: {
+          adultContentEnabled: false,
+          labels: {
+            ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
+            porn: 'ignore',
+          },
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
+            {
+              did: 'did:plc:first-labeler',
+              labels: {},
+            },
+          ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
           home: {
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -1125,8 +1350,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       const res = await agent.app.bsky.actor.getPreferences()
@@ -1136,10 +1359,23 @@ describe('agent', () => {
             $type: 'app.bsky.actor.defs#adultContentPref',
             enabled: false,
           },
+          {
+            $type: 'app.bsky.actor.defs#contentLabelPref',
+            label: 'porn',
+            visibility: 'ignore',
+          },
           {
             $type: 'app.bsky.actor.defs#contentLabelPref',
             label: 'nsfw',
-            visibility: 'hide',
+            visibility: 'ignore',
+          },
+          {
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
+              {
+                did: 'did:plc:first-labeler',
+              },
+            ],
           },
           {
             $type: 'app.bsky.actor.defs#savedFeedsPref',
@@ -1155,7 +1391,7 @@ describe('agent', () => {
             $type: 'app.bsky.actor.defs#feedViewPref',
             feed: 'home',
             hideReplies: false,
-            hideRepliesByUnfollowed: false,
+            hideRepliesByUnfollowed: true,
             hideRepliesByLikeCount: 0,
             hideReposts: false,
             hideQuotePosts: false,
@@ -1193,7 +1429,7 @@ describe('agent', () => {
         await agent.upsertMutedWords(mutedWords)
         await agent.upsertMutedWords(mutedWords) // double
         await expect(agent.getPreferences()).resolves.toHaveProperty(
-          'mutedWords',
+          'moderationPrefs.mutedWords',
           mutedWords,
         )
       })
@@ -1202,13 +1438,18 @@ describe('agent', () => {
         await agent.upsertMutedWords([
           { value: 'hashtag', targets: ['content'] },
         ])
+        // is sanitized to `hashtag`
         await agent.upsertMutedWords([{ value: '#hashtag', targets: ['tag'] }])
-        const { mutedWords } = await agent.getPreferences()
+
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
         expect(mutedWords.find((m) => m.value === '#hashtag')).toBeFalsy()
+        // merged with existing
         expect(mutedWords.find((m) => m.value === 'hashtag')).toStrictEqual({
           value: 'hashtag',
           targets: ['content', 'tag'],
         })
+        // only one added
         expect(mutedWords.filter((m) => m.value === 'hashtag').length).toBe(1)
       })
 
@@ -1223,7 +1464,7 @@ describe('agent', () => {
         })
         await agent.updateMutedWord({ value: 'tag_then_none', targets: [] })
         await agent.updateMutedWord({ value: 'no_exist', targets: ['tag'] })
-        const { mutedWords } = await agent.getPreferences()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
         expect(
           mutedWords.find((m) => m.value === 'tag_then_content'),
@@ -1237,15 +1478,21 @@ describe('agent', () => {
         expect(mutedWords.find((m) => m.value === 'no_exist')).toBeFalsy()
       })
 
-      it('updateMutedWord with #', async () => {
+      it('updateMutedWord with #, does not update', async () => {
+        await agent.upsertMutedWords([
+          {
+            value: '#just_a_tag',
+            targets: ['tag'],
+          },
+        ])
         await agent.updateMutedWord({
-          value: 'hashtag',
+          value: '#just_a_tag',
           targets: ['tag', 'content'],
         })
-        const { mutedWords } = await agent.getPreferences()
-        expect(mutedWords.find((m) => m.value === 'hashtag')).toStrictEqual({
-          value: 'hashtag',
-          targets: ['tag', 'content'],
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+        expect(mutedWords.find((m) => m.value === 'just_a_tag')).toStrictEqual({
+          value: 'just_a_tag',
+          targets: ['tag'],
         })
       })
 
@@ -1253,7 +1500,7 @@ describe('agent', () => {
         await agent.removeMutedWord({ value: 'tag_then_content', targets: [] })
         await agent.removeMutedWord({ value: 'tag_then_both', targets: [] })
         await agent.removeMutedWord({ value: 'tag_then_none', targets: [] })
-        const { mutedWords } = await agent.getPreferences()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
         expect(
           mutedWords.find((m) => m.value === 'tag_then_content'),
@@ -1262,11 +1509,124 @@ describe('agent', () => {
         expect(mutedWords.find((m) => m.value === 'tag_then_none')).toBeFalsy()
       })
 
-      it('removeMutedWord with #', async () => {
+      it('removeMutedWord with #, no match, no removal', async () => {
+        await agent.removeMutedWord({ value: '#hashtag', targets: [] })
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        // was inserted with #hashtag, but we don't sanitize on remove
+        expect(mutedWords.find((m) => m.value === 'hashtag')).toBeTruthy()
+      })
+
+      it('single-hash #', async () => {
+        const prev = (await agent.getPreferences()).moderationPrefs
+        const length = prev.mutedWords.length
+        await agent.upsertMutedWords([{ value: '#', targets: [] }])
+        const end = (await agent.getPreferences()).moderationPrefs
+
+        // sanitized to empty string, not inserted
+        expect(end.mutedWords.length).toEqual(length)
+      })
+
+      it('multi-hash ##', async () => {
+        await agent.upsertMutedWords([{ value: '##', targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === '#')).toBeTruthy()
+      })
+
+      it('multi-hash ##hashtag', async () => {
+        await agent.upsertMutedWords([{ value: '##hashtag', targets: [] }])
+        const a = (await agent.getPreferences()).moderationPrefs
+
+        expect(a.mutedWords.find((w) => w.value === '#hashtag')).toBeTruthy()
+
         await agent.removeMutedWord({ value: '#hashtag', targets: [] })
-        const { mutedWords } = await agent.getPreferences()
+        const b = (await agent.getPreferences()).moderationPrefs
+
+        expect(b.mutedWords.find((w) => w.value === '#hashtag')).toBeFalsy()
+      })
+
+      it('hash emoji #️⃣', async () => {
+        await agent.upsertMutedWords([{ value: '#️⃣', targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === '#️⃣')).toBeTruthy()
+
+        await agent.removeMutedWord({ value: '#️⃣', targets: [] })
+        const end = (await agent.getPreferences()).moderationPrefs
+
+        expect(end.mutedWords.find((m) => m.value === '#️⃣')).toBeFalsy()
+      })
 
-        expect(mutedWords.find((m) => m.value === 'hashtag')).toBeFalsy()
+      it('hash emoji ##️⃣', async () => {
+        await agent.upsertMutedWords([{ value: '##️⃣', targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === '#️⃣')).toBeTruthy()
+
+        await agent.removeMutedWord({ value: '#️⃣', targets: [] })
+        const end = (await agent.getPreferences()).moderationPrefs
+
+        expect(end.mutedWords.find((m) => m.value === '#️⃣')).toBeFalsy()
+      })
+
+      it('hash emoji ###️⃣', async () => {
+        await agent.upsertMutedWords([{ value: '###️⃣', targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === '##️⃣')).toBeTruthy()
+
+        await agent.removeMutedWord({ value: '##️⃣', targets: [] })
+        const end = (await agent.getPreferences()).moderationPrefs
+
+        expect(end.mutedWords.find((m) => m.value === '##️⃣')).toBeFalsy()
+      })
+
+      describe(`invalid characters`, () => {
+        it('zero width space', async () => {
+          const prev = (await agent.getPreferences()).moderationPrefs
+          const length = prev.mutedWords.length
+          await agent.upsertMutedWords([{ value: '#​', targets: [] }])
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+          expect(mutedWords.length).toEqual(length)
+        })
+
+        it('newline', async () => {
+          await agent.upsertMutedWords([
+            { value: 'test value\n with newline', targets: [] },
+          ])
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+          expect(
+            mutedWords.find((m) => m.value === 'test value with newline'),
+          ).toBeTruthy()
+        })
+
+        it('newline(s)', async () => {
+          await agent.upsertMutedWords([
+            { value: 'test value\n\r with newline', targets: [] },
+          ])
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+          expect(
+            mutedWords.find((m) => m.value === 'test value with newline'),
+          ).toBeTruthy()
+        })
+
+        it('empty space', async () => {
+          await agent.upsertMutedWords([{ value: ' ', targets: [] }])
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+          expect(mutedWords.find((m) => m.value === ' ')).toBeFalsy()
+        })
+
+        it('leading/trailing space', async () => {
+          await agent.upsertMutedWords([{ value: ' trim ', targets: [] }])
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+          expect(mutedWords.find((m) => m.value === 'trim')).toBeTruthy()
+        })
       })
     })
 
@@ -1287,7 +1647,7 @@ describe('agent', () => {
         await agent.hidePost(postUri)
         await agent.hidePost(postUri) // double, should dedupe
         await expect(agent.getPreferences()).resolves.toHaveProperty(
-          'hiddenPosts',
+          'moderationPrefs.hiddenPosts',
           [postUri],
         )
       })
@@ -1295,13 +1655,13 @@ describe('agent', () => {
       it('unhidePost', async () => {
         await agent.unhidePost(postUri)
         await expect(agent.getPreferences()).resolves.toHaveProperty(
-          'hiddenPosts',
+          'moderationPrefs.hiddenPosts',
           [],
         )
         // no issues calling a second time
         await agent.unhidePost(postUri)
         await expect(agent.getPreferences()).resolves.toHaveProperty(
-          'hiddenPosts',
+          'moderationPrefs.hiddenPosts',
           [],
         )
       })