@atproto/api 0.11.0-next → 0.11.0

package/tests/bsky-agent.test.ts

@@ -3,7 +3,6 @@ import {
   BskyAgent,
   ComAtprotoRepoPutRecord,
   AppBskyActorProfile,
-  BSKY_MODSERVICE_DID,
   DEFAULT_LABEL_SETTINGS,
 } from '..'
 
@@ -34,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 })
 
@@ -224,17 +230,19 @@ describe('agent', () => {
         password: 'password',
       })
 
+      const DEFAULT_LABELERS = BskyAgent.appLabelers.map((did) => ({
+        did,
+        labels: {},
+      }))
+
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: { pinned: undefined, saved: undefined },
         moderationPrefs: {
           adultContentEnabled: false,
           labels: DEFAULT_LABEL_SETTINGS,
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -253,8 +261,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(true)
@@ -263,12 +269,9 @@ describe('agent', () => {
         moderationPrefs: {
           adultContentEnabled: true,
           labels: DEFAULT_LABEL_SETTINGS,
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -287,8 +290,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(false)
@@ -297,12 +298,9 @@ describe('agent', () => {
         moderationPrefs: {
           adultContentEnabled: false,
           labels: DEFAULT_LABEL_SETTINGS,
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -321,8 +319,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setContentLabelPref('misinfo', 'hide')
@@ -331,12 +327,9 @@ describe('agent', () => {
         moderationPrefs: {
           adultContentEnabled: false,
           labels: { ...DEFAULT_LABEL_SETTINGS, misinfo: 'hide' },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -355,8 +348,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setContentLabelPref('spam', 'ignore')
@@ -369,12 +360,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -393,8 +381,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -410,12 +396,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -434,8 +417,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -451,12 +432,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -475,8 +453,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removePinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -492,12 +468,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -516,8 +489,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -533,12 +504,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -557,8 +525,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -574,12 +540,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -598,8 +561,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake2')
@@ -621,12 +582,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -645,8 +603,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -662,12 +618,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: undefined,
         feedViewPrefs: {
@@ -686,8 +639,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -703,12 +654,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -727,8 +675,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: true })
@@ -744,12 +690,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -768,8 +711,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: false })
@@ -785,12 +726,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -809,8 +747,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('other', { hideReplies: true })
@@ -826,12 +762,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -857,8 +790,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setThreadViewPrefs({ sort: 'random' })
@@ -874,12 +805,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -905,8 +833,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setThreadViewPrefs({ sort: 'oldest' })
@@ -922,12 +848,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -953,8 +876,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setInterestsPref({ tags: ['foo', 'bar'] })
@@ -970,12 +891,9 @@ describe('agent', () => {
             misinfo: 'hide',
             spam: 'ignore',
           },
-          mods: [
-            {
-              did: BSKY_MODSERVICE_DID,
-              labels: {},
-            },
-          ],
+          labelers: DEFAULT_LABELERS,
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1001,8 +919,6 @@ describe('agent', () => {
         interests: {
           tags: ['foo', 'bar'],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
     })
 
@@ -1038,18 +954,18 @@ describe('agent', () => {
             visibility: 'warn',
           },
           {
-            $type: 'app.bsky.actor.defs#modsPref',
-            mods: [
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
               {
-                did: BSKY_MODSERVICE_DID,
+                did: 'did:plc:first-labeler',
               },
             ],
           },
           {
-            $type: 'app.bsky.actor.defs#modsPref',
-            mods: [
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
               {
-                did: BSKY_MODSERVICE_DID,
+                did: 'did:plc:first-labeler',
               },
               {
                 did: 'did:plc:other',
@@ -1133,9 +1049,10 @@ describe('agent', () => {
             ...DEFAULT_LABEL_SETTINGS,
             porn: 'warn',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
             {
@@ -1143,6 +1060,8 @@ describe('agent', () => {
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1161,8 +1080,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setAdultContentEnabled(false)
@@ -1177,9 +1094,10 @@ describe('agent', () => {
             ...DEFAULT_LABEL_SETTINGS,
             porn: 'warn',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
             {
@@ -1187,6 +1105,8 @@ describe('agent', () => {
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1205,8 +1125,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setContentLabelPref('porn', 'ignore')
@@ -1219,11 +1137,13 @@ describe('agent', () => {
           adultContentEnabled: false,
           labels: {
             ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
             {
@@ -1231,6 +1151,8 @@ describe('agent', () => {
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1249,11 +1171,9 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
-      await agent.removeModService('did:plc:other')
+      await agent.removeLabeler('did:plc:other')
       await expect(agent.getPreferences()).resolves.toStrictEqual({
         feeds: {
           pinned: [],
@@ -1263,14 +1183,18 @@ describe('agent', () => {
           adultContentEnabled: false,
           labels: {
             ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1289,8 +1213,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -1303,14 +1225,18 @@ describe('agent', () => {
           adultContentEnabled: false,
           labels: {
             ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2021-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1329,8 +1255,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -1343,14 +1267,18 @@ describe('agent', () => {
           adultContentEnabled: false,
           labels: {
             ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1369,8 +1297,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       await agent.setFeedViewPrefs('home', {
@@ -1394,14 +1320,18 @@ describe('agent', () => {
           adultContentEnabled: false,
           labels: {
             ...DEFAULT_LABEL_SETTINGS,
+            nsfw: 'ignore',
             porn: 'ignore',
           },
-          mods: [
+          labelers: [
+            ...BskyAgent.appLabelers.map((did) => ({ did, labels: {} })),
             {
-              did: BSKY_MODSERVICE_DID,
+              did: 'did:plc:first-labeler',
               labels: {},
             },
           ],
+          mutedWords: [],
+          hiddenPosts: [],
         },
         birthDate: new Date('2023-09-11T18:05:42.556Z'),
         feedViewPrefs: {
@@ -1420,8 +1350,6 @@ describe('agent', () => {
         interests: {
           tags: [],
         },
-        mutedWords: [],
-        hiddenPosts: [],
       })
 
       const res = await agent.app.bsky.actor.getPreferences()
@@ -1437,10 +1365,15 @@ describe('agent', () => {
             visibility: 'ignore',
           },
           {
-            $type: 'app.bsky.actor.defs#modsPref',
-            mods: [
+            $type: 'app.bsky.actor.defs#contentLabelPref',
+            label: 'nsfw',
+            visibility: 'ignore',
+          },
+          {
+            $type: 'app.bsky.actor.defs#labelersPref',
+            labelers: [
               {
-                did: BSKY_MODSERVICE_DID,
+                did: 'did:plc:first-labeler',
               },
             ],
           },
@@ -1496,7 +1429,7 @@ describe('agent', () => {
         await agent.upsertMutedWords(mutedWords)
         await agent.upsertMutedWords(mutedWords) // double
         await expect(agent.getPreferences()).resolves.toHaveProperty(
-          'mutedWords',
+          'moderationPrefs.mutedWords',
           mutedWords,
         )
       })
@@ -1508,7 +1441,7 @@ describe('agent', () => {
         // 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
@@ -1531,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'),
@@ -1556,7 +1489,7 @@ describe('agent', () => {
           value: '#just_a_tag',
           targets: ['tag', 'content'],
         })
-        const { mutedWords } = await agent.getPreferences()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
         expect(mutedWords.find((m) => m.value === 'just_a_tag')).toStrictEqual({
           value: 'just_a_tag',
           targets: ['tag'],
@@ -1567,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'),
@@ -1578,17 +1511,17 @@ describe('agent', () => {
 
       it('removeMutedWord with #, no match, no removal', async () => {
         await agent.removeMutedWord({ value: '#hashtag', targets: [] })
-        const { mutedWords } = await agent.getPreferences()
+        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()
+        const prev = (await agent.getPreferences()).moderationPrefs
         const length = prev.mutedWords.length
         await agent.upsertMutedWords([{ value: '#', targets: [] }])
-        const end = await agent.getPreferences()
+        const end = (await agent.getPreferences()).moderationPrefs
 
         // sanitized to empty string, not inserted
         expect(end.mutedWords.length).toEqual(length)
@@ -1596,65 +1529,65 @@ describe('agent', () => {
 
       it('multi-hash ##', async () => {
         await agent.upsertMutedWords([{ value: '##', targets: [] }])
-        const { mutedWords } = await agent.getPreferences()
+        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()
+        const a = (await agent.getPreferences()).moderationPrefs
 
         expect(a.mutedWords.find((w) => w.value === '#hashtag')).toBeTruthy()
 
         await agent.removeMutedWord({ value: '#hashtag', targets: [] })
-        const b = 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()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
         expect(mutedWords.find((m) => m.value === '#️⃣')).toBeTruthy()
 
         await agent.removeMutedWord({ value: '#️⃣', targets: [] })
-        const end = await agent.getPreferences()
+        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()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
         expect(mutedWords.find((m) => m.value === '#️⃣')).toBeTruthy()
 
         await agent.removeMutedWord({ value: '#️⃣', targets: [] })
-        const end = await agent.getPreferences()
+        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()
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
         expect(mutedWords.find((m) => m.value === '##️⃣')).toBeTruthy()
 
         await agent.removeMutedWord({ value: '##️⃣', targets: [] })
-        const end = await agent.getPreferences()
+        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()
+          const prev = (await agent.getPreferences()).moderationPrefs
           const length = prev.mutedWords.length
           await agent.upsertMutedWords([{ value: '#​', targets: [] }])
-          const { mutedWords } = await agent.getPreferences()
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
           expect(mutedWords.length).toEqual(length)
         })
@@ -1663,7 +1596,7 @@ describe('agent', () => {
           await agent.upsertMutedWords([
             { value: 'test value\n with newline', targets: [] },
           ])
-          const { mutedWords } = await agent.getPreferences()
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
           expect(
             mutedWords.find((m) => m.value === 'test value with newline'),
@@ -1674,7 +1607,7 @@ describe('agent', () => {
           await agent.upsertMutedWords([
             { value: 'test value\n\r with newline', targets: [] },
           ])
-          const { mutedWords } = await agent.getPreferences()
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
           expect(
             mutedWords.find((m) => m.value === 'test value with newline'),
@@ -1683,14 +1616,14 @@ describe('agent', () => {
 
         it('empty space', async () => {
           await agent.upsertMutedWords([{ value: ' ', targets: [] }])
-          const { mutedWords } = await agent.getPreferences()
+          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()
+          const { mutedWords } = (await agent.getPreferences()).moderationPrefs
 
           expect(mutedWords.find((m) => m.value === 'trim')).toBeTruthy()
         })
@@ -1714,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],
         )
       })
@@ -1722,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',
           [],
         )
       })