@atproto/bsky 0.0.75 → 0.0.77

package/tests/views/account-deactivation.test.ts

@@ -1,5 +1,6 @@
 import { AtpAgent } from '@atproto/api'
-import { basicSeed, SeedClient, TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky account deactivation', () => {
   let network: TestNetwork
@@ -69,7 +70,12 @@ describe('bsky account deactivation', () => {
   it('does not return posts from deactivated in timelines', async () => {
     const res = await agent.api.app.bsky.feed.getTimeline(
       {},
-      { headers: await network.serviceHeaders(sc.dids.bob) },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyFeedGetTimeline,
+        ),
+      },
     )
     expect(res.data.feed.some((p) => p.post.author.did === alice)).toBe(false)
   })

package/tests/views/actor-likes.test.ts

@@ -1,5 +1,6 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { basicSeed, SeedClient, TestNetwork } from '@atproto/dev-env'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky actor likes feed views', () => {
   let network: TestNetwork
@@ -35,7 +36,12 @@ describe('bsky actor likes feed views', () => {
       data: { feed: bobLikes },
     } = await agent.api.app.bsky.feed.getActorLikes(
       { actor: sc.accounts[bob].handle },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetActorLikes,
+        ),
+      },
     )
 
     expect(bobLikes).toHaveLength(3)
@@ -43,7 +49,12 @@ describe('bsky actor likes feed views', () => {
     await expect(
       agent.api.app.bsky.feed.getActorLikes(
         { actor: sc.accounts[bob].handle },
-        { headers: await network.serviceHeaders(carol) },
+        {
+          headers: await network.serviceHeaders(
+            carol,
+            ids.AppBskyFeedGetActorLikes,
+          ),
+        },
       ),
     ).rejects.toThrow('Profile not found')
   })
@@ -66,7 +77,12 @@ describe('bsky actor likes feed views', () => {
       data: { feed },
     } = await agent.api.app.bsky.feed.getActorLikes(
       { actor: sc.accounts[bob].handle },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetActorLikes,
+        ),
+      },
     )
 
     expect(
@@ -100,7 +116,12 @@ describe('bsky actor likes feed views', () => {
       data: { feed },
     } = await agent.api.app.bsky.feed.getActorLikes(
       { actor: sc.accounts[bob].handle },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetActorLikes,
+        ),
+      },
     )
 
     expect(

package/tests/views/actor-search.test.ts

@@ -2,6 +2,7 @@ import { AtpAgent } from '@atproto/api'
 import { wait } from '@atproto/common'
 import { TestNetwork, SeedClient, usersBulkSeed } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { ids } from '../../src/lexicon/lexicons'
 
 // @NOTE skipped to help with CI failures
 // The search code is not used in production & we should switch it out for tests on the search proxy interface
@@ -40,7 +41,10 @@ describe.skip('pds actor search views', () => {
     // Process remaining profiles
     network.bsky.sub.run()
     await network.processAll(50000)
-    headers = await network.serviceHeaders(Object.values(sc.dids)[0])
+    headers = await network.serviceHeaders(
+      Object.values(sc.dids)[0],
+      ids.AppBskyActorSearchActorsTypeahead,
+    )
   })
 
   afterAll(async () => {

package/tests/views/author-feed.test.ts

@@ -1,4 +1,4 @@
-import { AtpAgent, AtUri } from '@atproto/api'
+import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, authorFeedSeed } from '@atproto/dev-env'
 import {
   forSnapshot,
@@ -10,6 +10,8 @@ import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
 import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { uriToDid } from '../../src/util/uris'
+import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds author feed views', () => {
   let network: TestNetwork
@@ -48,28 +50,48 @@ describe('pds author feed views', () => {
   it('fetches full author feeds for self (sorted, minimal viewer state).', async () => {
     const aliceForAlice = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[alice].handle },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(forSnapshot(aliceForAlice.data.feed)).toMatchSnapshot()
 
     const bobForBob = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[bob].handle },
-      { headers: await network.serviceHeaders(bob) },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(forSnapshot(bobForBob.data.feed)).toMatchSnapshot()
 
     const carolForCarol = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[carol].handle },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(forSnapshot(carolForCarol.data.feed)).toMatchSnapshot()
 
     const danForDan = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[dan].handle },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(forSnapshot(danForDan.data.feed)).toMatchSnapshot()
@@ -78,7 +100,12 @@ describe('pds author feed views', () => {
   it("reflects fetching user's state in the feed.", async () => {
     const aliceForCarol = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[alice].handle },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     aliceForCarol.data.feed.forEach((postView) => {
@@ -99,7 +126,12 @@ describe('pds author feed views', () => {
           cursor,
           limit: 2,
         },
-        { headers: await network.serviceHeaders(dan) },
+        {
+          headers: await network.serviceHeaders(
+            dan,
+            ids.AppBskyFeedGetAuthorFeed,
+          ),
+        },
       )
       return res.data
     }
@@ -111,7 +143,12 @@ describe('pds author feed views', () => {
 
     const full = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[alice].handle },
-      { headers: await network.serviceHeaders(dan) },
+      {
+        headers: await network.serviceHeaders(
+          dan,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(full.data.feed.length).toEqual(4)
@@ -121,7 +158,12 @@ describe('pds author feed views', () => {
   it('fetches results unauthed.', async () => {
     const { data: authed } = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: sc.accounts[alice].handle },
-      { headers: await network.serviceHeaders(alice) },
+      {
+        headers: await network.serviceHeaders(
+          alice,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     const { data: unauthed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: sc.accounts[alice].handle,
@@ -150,7 +192,12 @@ describe('pds author feed views', () => {
   it('non-admins blocked by actor takedown.', async () => {
     const { data: preBlock } = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(preBlock.feed.length).toBeGreaterThan(0)
@@ -161,7 +208,12 @@ describe('pds author feed views', () => {
 
     const attemptAsUser = agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
     await expect(attemptAsUser).rejects.toThrow('Profile not found')
 
@@ -180,7 +232,12 @@ describe('pds author feed views', () => {
   it('blocked by record takedown.', async () => {
     const { data: preBlock } = await agent.api.app.bsky.feed.getAuthorFeed(
       { actor: alice },
-      { headers: await network.serviceHeaders(carol) },
+      {
+        headers: await network.serviceHeaders(
+          carol,
+          ids.AppBskyFeedGetAuthorFeed,
+        ),
+      },
     )
 
     expect(preBlock.feed.length).toBeGreaterThan(0)
@@ -195,7 +252,12 @@ describe('pds author feed views', () => {
       await Promise.all([
         agent.api.app.bsky.feed.getAuthorFeed(
           { actor: alice },
-          { headers: await network.serviceHeaders(carol) },
+          {
+            headers: await network.serviceHeaders(
+              carol,
+              ids.AppBskyFeedGetAuthorFeed,
+            ),
+          },
         ),
         agent.api.app.bsky.feed.getAuthorFeed(
           { actor: alice },
@@ -327,12 +389,5 @@ describe('pds author feed views', () => {
 })
 
 function isReplyTo(reply: ReplyRef, did: string) {
-  return (
-    getDidFromUri(reply.root.uri) === did &&
-    getDidFromUri(reply.parent.uri) === did
-  )
-}
-
-function getDidFromUri(uri: string) {
-  return new AtUri(uri).hostname
+  return uriToDid(reply.root.uri) === did && uriToDid(reply.parent.uri) === did
 }