@atproto/bsky 0.0.74 → 0.0.76

package/tests/views/notifications.test.ts

@@ -2,6 +2,7 @@ import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { forSnapshot, paginateAll } from '../_util'
 import { Notification } from '../../src/lexicon/types/app/bsky/notification/listNotifications'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('notification views', () => {
   let network: TestNetwork
@@ -48,14 +49,24 @@ describe('notification views', () => {
     const notifCountAlice =
       await agent.api.app.bsky.notification.getUnreadCount(
         {},
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyNotificationGetUnreadCount,
+          ),
+        },
       )
 
     expect(notifCountAlice.data.count).toBe(12)
 
     const notifCountBob = await agent.api.app.bsky.notification.getUnreadCount(
       {},
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyNotificationGetUnreadCount,
+        ),
+      },
     )
 
     expect(notifCountBob.data.count).toBeGreaterThanOrEqual(3)
@@ -75,14 +86,24 @@ describe('notification views', () => {
     const notifCountAlice =
       await agent.api.app.bsky.notification.getUnreadCount(
         {},
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyNotificationGetUnreadCount,
+          ),
+        },
       )
 
     expect(notifCountAlice.data.count).toBe(13)
 
     const notifCountBob = await agent.api.app.bsky.notification.getUnreadCount(
       {},
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyNotificationGetUnreadCount,
+        ),
+      },
     )
 
     expect(notifCountBob.data.count).toBeGreaterThanOrEqual(4)
