@atproto/bsky 0.0.74 → 0.0.76

package/tests/feed-generation.test.ts

@@ -191,7 +191,12 @@ describe('feed generation', () => {
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.feed.getActorFeeds(
         { actor: alice, cursor, limit: 2 },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetActorFeeds,
+          ),
+        },
       )
       return res.data
     }
@@ -224,7 +229,12 @@ describe('feed generation', () => {
     await network.processAll()
     const view = await agent.api.app.bsky.feed.getPosts(
       { uris: [res.uri] },
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
     expect(view.data.posts.length).toBe(1)
     expect(forSnapshot(view.data.posts[0])).toMatchSnapshot()
@@ -246,7 +256,12 @@ describe('feed generation', () => {
     await network.processAll()
     const view = await agent.api.app.bsky.feed.getPosts(
       { uris: [res.uri] },
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
     expect(view.data.posts.length).toBe(1)
     expect(forSnapshot(view.data.posts[0])).toMatchSnapshot()
@@ -300,7 +315,12 @@ describe('feed generation', () => {
     await network.processAll()
     const view = await agent.api.app.bsky.feed.getPosts(
       { uris: [res.uri] },
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
     expect(view.data.posts.length).toBe(1)
     expect(forSnapshot(view.data.posts[0])).toMatchSnapshot()
@@ -325,7 +345,12 @@ describe('feed generation', () => {
     await network.processAll()
     const view = await agent.api.app.bsky.feed.getPosts(
       { uris: [res.uri] },
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyFeedGetPosts,
+        ),
+      },
     )
     expect(view.data.posts.length).toBe(1)
     expect(forSnapshot(view.data.posts[0])).toMatchSnapshot()
@@ -335,7 +360,12 @@ describe('feed generation', () => {
     it('describes a feed gen & returns online status', async () => {
       const resEven = await agent.api.app.bsky.feed.getFeedGenerator(
         { feed: feedUriAll },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetFeedGenerator,
+          ),
+        },
       )
       expect(forSnapshot(resEven.data)).toMatchSnapshot()
       expect(resEven.data.isOnline).toBe(true)
@@ -345,7 +375,12 @@ describe('feed generation', () => {
     it('does not describe taken-down feed', async () => {
       const tryGetFeed = agent.api.app.bsky.feed.getFeedGenerator(
         { feed: feedUriPrime },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetFeedGenerator,
+          ),
+        },
       )
       await expect(tryGetFeed).rejects.toThrow('could not find feed')
     })
@@ -354,7 +389,12 @@ describe('feed generation', () => {
     it.skip('handles an unsupported algo', async () => {
       const resOdd = await agent.api.app.bsky.feed.getFeedGenerator(
         { feed: feedUriOdd },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetFeedGenerator,
+          ),
+        },
       )
       expect(resOdd.data.isOnline).toBe(true)
       expect(resOdd.data.isValid).toBe(false)
@@ -391,7 +431,12 @@ describe('feed generation', () => {
         {
           feed: allUriBob.toString(),
         },
-        { headers: await network.serviceHeaders(sc.dids.alice) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.alice,
+            ids.AppBskyFeedGetFeedGenerator,
+          ),
+        },
       )
       expect(res.data.isOnline).toBe(false)
       expect(res.data.isValid).toBe(false)
@@ -402,7 +447,12 @@ describe('feed generation', () => {
     it('describes multiple feed gens', async () => {
       const resEven = await agent.api.app.bsky.feed.getFeedGenerators(
         { feeds: [feedUriEven, feedUriAll, feedUriPrime] },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetFeedGenerators,
+          ),
+        },
       )
       expect(forSnapshot(resEven.data)).toMatchSnapshot()
       expect(resEven.data.feeds.map((fg) => fg.uri)).not.toContain(feedUriPrime) // taken-down
@@ -413,7 +463,12 @@ describe('feed generation', () => {
     it('returns list of suggested feed generators', async () => {
       const resEven = await agent.api.app.bsky.feed.getSuggestedFeeds(
         {},
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetSuggestedFeeds,
+          ),
+        },
       )
       expect(forSnapshot(resEven.data)).toMatchSnapshot()
       expect(resEven.data.feeds.map((fg) => fg.uri)).not.toContain(feedUriPrime) // taken-down
@@ -424,7 +479,12 @@ describe('feed generation', () => {
     it('gets popular feed generators', async () => {
       const res = await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
         {},
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyUnspeccedGetPopularFeedGenerators,
+          ),
+        },
       )
       expect(res.data.feeds.map((f) => f.uri)).not.toContain(feedUriPrime) // taken-down
       expect(res.data.feeds.map((f) => f.uri)).toEqual([
@@ -437,7 +497,12 @@ describe('feed generation', () => {
     it('searches feed generators', async () => {
       const res = await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
         { query: 'all' },
-        { headers: await network.serviceHeaders(sc.dids.bob) },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyUnspeccedGetPopularFeedGenerators,
+          ),
+        },
       )
       expect(res.data.feeds.map((f) => f.uri)).toEqual([feedUriAll])
     })
@@ -446,17 +511,32 @@ describe('feed generation', () => {
       const resFull =
         await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
           {},
-          { headers: await network.serviceHeaders(sc.dids.bob) },
+          {
+            headers: await network.serviceHeaders(
+              sc.dids.bob,
+              ids.AppBskyUnspeccedGetPopularFeedGenerators,
+            ),
+          },
         )
       const resOne =
         await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
           { limit: 2 },
-          { headers: await network.serviceHeaders(sc.dids.bob) },
+          {
+            headers: await network.serviceHeaders(
+              sc.dids.bob,
+              ids.AppBskyUnspeccedGetPopularFeedGenerators,
+            ),
+          },
         )
       const resTwo =
         await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
           { cursor: resOne.data.cursor },
-          { headers: await network.serviceHeaders(sc.dids.bob) },
+          {
+            headers: await network.serviceHeaders(
+              sc.dids.bob,
+              ids.AppBskyUnspeccedGetPopularFeedGenerators,
+            ),
+          },
         )
       expect([...resOne.data.feeds, ...resTwo.data.feeds]).toEqual(
         resFull.data.feeds,
@@ -468,7 +548,13 @@ describe('feed generation', () => {
     it('resolves basic feed contents.', async () => {
       const feed = await agent.api.app.bsky.feed.getFeed(
         { feed: feedUriEven },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeed,
+            gen.did,
+          ),
+        },
       )
       expect(feed.data.feed.map((item) => item.post.uri)).toEqual([
         sc.posts[sc.dids.alice][0].ref.uriStr,
@@ -493,7 +579,13 @@ describe('feed generation', () => {
       const paginator = async (cursor?: string) => {
         const res = await agent.api.app.bsky.feed.getFeed(
           { feed: feedUriAll, cursor, limit: 2 },
-          { headers: await network.serviceHeaders(alice, gen.did) },
+          {
+            headers: await network.serviceHeaders(
+              alice,
+              ids.AppBskyFeedGetFeed,
+              gen.did,
+            ),
+          },
         )
         return res.data
       }
@@ -514,7 +606,13 @@ describe('feed generation', () => {
     it('paginates, handling feed not respecting limit.', async () => {
       const res = await agent.api.app.bsky.feed.getFeed(
         { feed: feedUriBadPagination, limit: 3 },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeed,
+            gen.did,
+          ),
+        },
       )
       // refused to respect pagination limit, so it got cut short by appview but the cursor remains.
       expect(res.data.feed.length).toBeLessThanOrEqual(3)
@@ -529,7 +627,13 @@ describe('feed generation', () => {
     it('fails on unknown feed.', async () => {
       const tryGetFeed = agent.api.app.bsky.feed.getFeed(
         { feed: feedUriOdd },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeed,
+            gen.did,
+          ),
+        },
       )
       await expect(tryGetFeed).rejects.toMatchObject({
         error: 'UnknownFeed',
@@ -539,7 +643,9 @@ describe('feed generation', () => {
     it('resolves contents of taken-down feed.', async () => {
       const tryGetFeed = agent.api.app.bsky.feed.getFeed(
         { feed: feedUriPrime },
-        { headers: await network.serviceHeaders(alice) },
+        {
+          headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetFeed),
+        },
       )
       await expect(tryGetFeed).resolves.toBeDefined()
     })
@@ -547,19 +653,19 @@ describe('feed generation', () => {
     it('receives proper auth details.', async () => {
       const feed = await agent.api.app.bsky.feed.getFeed(
         { feed: feedUriEven },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeedSkeleton,
+            gen.did,
+          ),
+        },
       )
       expect(feed.data['$auth']?.['aud']).toEqual(gen.did)
       expect(feed.data['$auth']?.['iss']).toEqual(alice)
-    })
-
-    it('receives proper auth details.', async () => {
-      const feed = await agent.api.app.bsky.feed.getFeed(
-        { feed: feedUriEven },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+      expect(feed.data['$auth']?.['lxm']).toEqual(
+        ids.AppBskyFeedGetFeedSkeleton,
       )
-      expect(feed.data['$auth']?.['aud']).toEqual(gen.did)
-      expect(feed.data['$auth']?.['iss']).toEqual(alice)
     })
 
     it('passes through auth error from feed.', async () => {
@@ -575,7 +681,13 @@ describe('feed generation', () => {
     it('provides timing info in server-timing header.', async () => {
       const result = await agent.api.app.bsky.feed.getFeed(
         { feed: feedUriEven },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeed,
+            gen.did,
+          ),
+        },
       )
       expect(result.headers['server-timing']).toMatch(
         /^skele;dur=\d+, hydr;dur=\d+$/,
@@ -586,7 +698,13 @@ describe('feed generation', () => {
       await gen.close() // @NOTE must be last test
       const tryGetFeed = agent.api.app.bsky.feed.getFeed(
         { feed: feedUriEven },
-        { headers: await network.serviceHeaders(alice, gen.did) },
+        {
+          headers: await network.serviceHeaders(
+            alice,
+            ids.AppBskyFeedGetFeed,
+            gen.did,
+          ),
+        },
       )
       await expect(tryGetFeed).rejects.toThrow('feed unavailable')
     })

package/tests/server.test.ts

@@ -89,7 +89,7 @@ describe('server', () => {
       {
         decompress: false,
         headers: {
-          ...(await network.serviceHeaders(alice)),
+          ...(await network.serviceHeaders(alice, 'app.bsky.feed.getTimeline')),
           'accept-encoding': 'gzip',
         },
       },

package/tests/views/__snapshots__/lists.test.ts.snap

@@ -1,42 +1,161 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`bsky actor likes feed views does include users with creator block relationship in reference lists for creator 1`] = `
+Array [
+  Object {
+    "subject": Object {
+      "did": "user(0)",
+      "handle": "frankie.test",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": true,
+        "muted": false,
+      },
+    },
+    "uri": "record(0)",
+  },
+  Object {
+    "subject": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "hi im bob label_me",
+      "did": "user(1)",
+      "displayName": "bobby",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "uri": "record(1)",
+  },
+  Object {
+    "subject": Object {
+      "did": "user(3)",
+      "handle": "eve.test",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "uri": "record(2)",
+  },
+]
+`;
+
 exports[`bsky actor likes feed views does not include reference lists in getActorLists 1`] = `
 Array [
   Object {
     "cid": "cids(0)",
     "creator": Object {
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
       "did": "user(0)",
-      "displayName": "ali",
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(2)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(0)",
-          "uri": "record(1)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(2)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(0)",
-          "uri": "record(1)",
-          "val": "self-label-b",
-        },
-      ],
-    },
-    "description": "",
-    "descriptionFacets": Array [],
+      "handle": "eve.test",
+      "labels": Array [],
+    },
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "listItemCount": 0,
-    "name": "cool curate list!",
+    "name": "cool curate list",
     "purpose": "app.bsky.graph.defs#curatelist",
     "uri": "record(0)",
   },
 ]
 `;
+
+exports[`bsky actor likes feed views does not include users with creator block relationship in reference lists for non-creator, in-list viewers 1`] = `
+Array [
+  Object {
+    "subject": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "hi im bob label_me",
+      "did": "user(0)",
+      "displayName": "bobby",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "uri": "record(0)",
+  },
+  Object {
+    "subject": Object {
+      "did": "user(2)",
+      "handle": "eve.test",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "blocking": "record(2)",
+        "muted": false,
+      },
+    },
+    "uri": "record(1)",
+  },
+]
+`;
+
+exports[`bsky actor likes feed views does not include users with creator block relationship in reference lists for non-creator, not-in-list viewers 1`] = `
+Array [
+  Object {
+    "subject": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "hi im bob label_me",
+      "did": "user(0)",
+      "displayName": "bobby",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "uri": "record(0)",
+  },
+  Object {
+    "subject": Object {
+      "did": "user(2)",
+      "handle": "eve.test",
+      "labels": Array [],
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "uri": "record(1)",
+  },
+]
+`;
+
+exports[`bsky actor likes feed views does not include users with creator block relationship in reference lists for signed-out viewers 1`] = `
+Array [
+  Object {
+    "subject": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "hi im bob label_me",
+      "did": "user(0)",
+      "displayName": "bobby",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+    },
+    "uri": "record(0)",
+  },
+  Object {
+    "subject": Object {
+      "did": "user(2)",
+      "handle": "eve.test",
+      "labels": Array [],
+    },
+    "uri": "record(1)",
+  },
+]
+`;