@atproto/bsky 0.0.75 → 0.0.77

package/tests/views/lists.test.ts

@@ -1,22 +1,54 @@
 import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky actor likes feed views', () => {
   let network: TestNetwork
   let agent: AtpAgent
-  let pdsAgent: AtpAgent
   let sc: SeedClient
 
+  let referenceList: string
+  let eve: string
+  let frankie: string
+  let greta: string
+
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_actor_lists',
     })
     agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
+    await sc.createAccount('eve', {
+      handle: 'eve.test',
+      email: 'eve@eve.com',
+      password: 'hunter2',
+    })
+    await sc.createAccount('frankie', {
+      handle: 'frankie.test',
+      email: 'frankie@frankie.com',
+      password: '2hunter2real',
+    })
+    await sc.createAccount('greta', {
+      handle: 'greta.test',
+      email: 'greta@greta.com',
+      password: 'hunter4real',
+    })
+    const newList = await sc.createList(
+      sc.dids.eve,
+      'blah starter pack list!',
+      'reference',
+    )
+    await sc.addToList(sc.dids.eve, sc.dids.eve, newList)
+    await sc.addToList(sc.dids.eve, sc.dids.bob, newList)
+    await sc.addToList(sc.dids.eve, sc.dids.frankie, newList)
+    await sc.block(sc.dids.frankie, sc.dids.eve)
     await network.processAll()
+    referenceList = newList.uriStr
+    eve = sc.dids.eve
+    frankie = sc.dids.frankie
+    greta = sc.dids.greta
   })
 
   afterAll(async () => {
@@ -24,39 +56,49 @@ describe('bsky actor likes feed views', () => {
   })
 
   it('does not include reference lists in getActorLists', async () => {
-    await pdsAgent.api.app.bsky.graph.list.create(
-      {
-        repo: sc.dids.alice,
-      },
-      {
-        name: 'awesome starter pack list!',
-        description: '',
-        descriptionFacets: [],
-        avatar: undefined,
-        createdAt: new Date().toISOString(),
-        purpose: 'app.bsky.graph.defs#referencelist',
-      },
-      sc.getHeaders(sc.dids.alice),
-    )
-    await pdsAgent.api.app.bsky.graph.list.create(
-      {
-        repo: sc.dids.alice,
-      },
-      {
-        name: 'cool curate list!',
-        description: '',
-        descriptionFacets: [],
-        avatar: undefined,
-        createdAt: new Date().toISOString(),
-        purpose: 'app.bsky.graph.defs#curatelist',
-      },
-      sc.getHeaders(sc.dids.alice),
-    )
+    await sc.createList(eve, 'cool curate list', 'curate')
     await network.processAll()
     const view = await agent.api.app.bsky.graph.getLists({
-      actor: sc.dids.alice,
+      actor: eve,
     })
     expect(view.data.lists.length).toBe(1)
     expect(forSnapshot(view.data.lists)).toMatchSnapshot()
   })
+
+  it('does not include users with creator block relationship in reference lists for non-creator, in-list viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getList(
+      { list: referenceList },
+      {
+        headers: await network.serviceHeaders(frankie, ids.AppBskyGraphGetList),
+      },
+    )
+    expect(view.data.items.length).toBe(2)
+    expect(forSnapshot(view.data.items)).toMatchSnapshot()
+  })
+
+  it('does not include users with creator block relationship in reference lists for non-creator, not-in-list viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getList(
+      { list: referenceList },
+      { headers: await network.serviceHeaders(greta, ids.AppBskyGraphGetList) },
+    )
+    expect(view.data.items.length).toBe(2)
+    expect(forSnapshot(view.data.items)).toMatchSnapshot()
+  })
+
+  it('does not include users with creator block relationship in reference lists for signed-out viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getList({
+      list: referenceList,
+    })
+    expect(view.data.items.length).toBe(2)
+    expect(forSnapshot(view.data.items)).toMatchSnapshot()
+  })
+
+  it('does include users with creator block relationship in reference lists for creator', async () => {
+    const view = await agent.api.app.bsky.graph.getList(
+      { list: referenceList },
+      { headers: await network.serviceHeaders(eve, ids.AppBskyGraphGetList) },
+    )
+    expect(view.data.items.length).toBe(3)
+    expect(forSnapshot(view.data.items)).toMatchSnapshot()
+  })
 })

