@atproto/bsky 0.0.75 → 0.0.77

package/tests/views/block-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('pds views with blocking from block lists', () => {
   let network: TestNetwork
@@ -109,7 +110,12 @@ describe('pds views with blocking from block lists', () => {
     const { carol, dan } = sc.dids
     const { data: threadAlice } = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[carol][0].ref.uriStr },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(threadAlice.thread).toEqual(
       expect.objectContaining({
@@ -120,7 +126,12 @@ describe('pds views with blocking from block lists', () => {
     )
     const { data: threadCarol } = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: sc.posts[dan][0].ref.uriStr },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(threadCarol.thread).toEqual(
       expect.objectContaining({
@@ -135,7 +146,12 @@ describe('pds views with blocking from block lists', () => {
     // Contains reply by carol
     const { data: thread } = 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(thread)).toMatchSnapshot()
   })
@@ -144,7 +160,12 @@ describe('pds views with blocking from block lists', () => {
     // Parent is a post by dan
     const { data: thread } = await agent.api.app.bsky.feed.getPostThread(
       { depth: 1, uri: aliceReplyToDan.ref.uriStr },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(thread)).toMatchSnapshot()
   })
@@ -153,7 +174,12 @@ describe('pds views with blocking from block lists', () => {
     // Contains a deep embed of carol's post, blocked by dan
     const { data: thread } = await agent.api.app.bsky.feed.getPostThread(
       { depth: 0, uri: sc.posts[alice][2].ref.uriStr },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
     )
     expect(forSnapshot(thread)).toMatchSnapshot()
   })
@@ -161,7 +187,12 @@ describe('pds views with blocking from block lists', () => {
   it('errors on getting author feed', async () => {
     const attempt1 = agent.api.app.bsky.feed.getAuthorFeed(
       { actor: carol },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     await expect(attempt1).rejects.toMatchObject({
       error: 'BlockedActor',
@@ -169,7 +200,12 @@ describe('pds views with blocking from block lists', () => {
 
     const attempt2 = agent.api.app.bsky.feed.getAuthorFeed(
       { actor: dan },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     await expect(attempt2).rejects.toMatchObject({
       error: 'BlockedByActor',
@@ -179,7 +215,12 @@ describe('pds views with blocking from block lists', () => {
   it('strips blocked users out of getTimeline', async () => {
     const resCarol = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetTimeline,
+        ),
+      },
     )
     expect(
       resCarol.data.feed.some((post) => post.post.author.did === dan),
@@ -187,7 +228,9 @@ describe('pds views with blocking from block lists', () => {
 
     const resDan = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       resDan.data.feed.some((post) =>
@@ -199,7 +242,12 @@ describe('pds views with blocking from block lists', () => {
   it('returns block status on getProfile', async () => {
     const resCarol = await agent.api.app.bsky.actor.getProfile(
       { actor: dan },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
     )
     expect(resCarol.data.viewer?.blocking).toBeUndefined()
     expect(resCarol.data.viewer?.blockingByList).toBeUndefined()
@@ -207,7 +255,9 @@ describe('pds views with blocking from block lists', () => {
 
     const resDan = await agent.api.app.bsky.actor.getProfile(
       { actor: carol },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyActorGetProfile),
+      },
     )
     expect(resDan.data.viewer?.blocking).toBeDefined()
     expect(resDan.data.viewer?.blockingByList?.uri).toEqual(
@@ -219,7 +269,12 @@ describe('pds views with blocking from block lists', () => {
   it('returns block status on getProfiles', async () => {
     const resCarol = await agent.api.app.bsky.actor.getProfiles(
       { actors: [alice, dan] },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorGetProfiles,
+        ),
+      },
     )
     expect(resCarol.data.profiles[0].viewer?.blocking).toBeUndefined()
     expect(resCarol.data.profiles[0].viewer?.blockingByList).toBeUndefined()
@@ -230,7 +285,9 @@ describe('pds views with blocking from block lists', () => {
 
     const resDan = await agent.api.app.bsky.actor.getProfiles(
       { actors: [alice, carol] },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyActorGetProfiles),
+      },
     )
     expect(resDan.data.profiles[0].viewer?.blocking).toBeUndefined()
     expect(resDan.data.profiles[0].viewer?.blockingByList).toBeUndefined()
@@ -245,7 +302,9 @@ describe('pds views with blocking from block lists', () => {
   it('ignores self-blocks', 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?.blocking).toBeUndefined()
     expect(res.data.viewer?.blockingByList).toBeUndefined()
@@ -257,7 +316,12 @@ describe('pds views with blocking from block lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(
       resCarol.data.notifications.some((notif) => notif.author.did === dan),
@@ -267,7 +331,12 @@ describe('pds views with blocking from block lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(
       resDan.data.notifications.some((notif) => notif.author.did === carol),
@@ -279,7 +348,12 @@ describe('pds views with blocking from block lists', () => {
       {
         term: 'dan.test',
       },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorSearchActors,
+        ),
+      },
     )
     expect(resCarol.data.actors.some((actor) => actor.did === dan)).toBeFalsy()
 
@@ -287,7 +361,12 @@ describe('pds views with blocking from block lists', () => {
       {
         term: 'carol.test',
       },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyActorSearchActors,
+        ),
+      },
     )
     expect(resDan.data.actors.some((actor) => actor.did === carol)).toBeFalsy()
   })
@@ -295,21 +374,59 @@ describe('pds views with blocking from block lists', () => {
   it('does not return blocked accounts in actor search typeahead', async () => {
     const resCarol = await agent.api.app.bsky.actor.searchActorsTypeahead(
       {
-        term: 'dan.test',
+        term: 'dan.tes',
+      },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorSearchActorsTypeahead,
+        ),
       },
-      { headers: await network.serviceHeaders(carol) },
     )
     expect(resCarol.data.actors.some((actor) => actor.did === dan)).toBeFalsy()
 
     const resDan = await agent.api.app.bsky.actor.searchActorsTypeahead(
       {
-        term: 'carol.test',
+        term: 'carol.tes',
+      },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyActorSearchActorsTypeahead,
+        ),
       },
-      { headers: await network.serviceHeaders(dan) },
     )
     expect(resDan.data.actors.some((actor) => actor.did === carol)).toBeFalsy()
   })
 
+  it('does return blocked accounts in actor search typeahead when term is exact handle', async () => {
+    const resCarol = await agent.api.app.bsky.actor.searchActorsTypeahead(
+      {
+        term: 'dan.test',
+      },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorSearchActorsTypeahead,
+        ),
+      },
+    )
+    expect(resCarol.data.actors.some((actor) => actor.did === dan)).toBeTruthy()
+
+    const resDan = await agent.api.app.bsky.actor.searchActorsTypeahead(
+      {
+        term: 'carol.test',
+      },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyActorSearchActorsTypeahead,
+        ),
+      },
+    )
+    expect(resDan.data.actors.some((actor) => actor.did === carol)).toBeTruthy()
+  })
+
   it('does not return blocked accounts in get suggestions', async () => {
     // unfollow so they _would_ show up in suggestions if not for block
     await sc.unfollow(carol, dan)
@@ -320,7 +437,12 @@ describe('pds views with blocking from block lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     expect(resCarol.data.actors.some((actor) => actor.did === dan)).toBeFalsy()
 
@@ -328,7 +450,12 @@ describe('pds views with blocking from block lists', () => {
       {
         limit: 100,
       },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyActorGetSuggestions,
+        ),
+      },
     )
     expect(resDan.data.actors.some((actor) => actor.did === carol)).toBeFalsy()
   })
@@ -336,7 +463,7 @@ describe('pds views with blocking from block 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()
   })
@@ -344,15 +471,15 @@ describe('pds views with blocking from block 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)
@@ -376,7 +503,7 @@ describe('pds views with blocking from block 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()
   })
@@ -384,15 +511,15 @@ describe('pds views with blocking from block 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)
@@ -411,7 +538,12 @@ describe('pds views with blocking from block lists', () => {
 
     const res = await agent.api.app.bsky.graph.getListBlocks(
       {},
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListBlocks,
+        ),
+      },
     )
     expect(forSnapshot(res.data)).toMatchSnapshot()
   })
@@ -419,15 +551,30 @@ describe('pds views with blocking from block lists', () => {
   it('paginates getListBlocks', async () => {
     const full = await agent.api.app.bsky.graph.getListBlocks(
       {},
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListBlocks,
+        ),
+      },
     )
     const first = await agent.api.app.bsky.graph.getListBlocks(
       { limit: 1 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListBlocks,
+        ),
+      },
     )
     const second = await agent.api.app.bsky.graph.getListBlocks(
       { cursor: first.data.cursor },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyGraphGetListBlocks,
+        ),
+      },
     )
     const combined = [...first.data.lists, ...second.data.lists]
     expect(combined).toEqual(full.data.lists)
@@ -452,7 +599,12 @@ describe('pds views with blocking from block lists', () => {
 
     const resCarol = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetTimeline,
+        ),
+      },
     )
     expect(
       resCarol.data.feed.some((post) => post.post.author.did === dan),
@@ -460,7 +612,9 @@ describe('pds views with blocking from block lists', () => {
 
     const resDan = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       resDan.data.feed.some((post) =>
@@ -482,7 +636,12 @@ describe('pds views with blocking from block lists', () => {
 
     const resCarol = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetTimeline,
+        ),
+      },
     )
     expect(
       resCarol.data.feed.some((post) => post.post.author.did === dan),
@@ -490,7 +649,9 @@ describe('pds views with blocking from block lists', () => {
 
     const resDan = await agent.api.app.bsky.feed.getTimeline(
       { limit: 100 },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(dan, ids.AppBskyFeedGetTimeline),
+      },
     )
     expect(
       resDan.data.feed.some((post) =>