@atproto/bsky 0.0.75 → 0.0.77

package/tests/views/starter-packs.test.ts

@@ -1,8 +1,9 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed, RecordRef } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
 import { isRecord as isProfile } from '../../src/lexicon/types/app/bsky/actor/profile'
 import { forSnapshot } from '../_util'
 import assert from 'assert'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('starter packs', () => {
   let network: TestNetwork
@@ -10,6 +11,7 @@ describe('starter packs', () => {
   let sc: SeedClient
   let sp1: RecordRef
   let sp2: RecordRef
+  let sp3: RecordRef
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -47,6 +49,25 @@ describe('starter packs', () => {
       })
       await sc.createProfile(did, `Newskie ${n}`, 'New here', [], sp1)
     }
+
+    await sc.createAccount('frankie', {
+      handle: 'frankie.test',
+      email: 'frankie@frankie.com',
+      password: 'password',
+    })
+    await sc.createAccount('greta', {
+      handle: 'greta.test',
+      email: 'greta@greta.com',
+      password: 'password',
+    })
+    sp3 = await sc.createStarterPack(
+      sc.dids.alice,
+      "alice's about to get blocked starter pack",
+      [sc.dids.alice, sc.dids.frankie, sc.dids.greta],
+      [],
+    )
+    await sc.block(sc.dids.frankie, sc.dids.alice)
+
     await network.processAll()
   })
 
@@ -58,7 +79,7 @@ describe('starter packs', () => {
     const { data } = await agent.api.app.bsky.graph.getActorStarterPacks({
       actor: sc.dids.alice,
     })
-    expect(data.starterPacks).toHaveLength(2)
+    expect(data.starterPacks).toHaveLength(3)
     expect(forSnapshot(data.starterPacks)).toMatchSnapshot()
   })
 
@@ -106,7 +127,12 @@ describe('starter packs', () => {
       data: { notifications },
     } = await agent.api.app.bsky.notification.listNotifications(
       { limit: 3 }, // three most recent
-      { headers: await network.serviceHeaders(sc.dids.alice) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(notifications).toHaveLength(3)
     notifications.forEach((notif) => {
@@ -118,4 +144,58 @@ describe('starter packs', () => {
     })
     expect(forSnapshot(notifications)).toMatchSnapshot()
   })
+
+  it('does not include users with creator block relationship in list sample for non-creator, in-list viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getStarterPack(
+      {
+        starterPack: sp3.uriStr,
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.frankie,
+          ids.AppBskyGraphGetStarterPack,
+        ),
+      },
+    )
+    expect(view.data.starterPack.listItemsSample?.length).toBe(2)
+    expect(forSnapshot(view.data.starterPack.listItemsSample)).toMatchSnapshot()
+  })
+
+  it('does not include users with creator block relationship in list sample for non-creator, not-in-list viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getStarterPack(
+      {
+        starterPack: sp3.uriStr,
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyGraphGetStarterPack,
+        ),
+      },
+    )
+    expect(view.data.starterPack.listItemsSample?.length).toBe(2)
+    expect(forSnapshot(view.data.starterPack.listItemsSample)).toMatchSnapshot()
+  })
+
+  it('does not include users with creator block relationship in list sample for signed-out viewers', async () => {
+    const view = await agent.api.app.bsky.graph.getStarterPack({
+      starterPack: sp3.uriStr,
+    })
+    expect(view.data.starterPack.listItemsSample?.length).toBe(2)
+    expect(forSnapshot(view.data.starterPack.listItemsSample)).toMatchSnapshot()
+  })
+
+  it('does include users with creator block relationship in list sample for creator', async () => {
+    const view = await agent.api.app.bsky.graph.getStarterPack(
+      { starterPack: sp3.uriStr },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyGraphGetStarterPack,
+        ),
+      },
+    )
+    expect(view.data.starterPack.listItemsSample?.length).toBe(3)
+    expect(forSnapshot(view.data.starterPack.listItemsSample)).toMatchSnapshot()
+  })
 })

package/tests/views/suggested-follows.test.ts