package/tests/views/mute-lists.test.ts

@@ -1,6 +1,7 @@
 import { AtpAgent, AtUri } from '@atproto/api'
 import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky views with mutes from mute lists', () => {
   let network: TestNetwork
@@ -98,7 +99,10 @@ describe('bsky views with mutes from mute lists', () => {
       },
       {
         encoding: 'application/json',
-        headers: await network.serviceHeaders(dan),
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphMuteActorList,
+        ),
       },
     )
   })
@@ -106,7 +110,12 @@ describe('bsky views with mutes from mute lists', () => {
   it('flags mutes in threads', async () => {
     const res = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[alice][1].ref.uriStr },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(res.data.thread)).toMatchSnapshot()
   })
@@ -117,7 +126,12 @@ describe('bsky views with mutes from mute lists', () => {
 
     const res = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -127,7 +141,9 @@ describe('bsky views with mutes from mute lists', () => {
   it('removes content from muted users on getTimeline', async () => {
     const res = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -141,7 +157,12 @@ describe('bsky views with mutes from mute lists', () => {
     await sc.addToList(alice, dan, listRef)
     const res = await agent.api.app.bsky.feed.getListFeed(
       { list: listRef.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetListFeed,
+        ),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -151,7 +172,9 @@ describe('bsky views with mutes from mute lists', () => {
   it('returns mute status on getProfile', async () => {
     const res = await agent.api.app.bsky.actor.getProfile(
       { actor: carol },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyActorGetProfile),
+      },
     )
     expect(res.data.viewer?.muted).toBe(true)
     expect(res.data.viewer?.mutedByList?.uri).toBe(listUri)
@@ -160,7 +183,9 @@ describe('bsky views with mutes from mute lists', () => {
   it('returns mute status on getProfiles', async () => {
     const res = await agent.api.app.bsky.actor.getProfiles(
       { actors: [alice, carol] },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyActorGetProfiles),
+      },
     )
     expect(res.data.profiles[0].viewer?.muted).toBe(false)
     expect(res.data.profiles[0].viewer?.mutedByList).toBeUndefined()
@@ -171,7 +196,9 @@ describe('bsky views with mutes from mute lists', () => {
   it('ignores self-mutes', async () => {
     const res = await agent.api.app.bsky.actor.getProfile(
       { actor: dan }, // dan subscribes to list that contains himself
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyActorGetProfile),
+      },
     )
     expect(res.data.viewer?.muted).toBe(false)
     expect(res.data.viewer?.mutedByList).toBeUndefined()
@@ -182,7 +209,12 @@ describe('bsky views with mutes from mute lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(
       res.data.notifications.some((notif) =>
@@ -200,7 +232,12 @@ describe('bsky views with mutes from mute lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     for (const actor of res.data.actors) {
       if ([bob, carol].includes(actor.did)) {
@@ -216,7 +253,7 @@ describe('bsky views with mutes from mute lists', () => {
   it('returns the contents of a list', async () => {
     const res = await agent.api.app.bsky.graph.getList(
       { list: listUri },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetList) },
     )
     expect(forSnapshot(res.data)).toMatchSnapshot()
   })
@@ -224,15 +261,15 @@ describe('bsky views with mutes from mute lists', () => {
   it('paginates getList', async () => {
     const full = await agent.api.app.bsky.graph.getList(
       { list: listUri },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetList) },
     )
     const first = await agent.api.app.bsky.graph.getList(
       { list: listUri, limit: 1 },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetList) },
     )
     const second = await agent.api.app.bsky.graph.getList(
       { list: listUri, cursor: first.data.cursor },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetList) },
     )
     const combined = [...first.data.items, ...second.data.items]
     expect(combined).toEqual(full.data.items)
@@ -257,7 +294,7 @@ describe('bsky views with mutes from mute lists', () => {
 
     const res = await agent.api.app.bsky.graph.getLists(
       { actor: alice },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetLists) },
     )
     expect(forSnapshot(res.data)).toMatchSnapshot()
   })
@@ -265,15 +302,15 @@ describe('bsky views with mutes from mute lists', () => {
   it('paginates getLists', async () => {
     const full = await agent.api.app.bsky.graph.getLists(
       { actor: alice },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetLists) },
     )
     const first = await agent.api.app.bsky.graph.getLists(
       { actor: alice, limit: 1 },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetLists) },
     )
     const second = await agent.api.app.bsky.graph.getLists(
       { actor: alice, cursor: first.data.cursor },
-      { headers: await network.serviceHeaders(dan) },
+      { headers: await network.serviceHeaders(dan, ids.AppBskyGraphGetLists) },
     )
     const combined = [...first.data.lists, ...second.data.lists]
     expect(combined).toEqual(full.data.lists)
@@ -286,13 +323,21 @@ describe('bsky views with mutes from mute lists', () => {
       },
       {
         encoding: 'application/json',
-        headers: await network.serviceHeaders(dan),
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphMuteActorList,
+        ),
       },
     )
 
     const res = await agent.api.app.bsky.graph.getListMutes(
       {},
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListMutes,
+        ),
+      },
     )
     expect(forSnapshot(res.data)).toMatchSnapshot()
   })
@@ -300,15 +345,30 @@ describe('bsky views with mutes from mute lists', () => {
   it('paginates getListMutes', async () => {
     const full = await agent.api.app.bsky.graph.getListMutes(
       {},
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListMutes,
+        ),
+      },
     )
     const first = await agent.api.app.bsky.graph.getListMutes(
       { limit: 1 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListMutes,
+        ),
+      },
     )
     const second = await agent.api.app.bsky.graph.getListMutes(
       { cursor: first.data.cursor },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListMutes,
+        ),
+      },
     )
     const combined = [...first.data.lists, ...second.data.lists]
     expect(combined).toEqual(full.data.lists)
@@ -321,13 +381,21 @@ describe('bsky views with mutes from mute lists', () => {
       },
       {
         encoding: 'application/json',
-        headers: await network.serviceHeaders(dan),
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphUnmuteActorList,
+        ),
       },
     )
 
     const res = await agent.api.app.bsky.graph.getListMutes(
       {},
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListMutes,
+        ),
+      },
     )
     expect(res.data.lists.length).toBe(1)
   })
@@ -353,7 +421,7 @@ describe('bsky views with mutes from mute lists', () => {
 
     const got = await agent.api.app.bsky.graph.getList(
       { list: listUri },
-      { headers: await network.serviceHeaders(alice) },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyGraphGetList) },
     )
     expect(got.data.list.name).toBe('updated alice mutes')
     expect(got.data.list.description).toBe('new descript')
@@ -372,7 +440,7 @@ describe('bsky views with mutes from mute lists', () => {
     await network.processAll()
     const res = await agent.api.app.bsky.feed.getPosts(
       { uris: [postRef.ref.uriStr] },
-      { headers: await network.serviceHeaders(alice) },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetPosts) },
     )
     expect(res.data.posts.length).toBe(1)
     expect(forSnapshot(res.data.posts[0])).toMatchSnapshot()
@@ -397,7 +465,9 @@ describe('bsky views with mutes from mute lists', () => {
 
     const res = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -417,7 +487,9 @@ describe('bsky views with mutes from mute lists', () => {
 
     const res = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),

package/tests/views/mutes.test.ts

@@ -6,6 +6,7 @@ import {
   usersBulkSeed,
 } from '@atproto/dev-env'
 import { forSnapshot, paginateAll } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('mute views', () => {
   let network: TestNetwork
@@ -45,7 +46,10 @@ describe('mute views', () => {
       await agent.api.app.bsky.graph.muteActor(
         { actor: did },
         {
-          headers: await network.serviceHeaders(alice),
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyGraphMuteActor,
+          ),
           encoding: 'application/json',
         },
       )
@@ -59,7 +63,12 @@ describe('mute views', () => {
   it('flags mutes in threads', async () => {
     const res = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[alice][1].ref.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(res.data.thread)).toMatchSnapshot()
   })
@@ -71,7 +80,12 @@ describe('mute views', () => {
 
     const res = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: dan },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -81,7 +95,12 @@ describe('mute views', () => {
   it('removes content from muted users on getTimeline', async () => {
     const res = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetTimeline,
+        ),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -95,7 +114,12 @@ describe('mute views', () => {
     await sc.addToList(alice, dan, listRef)
     const res = await agent.api.app.bsky.feed.getListFeed(
       { list: listRef.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetListFeed,
+        ),
+      },
     )
     expect(
       res.data.feed.some((post) => [bob, carol].includes(post.post.author.did)),
@@ -105,7 +129,12 @@ describe('mute views', () => {
   it('returns mute status on getProfile', async () => {
     const res = await agent.api.app.bsky.actor.getProfile(
       { actor: bob },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
     )
     expect(res.data.viewer?.muted).toBe(true)
   })
@@ -113,7 +142,12 @@ describe('mute views', () => {
   it('returns mute status on getProfiles', async () => {
     const res = await agent.api.app.bsky.actor.getProfiles(
       { actors: [bob, carol, dan] },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyActorGetProfiles,
+        ),
+      },
     )
     expect(res.data.profiles[0].viewer?.muted).toBe(true)
     expect(res.data.profiles[1].viewer?.muted).toBe(true)
@@ -125,7 +159,12 @@ describe('mute views', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(
       res.data.notifications.some((notif) =>
@@ -145,7 +184,12 @@ describe('mute views', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     for (const actor of res.data.actors) {
       if (mutes.includes(actor.did) || mutes.includes(actor.handle)) {
@@ -159,7 +203,9 @@ describe('mute views', () => {
   it('fetches mutes for the logged-in user.', async () => {
     const { data: view } = await agent.api.app.bsky.graph.getMutes(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphGetMutes),
+      },
     )
     expect(forSnapshot(view.mutes)).toMatchSnapshot()
   })
@@ -169,7 +215,12 @@ describe('mute views', () => {
     const paginator = async (cursor?: string) => {
       const { data: view } = await agent.api.app.bsky.graph.getMutes(
         { cursor, limit: 2 },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyGraphGetMutes,
+          ),
+        },
       )
       return view
     }
@@ -181,7 +232,9 @@ describe('mute views', () => {
 
     const full = await agent.api.app.bsky.graph.getMutes(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphGetMutes),
+      },
     )
 
     expect(full.data.mutes.length).toEqual(8)
@@ -191,7 +244,9 @@ describe('mute views', () => {
   it('removes mute.', async () => {
     const { data: initial } = await agent.api.app.bsky.graph.getMutes(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphGetMutes),
+      },
     )
     expect(initial.mutes.length).toEqual(8)
     expect(initial.mutes.map((m) => m.handle)).toContain('elta48.test')
@@ -199,14 +254,19 @@ describe('mute views', () => {
     await agent.api.app.bsky.graph.unmuteActor(
       { actor: sc.dids['elta48.test'] },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyGraphUnmuteActor,
+        ),
         encoding: 'application/json',
       },
     )
 
     const { data: final } = await agent.api.app.bsky.graph.getMutes(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphGetMutes),
+      },
     )
     expect(final.mutes.length).toEqual(7)
     expect(final.mutes.map((m) => m.handle)).not.toContain('elta48.test')
@@ -214,7 +274,7 @@ describe('mute views', () => {
     await agent.api.app.bsky.graph.muteActor(
       { actor: sc.dids['elta48.test'] },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphMuteActor),
         encoding: 'application/json',
       },
     )
@@ -224,7 +284,7 @@ describe('mute views', () => {
     const promise = agent.api.app.bsky.graph.muteActor(
       { actor: alice },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(alice, ids.AppBskyGraphMuteActor),
         encoding: 'application/json',
       },
     )