@atproto/bsky 0.0.116 → 0.0.118

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

@@ -1,11 +1,24 @@
-import { AppBskyActorProfile, AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import assert from 'node:assert'
+import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, authorFeedSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import {
+  Record as Profile,
+  validateRecord as validatePostRecord,
+} from '../../src/lexicon/types/app/bsky/actor/profile'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
-import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
+import {
+  isPostView,
+  isReasonPin,
+} from '../../src/lexicon/types/app/bsky/feed/defs'
+import {
+  ReplyRef,
+  isRecord,
+  validateReplyRef,
+} from '../../src/lexicon/types/app/bsky/feed/post'
+import { asPredicate } from '../../src/lexicon/util'
 import { uriToDid } from '../../src/util/uris'
 import { VideoEmbed } from '../../src/views/types'
 import {
@@ -15,6 +28,9 @@ import {
   stripViewerFromPost,
 } from '../_util'
 
+const isValidReplyRef = asPredicate(validateReplyRef)
+const isValidProfile = asPredicate(validatePostRecord)
+
 describe('pds author feed views', () => {
   let network: TestNetwork
   let agent: AtpAgent
@@ -181,8 +197,8 @@ describe('pds author feed views', () => {
         }
         if (item.reply) {
           result.reply = {
-            parent: stripViewerFromPost(item.reply.parent),
-            root: stripViewerFromPost(item.reply.root),
+            parent: stripViewerFromPost(item.reply.parent, true),
+            root: stripViewerFromPost(item.reply.root, true),
             grandparentAuthor:
               item.reply.grandparentAuthor &&
               stripViewer(item.reply.grandparentAuthor),
@@ -291,7 +307,7 @@ describe('pds author feed views', () => {
     })
 
     expect(carolFeed.feed.length).toBeGreaterThan(0)
-    expect(
+    assert(
       carolFeed.feed.every(({ post }) => {
         const isRecordWithActorMedia =
           isEmbedRecordWithMedia(post.embed) && isImageEmbed(post.embed?.media)
@@ -300,18 +316,18 @@ describe('pds author feed views', () => {
 
         return (isRecordWithActorMedia || isActorMedia) && isFromActor
       }),
-    ).toBeTruthy()
+    )
 
     const { data: bobFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: bob,
       filter: 'posts_with_media',
     })
 
-    expect(
+    assert(
       bobFeed.feed.every(({ post }) => {
         return isImageEmbed(post.embed) && post.author.did === bob
       }),
-    ).toBeTruthy()
+    )
 
     const { data: danFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: dan,
@@ -389,14 +405,14 @@ describe('pds author feed views', () => {
       filter: 'posts_no_replies',
     })
 
-    expect(
+    assert(
       carolFeed.feed.every(({ post }) => {
         return (
           (isRecord(post.record) && !post.record.reply) ||
           (isRecord(post.record) && post.record.reply)
         )
       }),
-    ).toBeTruthy()
+    )
 
     const { data: danFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: dan,
@@ -430,7 +446,11 @@ describe('pds author feed views', () => {
     // does not include eve's replies to fred, even within her own thread.
     expect(
       eveFeed.feed.every(({ post, reply }) => {
-        if (!post || !isRecord(post.record) || !post.record.reply) {
+        if (
+          !post ||
+          !isRecord(post.record) ||
+          !isValidReplyRef(post.record.reply)
+        ) {
           return true // not a reply
         }
         const replyToEve = isReplyTo(post.record.reply, eve)
@@ -438,7 +458,7 @@ describe('pds author feed views', () => {
           reply &&
           isPostView(reply.parent) &&
           isRecord(reply.parent.record) &&
-          (!reply.parent.record.reply ||
+          (!isValidReplyRef(reply.parent.record.reply) ||
             isReplyTo(reply.parent.record.reply, eve))
         return replyToEve && replyToReplyByEve
       }),
@@ -464,12 +484,10 @@ describe('pds author feed views', () => {
         rkey: 'self',
       })
 
-      if (!AppBskyActorProfile.isRecord(profile.data.value)) {
-        throw new Error('')
-      }
+      assert(isValidProfile(profile.data.value))
 
-      const newProfile: AppBskyActorProfile.Record = {
-        ...profile,
+      const newProfile: Profile = {
+        ...profile.data.value,
         pinnedPost: {
           uri: post.ref.uriStr,
           cid: post.ref.cid.toString(),
@@ -505,8 +523,8 @@ describe('pds author feed views', () => {
 
       const pinnedPost = data.feed.at(0)
       expect(pinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(pinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeTruthy()
+      assert(pinnedPost?.post?.viewer?.pinned)
+      assert(isReasonPin(pinnedPost?.reason))
 
       const notPinnedPost = data.feed.at(1)
       expect(notPinnedPost?.post?.viewer?.pinned).toBeFalsy()
@@ -533,8 +551,8 @@ describe('pds author feed views', () => {
         (item) => item.post.uri === post.ref.uriStr,
       )
       expect(pinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(pinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeTruthy()
+      assert(pinnedPost?.post?.viewer?.pinned)
+      assert(isReasonPin(pinnedPost?.reason))
       expect(forSnapshot(page1.feed)).toMatchSnapshot()
 
       const { data: page2 } = await agent.api.app.bsky.feed.getAuthorFeed(
@@ -556,8 +574,8 @@ describe('pds author feed views', () => {
         (item) => item.post.uri === post.ref.uriStr,
       )
       expect(laterPinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(laterPinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(laterPinnedPost?.reason)).toBeFalsy()
+      assert(laterPinnedPost?.post?.viewer?.pinned)
+      expect(isReasonPin(laterPinnedPost?.reason)).toBeFalsy()
       expect(forSnapshot(page2.feed)).toMatchSnapshot()
     })
 
@@ -577,7 +595,7 @@ describe('pds author feed views', () => {
       const pinnedPost = data.feed.find(
         (item) => item.post.uri === post.ref.uriStr,
       )
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeFalsy()
+      expect(isReasonPin(pinnedPost?.reason)).toBeFalsy()
       expect(forSnapshot(data.feed)).toMatchSnapshot()
     })
 
@@ -592,12 +610,10 @@ describe('pds author feed views', () => {
         rkey: 'self',
       })
 
-      if (!AppBskyActorProfile.isRecord(profile.data.value)) {
-        throw new Error('')
-      }
+      assert(isValidProfile(profile.data.value))
 
-      const newProfile: AppBskyActorProfile.Record = {
-        ...profile,
+      const newProfile: Profile = {
+        ...profile.data.value,
         pinnedPost: {
           uri: bobPost.ref.uriStr,
           cid: bobPost.ref.cid.toString(),

package/tests/views/blocks.test.ts

@@ -2,6 +2,8 @@ import assert from 'node:assert'
 import { AtUri, AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { assertIsThreadViewPost, forSnapshot } from '../_util'
 
 describe('pds views with blocking', () => {
@@ -220,7 +222,8 @@ describe('pds views with blocking', () => {
       resCarol.data.feed.some(
         (post) =>
           post.post.author.did === dan ||
-          post.reply?.parent.author?.['did'] === dan ||
+          (isPostView(post.reply?.parent) &&
+            post.reply.parent.author.did === dan) ||
           post.reply?.grandparentAuthor?.did === dan,
       ),
     ).toBeFalsy()
@@ -235,7 +238,8 @@ describe('pds views with blocking', () => {
       resDan.data.feed.some(
         (post) =>
           post.post.author.did === carol ||
-          post.reply?.parent.author?.['did'] === carol ||
+          (isPostView(post.reply?.parent) &&
+            post.reply.parent.author.did === carol) ||
           post.reply?.grandparentAuthor?.did === carol,
       ),
     ).toBeFalsy()
@@ -658,7 +662,8 @@ describe('pds views with blocking', () => {
 
     assertIsThreadViewPost(embedThenBlock.thread)
 
-    expect(embedThenBlock.thread.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(embedThenBlock.thread.post.embed))
+    expect(embedThenBlock.thread.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
 
@@ -680,7 +685,8 @@ describe('pds views with blocking', () => {
 
     assertIsThreadViewPost(unblock.thread)
 
-    expect(unblock.thread.post?.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(unblock.thread.post?.embed))
+    expect(unblock.thread.post?.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewRecord',
     })
 
@@ -709,8 +715,8 @@ describe('pds views with blocking', () => {
         },
       )
     assertIsThreadViewPost(blockThenEmbed.thread)
-
-    expect(blockThenEmbed.thread.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(blockThenEmbed.thread.post.embed))
+    expect(blockThenEmbed.thread.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
 
@@ -753,7 +759,8 @@ describe('pds views with blocking', () => {
       (item) => item.post.uri === embedBlockedUri,
     )
     assert(embedBlockedPost)
-    expect(embedBlockedPost.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(embedBlockedPost.post.embed))
+    expect(embedBlockedPost.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
   })

package/tests/views/feed-view-post.test.ts

@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import { AppBskyFeedDefs, AtUri, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
@@ -87,8 +88,8 @@ describe('pds thread views', () => {
       throw new Error('sliceA or sliceB is undefined')
     }
 
-    expect(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.root)).toBe(true)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.parent))
+    assert(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.root))
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -129,10 +130,10 @@ describe('pds thread views', () => {
       throw new Error('sliceC is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply.parent))
     expect(sliceC.reply.parent.uri).toEqual(B.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceC.reply.root))
     expect(sliceC.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceC.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -249,10 +250,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -292,10 +293,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -338,13 +339,13 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
-    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
     /*
      * We don't walk the reply ancestors past whats available in the ReplyRef
      */
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.root)).toBe(true)
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.root))
+    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -384,13 +385,14 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
-    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
+
     /*
      * We don't walk the reply ancestors past whats available in the ReplyRef
      */
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.root)).toBe(true)
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.root))
+    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: bob, rkey: new AtUri(block.uri).rkey },
@@ -434,9 +436,9 @@ describe('pds thread views', () => {
       throw new Error('sliceD or sliceC is undefined')
     }
 
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply?.root)).toBe(true)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply?.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply?.root)).toBe(true)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply?.root))
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply?.parent))
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply?.root))
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -488,10 +490,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },

package/tests/views/labeler-service.test.ts

@@ -1,6 +1,8 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
 import { forSnapshot, stripViewerFromLabeler } from '../_util'
 
 describe('labeler service views', () => {
@@ -150,7 +152,8 @@ describe('labeler service views', () => {
     const serviceViews = await agent.api.app.bsky.labeler.getServices({
       dids: [alice],
     })
-    expect(postViews.data.posts[0].embed?.record).toMatchObject(
+    assert(isRecordEmbedView(postViews.data.posts[0].embed))
+    expect(postViews.data.posts[0].embed.record).toMatchObject(
       serviceViews.data.views[0],
     )
   })