@atproto/bsky 0.0.48 → 0.0.50

package/src/views/index.ts

@@ -16,10 +16,12 @@ import {
   NotFoundPost,
   PostView,
   ReasonRepost,
+  ReplyRef,
   ThreadViewPost,
   ThreadgateView,
   isPostView,
 } from '../lexicon/types/app/bsky/feed/defs'
+import { isRecord as isPostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { ListView, ListViewBasic } from '../lexicon/types/app/bsky/graph/defs'
 import { creatorFromUri, parseThreadGate, cidFromBlobJson } from './util'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
@@ -334,7 +336,7 @@ export class Views {
     originatorBlocked: boolean
     authorMuted: boolean
     authorBlocked: boolean
-    parentAuthorBlocked: boolean
+    ancestorAuthorBlocked: boolean
   } {
     const authorDid = creatorFromUri(item.post.uri)
     const originatorDid = item.repost
@@ -343,14 +345,19 @@ export class Views {
     const post = state.posts?.get(item.post.uri)
     const parentUri = post?.record.reply?.parent.uri
     const parentAuthorDid = parentUri && creatorFromUri(parentUri)
+    const parent = parentUri ? state.posts?.get(parentUri) : undefined
+    const grandparentUri = parent?.record.reply?.parent.uri
+    const grandparentAuthorDid =
+      grandparentUri && creatorFromUri(grandparentUri)
     return {
       originatorMuted: this.viewerMuteExists(originatorDid, state),
       originatorBlocked: this.viewerBlockExists(originatorDid, state),
       authorMuted: this.viewerMuteExists(authorDid, state),
       authorBlocked: this.viewerBlockExists(authorDid, state),
-      parentAuthorBlocked: parentAuthorDid
-        ? this.viewerBlockExists(parentAuthorDid, state)
-        : false,
+      ancestorAuthorBlocked:
+        (!!parentAuthorDid && this.viewerBlockExists(parentAuthorDid, state)) ||
+        (!!grandparentAuthorDid &&
+          this.viewerBlockExists(grandparentAuthorDid, state)),
     }
   }
 
@@ -477,7 +484,7 @@ export class Views {
     }
   }
 
-  replyRef(uri: string, state: HydrationState) {
+  replyRef(uri: string, state: HydrationState): ReplyRef | undefined {
     const postRecord = state.posts?.get(uri.toString())?.record
     if (!postRecord?.reply) return
     let root = this.maybePost(postRecord.reply.root.uri, state)
@@ -489,7 +496,18 @@ export class Views {
         root = parent
       }
     }
-    return root && parent ? { root, parent } : undefined
+    let grandparentAuthor: ProfileViewBasic | undefined
+    if (isPostRecord(parent.record) && parent.record.reply) {
+      grandparentAuthor = this.profileBasic(
+        creatorFromUri(parent.record.reply.parent.uri),
+        state,
+      )
+    }
+    return {
+      root,
+      parent,
+      grandparentAuthor,
+    }
   }
 
   maybePost(uri: string, state: HydrationState): MaybePostView {

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -342,6 +342,7 @@ Array [
 exports[`feed generation getFeed paginates, handling replies and reposts. 1`] = `
 Array [
   Object {
+    "feedContext": "item-0",
     "post": Object {
       "author": Object {
         "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
@@ -401,6 +402,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-1",
     "post": Object {
       "author": Object {
         "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
@@ -435,6 +437,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-2",
     "post": Object {
       "author": Object {
         "did": "user(4)",
@@ -554,6 +557,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-4",
     "post": Object {
       "author": Object {
         "did": "user(4)",
@@ -678,6 +682,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-5",
     "post": Object {
       "author": Object {
         "did": "user(6)",
@@ -865,6 +870,7 @@ Array [
 exports[`feed generation getFeed resolves basic feed contents without auth. 1`] = `
 Array [
   Object {
+    "feedContext": "item-0",
     "post": Object {
       "author": Object {
         "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
@@ -919,6 +925,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-2",
     "post": Object {
       "author": Object {
         "did": "user(2)",
@@ -1023,6 +1030,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-4",
     "post": Object {
       "author": Object {
         "did": "user(2)",
@@ -1135,6 +1143,7 @@ Array [
 exports[`feed generation getFeed resolves basic feed contents. 1`] = `
 Array [
   Object {
+    "feedContext": "item-0",
     "post": Object {
       "author": Object {
         "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
@@ -1194,6 +1203,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-2",
     "post": Object {
       "author": Object {
         "did": "user(2)",
@@ -1313,6 +1323,7 @@ Array [
     },
   },
   Object {
+    "feedContext": "item-4",
     "post": Object {
       "author": Object {
         "did": "user(2)",

package/tests/data-plane/__snapshots__/indexing.test.ts.snap

@@ -86,6 +86,15 @@ Array [
           "viewer": Object {},
         },
         "reply": Object {
+          "grandparentAuthor": Object {
+            "did": "user(0)",
+            "handle": "alice.test",
+            "labels": Array [],
+            "viewer": Object {
+              "blockedBy": false,
+              "muted": false,
+            },
+          },
           "parent": Object {
             "$type": "app.bsky.feed.defs#postView",
             "author": Object {

package/tests/feed-generation.test.ts

@@ -543,7 +543,7 @@ describe('feed generation', () => {
             repost: sc.reposts[sc.dids.carol][0].uriStr,
           },
         },
-      ]
+      ].map((item, i) => ({ ...item, feedContext: `item-${i}` })) // add a deterministic context to test passthrough
       const offset = cursor ? parseInt(cursor, 10) : 0
       const fullFeed = candidates.filter((_, i) => {
         if (feedName === 'even') {

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

@@ -55,6 +55,32 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "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",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -1194,6 +1220,33 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(2)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(2)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(1)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -1630,6 +1683,34 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(3)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(3)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(2)",
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {

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

@@ -193,12 +193,50 @@ Object {
         },
         "text": "alice replies to dan",
       },
-      "replyCount": 0,
+      "replyCount": 1,
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {},
     },
-    "replies": Array [],
+    "replies": Array [
+      Object {
+        "$type": "app.bsky.feed.defs#threadViewPost",
+        "post": Object {
+          "author": Object {
+            "did": "user(3)",
+            "handle": "carol.test",
+            "labels": Array [],
+            "viewer": Object {
+              "blockedBy": false,
+              "muted": false,
+            },
+          },
+          "cid": "cids(4)",
+          "indexedAt": "1970-01-01T00:00:00.000Z",
+          "labels": Array [],
+          "likeCount": 0,
+          "record": Object {
+            "$type": "app.bsky.feed.post",
+            "createdAt": "1970-01-01T00:00:00.000Z",
+            "reply": Object {
+              "parent": Object {
+                "cid": "cids(0)",
+                "uri": "record(0)",
+              },
+              "root": Object {
+                "cid": "cids(3)",
+                "uri": "record(4)",
+              },
+            },
+            "text": "carol replies to alice's reply to dan",
+          },
+          "replyCount": 0,
+          "repostCount": 0,
+          "uri": "record(5)",
+          "viewer": Object {},
+        },
+      },
+    ],
   },
 }
 `;

package/tests/views/__snapshots__/list-feed.test.ts.snap

@@ -57,6 +57,34 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(3)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(3)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(2)",
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {

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

@@ -1457,6 +1457,32 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "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",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -1889,6 +1915,32 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "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",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -3259,6 +3311,34 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(5)@jpeg",
+        "did": "user(1)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(7)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(1)",
+            "uri": "record(8)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(7)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(1)",
+            "uri": "record(8)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(7)",
+          "following": "record(6)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -4436,6 +4516,34 @@ Array [
       "viewer": Object {},
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(5)@jpeg",
+        "did": "user(1)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(7)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(1)",
+            "uri": "record(8)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(7)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(1)",
+            "uri": "record(8)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(7)",
+          "following": "record(6)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
@@ -5188,6 +5296,33 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
     },
     "reply": Object {
+      "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "did": "user(0)",
+        "displayName": "ali",
+        "handle": "alice.test",
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(2)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(2)",
+            "val": "self-label-b",
+          },
+        ],
+        "viewer": Object {
+          "blockedBy": false,
+          "followedBy": "record(1)",
+          "muted": false,
+        },
+      },
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {

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

@@ -1,6 +1,11 @@
 import AtpAgent, { AtUri } from '@atproto/api'
 import { TestNetwork, SeedClient, authorFeedSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewerFromPost } from '../_util'
+import {
+  forSnapshot,
+  paginateAll,
+  stripViewer,
+  stripViewerFromPost,
+} from '../_util'
 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'
@@ -132,6 +137,9 @@ describe('pds author feed views', () => {
           result.reply = {
             parent: stripViewerFromPost(item.reply.parent),
             root: stripViewerFromPost(item.reply.root),
+            grandparentAuthor:
+              item.reply.grandparentAuthor &&
+              stripViewer(item.reply.grandparentAuthor),
           }
         }
         return result

package/tests/views/blocks.test.ts

@@ -37,6 +37,12 @@ describe('pds views with blocking', () => {
       sc.posts[dan][0].ref,
       'alice replies to dan',
     )
+    const _carolReplyToAliceReplyToDan = await sc.reply(
+      carol,
+      sc.posts[dan][0].ref,
+      aliceReplyToDan.ref,
+      "carol replies to alice's reply to dan",
+    )
     carolReplyToDan = await sc.reply(
       carol,
       sc.posts[dan][0].ref,
@@ -161,12 +167,13 @@ describe('pds views with blocking', () => {
       { headers: await network.serviceHeaders(carol) },
     )
 
-    // dan's posts don't appear, nor alice's reply to dan.
+    // dan's posts don't appear, nor alice's reply to dan, nor carol's reply to alice (which was a reply to dan)
     expect(
       resCarol.data.feed.some(
         (post) =>
           post.post.author.did === dan ||
-          post.reply?.parent.author?.['did'] === dan,
+          post.reply?.parent.author?.['did'] === dan ||
+          post.reply?.grandparentAuthor?.did === dan,
       ),
     ).toBeFalsy()
 
@@ -178,7 +185,8 @@ describe('pds views with blocking', () => {
       resDan.data.feed.some(
         (post) =>
           post.post.author.did === carol ||
-          post.reply?.parent.author?.['did'] === carol,
+          post.reply?.parent.author?.['did'] === carol ||
+          post.reply?.grandparentAuthor?.did === carol,
       ),
     ).toBeFalsy()
   })

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

@@ -1,6 +1,11 @@
 import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewerFromPost } from '../_util'
+import {
+  forSnapshot,
+  paginateAll,
+  stripViewer,
+  stripViewerFromPost,
+} from '../_util'
 
 describe('list feed views', () => {
   let network: TestNetwork
@@ -94,6 +99,9 @@ describe('list feed views', () => {
           result.reply = {
             parent: stripViewerFromPost(item.reply.parent),
             root: stripViewerFromPost(item.reply.root),
+            grandparentAuthor:
+              item.reply.grandparentAuthor &&
+              stripViewer(item.reply.grandparentAuthor),
           }
         }
         return result