@@ -1,5 +1,6 @@
 import { AtpAgent, AtUri } from '@atproto/api'
 import { TestNetwork, SeedClient, likesSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('suggested follows', () => {
   let network: TestNetwork
@@ -40,7 +41,12 @@ describe('suggested follows', () => {
       {
         actor: sc.dids.alice,
       },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyGraphGetSuggestedFollowsByActor,
+        ),
+      },
     )
 
     expect(result.data.suggestions.length).toBe(4) // backfilled with 2 NPCs
@@ -56,7 +62,12 @@ describe('suggested follows', () => {
       {
         actor: sc.dids.alice,
       },
-      { headers: await network.serviceHeaders(sc.dids.fred) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.fred,
+          ids.AppBskyGraphGetSuggestedFollowsByActor,
+        ),
+      },
     )
 
     expect(result.data.suggestions.length).toBe(4) // backfilled with 2 NPCs
@@ -76,7 +87,12 @@ describe('suggested follows', () => {
       {
         actor: sc.dids.alice,
       },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyGraphGetSuggestedFollowsByActor,
+        ),
+      },
     )
 
     expect(
@@ -101,7 +117,12 @@ describe('suggested follows', () => {
       {
         actor: sc.dids.alice,
       },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyGraphGetSuggestedFollowsByActor,
+        ),
+      },
     )
 
     expect(
@@ -126,7 +147,12 @@ describe('suggested follows', () => {
       {
         actor: sc.dids.alice,
       },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyGraphGetSuggestedFollowsByActor,
+        ),
+      },
     )
 
     expect(

package/tests/views/suggestions.test.ts

@@ -1,6 +1,7 @@
 import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { stripViewer } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds user search views', () => {
   let network: TestNetwork
@@ -36,7 +37,12 @@ describe('pds user search views', () => {
   it('actor suggestion gives users', async () => {
     const result = await agent.api.app.bsky.actor.getSuggestions(
       {},
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
 
     // does not include carol, because she is requesting
@@ -50,7 +56,12 @@ describe('pds user search views', () => {
   it('does not suggest followed users', async () => {
     const result = await agent.api.app.bsky.actor.getSuggestions(
       {},
-      { headers: await network.serviceHeaders(sc.dids.alice) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
 
     // alice follows everyone
@@ -60,21 +71,36 @@ describe('pds user search views', () => {
   it('paginates', async () => {
     const result1 = await agent.api.app.bsky.actor.getSuggestions(
       { limit: 2 },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     expect(result1.data.actors.length).toBe(1)
     expect(result1.data.actors[0].handle).toEqual('bob.test')
 
     const result2 = await agent.api.app.bsky.actor.getSuggestions(
       { limit: 2, cursor: result1.data.cursor },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     expect(result2.data.actors.length).toBe(1)
     expect(result2.data.actors[0].handle).toEqual('dan.test')
 
     const result3 = await agent.api.app.bsky.actor.getSuggestions(
       { limit: 2, cursor: result2.data.cursor },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     expect(result3.data.actors.length).toBe(0)
     expect(result3.data.cursor).toBeUndefined()
@@ -83,7 +109,12 @@ describe('pds user search views', () => {
   it('fetches suggestions unauthed', async () => {
     const { data: authed } = await agent.api.app.bsky.actor.getSuggestions(
       {},
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.actor.getSuggestions({})
     const omitViewerFollows = ({ did }) => {

package/tests/views/thread.test.ts

@@ -5,6 +5,7 @@ import {
   forSnapshot,
   stripViewerFromThread,
 } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds thread views', () => {
   let network: TestNetwork
@@ -41,7 +42,12 @@ describe('pds thread views', () => {
   it('fetches deep post thread', async () => {
     const thread = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.posts[alice][1].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -50,7 +56,12 @@ describe('pds thread views', () => {
   it('fetches shallow post thread', async () => {
     const thread = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[alice][1].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -65,7 +76,12 @@ describe('pds thread views', () => {
           `at://${sc.accounts[alice].handle}`,
         ),
       },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -74,7 +90,12 @@ describe('pds thread views', () => {
   it('fetches ancestors', async () => {
     const thread = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.replies[alice][0].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -83,7 +104,12 @@ describe('pds thread views', () => {
   it('fails for an unknown post', async () => {
     const promise = agent.api.app.bsky.feed.getPostThread(
       { uri: 'at://did:example:fake/does.not.exist/self' },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     await expect(promise).rejects.toThrow(
@@ -94,7 +120,12 @@ describe('pds thread views', () => {
   it('fetches post thread unauthed', async () => {
     const { data: authed } = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.posts[alice][1].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.feed.getPostThread({
       uri: sc.posts[alice][1].ref.uriStr,
@@ -133,7 +164,12 @@ describe('pds thread views', () => {
 
     const thread1 = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.posts[alice][indexes.aliceRoot].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(thread1.data.thread)).toMatchSnapshot()
 
@@ -142,13 +178,23 @@ describe('pds thread views', () => {
 
     const thread2 = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.posts[alice][indexes.aliceRoot].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(thread2.data.thread)).toMatchSnapshot()
 
     const thread3 = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.replies[alice][indexes.aliceReplyReply].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(thread3.data.thread)).toMatchSnapshot()
   })
@@ -179,7 +225,12 @@ describe('pds thread views', () => {
     const { data: goodReply1Thread } =
       await agent.api.app.bsky.feed.getPostThread(
         { uri: goodReply1.ref.uriStr },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
     assertIsThreadViewPost(goodReply1Thread.thread)
     assertIsThreadViewPost(goodReply1Thread.thread.parent)
@@ -197,7 +248,12 @@ describe('pds thread views', () => {
     const { data: badReplyThread } =
       await agent.api.app.bsky.feed.getPostThread(
         { uri: badReply.ref.uriStr },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
     assertIsThreadViewPost(badReplyThread.thread)
     expect(badReplyThread.thread.parent).toBeUndefined() // is not goodReply1
@@ -206,7 +262,12 @@ describe('pds thread views', () => {
   it('reflects self-labels', async () => {
     const { data: thread } = await agent.api.app.bsky.feed.getPostThread(
       { uri: sc.posts[alice][0].ref.uriStr },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
 
     assertIsThreadViewPost(thread.thread)
@@ -236,7 +297,12 @@ describe('pds thread views', () => {
       // Same as shallow post thread test, minus alice
       const promise = agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: sc.posts[alice][1].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       await expect(promise).rejects.toThrow(
@@ -257,7 +323,12 @@ describe('pds thread views', () => {
       // Same as deep post thread test, minus carol
       const thread = await agent.api.app.bsky.feed.getPostThread(
         { uri: sc.posts[alice][1].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -276,7 +347,12 @@ describe('pds thread views', () => {
       // Same as ancestor post thread test, minus bob
       const thread = await agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: sc.replies[alice][0].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -295,7 +371,12 @@ describe('pds thread views', () => {
 
       const promise = agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: postRef.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       await expect(promise).rejects.toThrow(
@@ -311,7 +392,12 @@ describe('pds thread views', () => {
     it('blocks ancestors by record', async () => {
       const threadPreTakedown = await agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: sc.replies[alice][0].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       const parent = threadPreTakedown.data.thread.parent?.['post']
@@ -323,7 +409,12 @@ describe('pds thread views', () => {
       // Same as ancestor post thread test, minus parent post
       const thread = await agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: sc.replies[alice][0].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()
@@ -337,7 +428,12 @@ describe('pds thread views', () => {
     it('blocks replies by record', async () => {
       const threadPreTakedown = await agent.api.app.bsky.feed.getPostThread(
         { uri: sc.posts[alice][1].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
       const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
@@ -353,7 +449,12 @@ describe('pds thread views', () => {
       // Same as deep post thread test, minus some replies
       const thread = await agent.api.app.bsky.feed.getPostThread(
         { uri: sc.posts[alice][1].ref.uriStr },
-        { headers: await network.serviceHeaders(bob) },
+        {
+          headers: await network.serviceHeaders(
+            bob,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
       )
 
       expect(forSnapshot(thread.data.thread)).toMatchSnapshot()