@@ -97,7 +118,12 @@ describe('notification views', () => {
 
     const notifsAlice = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(sc.dids.alice) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     const hasNotif = notifsAlice.data.notifications.some(
       (notif) => notif.uri === second.ref.uriStr,
@@ -114,7 +140,12 @@ describe('notification views', () => {
     // Dan was quoted by alice
     const notifsDan = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(sc.dids.dan) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.dan,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(forSnapshot(sort(notifsDan.data.notifications))).toMatchSnapshot()
   })
@@ -122,7 +153,12 @@ describe('notification views', () => {
   it('fetches notifications without a last-seen', async () => {
     const notifRes = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
 
     const notifs = notifRes.data.notifications
@@ -140,7 +176,12 @@ describe('notification views', () => {
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.notification.listNotifications(
         { cursor, limit: 6 },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
       )
       return res.data
     }
@@ -152,7 +193,12 @@ describe('notification views', () => {
 
     const full = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
 
     expect(full.data.notifications.length).toEqual(13)
@@ -162,26 +208,44 @@ describe('notification views', () => {
   it('fetches notification count with a last-seen', async () => {
     const full = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     const seenAt = full.data.notifications[3].indexedAt
     await agent.api.app.bsky.notification.updateSeen(
       { seenAt },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationUpdateSeen,
+        ),
         encoding: 'application/json',
       },
     )
     const full2 = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(full2.data.notifications.length).toBe(full.data.notifications.length)
     expect(full2.data.seenAt).toEqual(seenAt)
 
     const notifCount = await agent.api.app.bsky.notification.getUnreadCount(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationGetUnreadCount,
+        ),
+      },
     )
 
     expect(notifCount.data.count).toBe(
@@ -193,7 +257,10 @@ describe('notification views', () => {
     await agent.api.app.bsky.notification.updateSeen(
       { seenAt: new Date(0).toISOString() },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationUpdateSeen,
+        ),
         encoding: 'application/json',
       },
     )
@@ -202,19 +269,32 @@ describe('notification views', () => {
   it('fetches notifications with a last-seen', async () => {
     const full = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     const seenAt = full.data.notifications[3].indexedAt
     await agent.api.app.bsky.notification.updateSeen(
       { seenAt },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationUpdateSeen,
+        ),
         encoding: 'application/json',
       },
     )
     const notifRes = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
 
     const notifs = notifRes.data.notifications
@@ -226,7 +306,10 @@ describe('notification views', () => {
     await agent.api.app.bsky.notification.updateSeen(
       { seenAt: new Date(0).toISOString() },
       {
-        headers: await network.serviceHeaders(alice),
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationUpdateSeen,
+        ),
         encoding: 'application/json',
       },
     )
@@ -245,11 +328,21 @@ describe('notification views', () => {
 
     const notifRes = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     const notifCount = await agent.api.app.bsky.notification.getUnreadCount(
       {},
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyNotificationGetUnreadCount,
+        ),
+      },
     )
 
     const notifs = sort(notifRes.data.notifications)
@@ -270,7 +363,12 @@ describe('notification views', () => {
   it('fetches notifications with explicit priority', async () => {
     const priority = await agent.api.app.bsky.notification.listNotifications(
       { priority: true },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     // only notifs from follow (alice)
     expect(
@@ -281,7 +379,12 @@ describe('notification views', () => {
     expect(forSnapshot(priority.data)).toMatchSnapshot()
     const noPriority = await agent.api.app.bsky.notification.listNotifications(
       { priority: false },
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     expect(forSnapshot(noPriority.data)).toMatchSnapshot()
   })
@@ -291,13 +394,21 @@ describe('notification views', () => {
       { priority: true },
       {
         encoding: 'application/json',
-        headers: await network.serviceHeaders(sc.dids.carol),
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyNotificationPutPreferences,
+        ),
       },
     )
     await network.processAll()
     const notifs = await agent.api.app.bsky.notification.listNotifications(
       {},
-      { headers: await network.serviceHeaders(sc.dids.carol) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
     )
     // only notifs from follow (alice)
     expect(
@@ -312,7 +423,12 @@ describe('notification views', () => {
     const { data: notifs } =
       await agent.api.app.bsky.notification.listNotifications(
         { cursor: '90210::bafycid' },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
       )
     expect(notifs).toMatchObject({ notifications: [] })
   })

package/tests/views/posts.test.ts

@@ -1,6 +1,7 @@
 import { AppBskyFeedPost, AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { forSnapshot, stripViewerFromPost } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds posts views', () => {
   let network: TestNetwork
@@ -34,7 +35,12 @@ describe('pds posts views', () => {
     ]
     const posts = await agent.api.app.bsky.feed.getPosts(
       { uris },
-      { headers: await network.serviceHeaders(sc.dids.alice) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
 
     expect(posts.data.posts.length).toBe(uris.length)
@@ -53,7 +59,12 @@ describe('pds posts views', () => {
 
     const authed = await agent.api.app.bsky.feed.getPosts(
       { uris },
-      { headers: await network.serviceHeaders(sc.dids.alice) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
     const unauthed = await agent.api.app.bsky.feed.getPosts({
       uris,

package/tests/views/profile.test.ts

@@ -38,7 +38,12 @@ describe('pds profile views', () => {
   it('fetches own profile', async () => {
     const aliceForAlice = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
     )
 
     expect(forSnapshot(aliceForAlice.data)).toMatchSnapshot()
@@ -47,7 +52,9 @@ describe('pds profile views', () => {
   it('reflects self-labels', async () => {
     const aliceForBob = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
 
     const labels = aliceForBob.data.labels
@@ -61,7 +68,9 @@ describe('pds profile views', () => {
   it("fetches other's profile, with a follow", async () => {
     const aliceForBob = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
 
     expect(forSnapshot(aliceForBob.data)).toMatchSnapshot()
@@ -70,7 +79,9 @@ describe('pds profile views', () => {
   it("fetches other's profile, without a follow", async () => {
     const danForBob = await agent.api.app.bsky.actor.getProfile(
       { actor: dan },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
 
     expect(forSnapshot(danForBob.data)).toMatchSnapshot()
@@ -90,7 +101,9 @@ describe('pds profile views', () => {
           'missing.test',
         ],
       },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfiles),
+      },
     )
 
     expect(profiles.map((p) => p.handle)).toEqual([
@@ -135,7 +148,12 @@ describe('pds profile views', () => {
 
     const aliceForAlice = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
     )
 
     expect(forSnapshot(aliceForAlice.data)).toMatchSnapshot()
@@ -145,13 +163,15 @@ describe('pds profile views', () => {
     const byDid = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
       {
-        headers: await network.serviceHeaders(bob),
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
       },
     )
 
     const byHandle = await agent.api.app.bsky.actor.getProfile(
       { actor: sc.accounts[alice].handle },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
 
     expect(byHandle.data).toEqual(byDid.data)
@@ -160,7 +180,9 @@ describe('pds profile views', () => {
   it('fetches profile unauthed', async () => {
     const { data: authed } = await agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.actor.getProfile({
       actor: alice,
@@ -173,7 +195,9 @@ describe('pds profile views', () => {
       {
         actors: [alice, 'bob.test', 'missing.test'],
       },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfiles),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.actor.getProfiles({
       actors: [alice, 'bob.test', 'missing.test'],
@@ -188,7 +212,9 @@ describe('pds profile views', () => {
     })
     const promise = agent.api.app.bsky.actor.getProfile(
       { actor: alice },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(bob, ids.AppBskyActorGetProfile),
+      },
     )
 
     await expect(promise).rejects.toThrow('Account has been suspended')

package/tests/views/reposts.test.ts

@@ -1,6 +1,7 @@
 import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, repostsSeed } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds repost views', () => {
   let network: TestNetwork
@@ -30,7 +31,12 @@ describe('pds repost views', () => {
   it('fetches reposted-by for a post', async () => {
     const view = await agent.api.app.bsky.feed.getRepostedBy(
       { uri: sc.posts[alice][2].ref.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetRepostedBy,
+        ),
+      },
     )
     expect(view.data.uri).toEqual(sc.posts[sc.dids.alice][2].ref.uriStr)
     expect(forSnapshot(view.data.repostedBy)).toMatchSnapshot()
@@ -39,7 +45,12 @@ describe('pds repost views', () => {
   it('fetches reposted-by for a reply', async () => {
     const view = await agent.api.app.bsky.feed.getRepostedBy(
       { uri: sc.replies[bob][0].ref.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetRepostedBy,
+        ),
+      },
     )
     expect(view.data.uri).toEqual(sc.replies[sc.dids.bob][0].ref.uriStr)
     expect(forSnapshot(view.data.repostedBy)).toMatchSnapshot()
@@ -54,7 +65,12 @@ describe('pds repost views', () => {
           cursor,
           limit: 2,
         },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetRepostedBy,
+          ),
+        },
       )
       return res.data
     }
@@ -66,7 +82,12 @@ describe('pds repost views', () => {
 
     const full = await agent.api.app.bsky.feed.getRepostedBy(
       { uri: sc.posts[alice][2].ref.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetRepostedBy,
+        ),
+      },
     )
 
     expect(full.data.repostedBy.length).toEqual(4)
@@ -76,7 +97,12 @@ describe('pds repost views', () => {
   it('fetches reposted-by unauthed', async () => {
     const { data: authed } = await agent.api.app.bsky.feed.getRepostedBy(
       { uri: sc.posts[alice][2].ref.uriStr },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetRepostedBy,
+        ),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.feed.getRepostedBy({
       uri: sc.posts[alice][2].ref.uriStr,

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()
+  })
 })