Appview: add grandparent author to reply ref, ensure no replies to bl…

…ocked grandparent in feeds (#2461) * lexicon: add parent reply author to #replyRef * lexicon: tweak to naming in reply ref * appview: hydrate and present grandparent author in feed items * appview: ensure replies to blocked users don't appear in feeds via reply parents * fix snaps * fix snaps
bluesky-social · May 2, 2024 · ec40af0 · ec40af0
1 parent 173ef27
commit ec40af0
Show file tree

Hide file tree

Showing 26 changed files with 493 additions and 31 deletions.
diff --git a/lexicons/app/bsky/feed/defs.json b/lexicons/app/bsky/feed/defs.json
@@ -68,6 +68,11 @@
         "parent": {
           "type": "union",
           "refs": ["#postView", "#notFoundPost", "#blockedPost"]
+        },
+        "grandparentAuthor": {
+          "type": "ref",
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "description": "When parent is a reply to another post, this is the author of that post."
         }
       }
     },

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -4833,6 +4833,12 @@ export const schemaDict = {
               'lex:app.bsky.feed.defs#blockedPost',
             ],
           },
+          grandparentAuthor: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileViewBasic',
+            description:
+              'When parent is a reply to another post, this is the author of that post.',
+          },
         },
       },
       reasonRepost: {
@@ -9164,7 +9170,6 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventMuteReporter',
                   'lex:tools.ozone.moderation.defs#modEventUnmuteReporter',
                   'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
-                  'lex:tools.ozone.moderation.defs#modEventUnmute',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                 ],

diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -97,6 +97,7 @@ export interface ReplyRef {
     | NotFoundPost
     | BlockedPost
     | { $type: string; [k: string]: unknown }
+  grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
   [k: string]: unknown
 }
 

diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -25,7 +25,6 @@ export interface InputSchema {
     | ToolsOzoneModerationDefs.ModEventMuteReporter
     | ToolsOzoneModerationDefs.ModEventUnmuteReporter
     | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventUnmute
     | ToolsOzoneModerationDefs.ModEventEmail
     | ToolsOzoneModerationDefs.ModEventTag
     | { $type: string; [k: string]: unknown }

diff --git a/packages/bsky/src/api/app/bsky/feed/getFeed.ts b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
@@ -115,7 +115,7 @@ const noBlocksOrMutes = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
       !bam.authorMuted &&
       !bam.originatorBlocked &&
       !bam.originatorMuted &&
-      !bam.parentAuthorBlocked
+      !bam.ancestorAuthorBlocked
     )
   })
   return skeleton

diff --git a/packages/bsky/src/api/app/bsky/feed/getListFeed.ts b/packages/bsky/src/api/app/bsky/feed/getListFeed.ts
@@ -87,7 +87,7 @@ const noBlocksOrMutes = (inputs: {
       !bam.authorMuted &&
       !bam.originatorBlocked &&
       !bam.originatorMuted &&
-      !bam.parentAuthorBlocked
+      !bam.ancestorAuthorBlocked
     )
   })
   return skeleton

diff --git a/packages/bsky/src/api/app/bsky/feed/getTimeline.ts b/packages/bsky/src/api/app/bsky/feed/getTimeline.ts
@@ -90,7 +90,7 @@ const noBlocksOrMutes = (inputs: {
       !bam.authorMuted &&
       !bam.originatorBlocked &&
       !bam.originatorMuted &&
-      !bam.parentAuthorBlocked
+      !bam.ancestorAuthorBlocked
     )
   })
   return skeleton

diff --git a/packages/bsky/src/hydration/hydrator.ts b/packages/bsky/src/hydration/hydrator.ts
@@ -395,7 +395,7 @@ export class Hydrator {
   }
 
   // app.bsky.feed.defs#feedViewPost
-  // - post (+ replies)
+  // - post (+ replies w/ reply parent author)
   //   - profile
   //     - list basic
   //   - list
@@ -413,22 +413,46 @@ export class Hydrator {
     items: FeedItem[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
-    const postUris = items.map((item) => item.post.uri)
-    const repostUris = mapDefined(items, (item) => item.repost?.uri)
-    const [posts, reposts, repostProfileState] = await Promise.all([
-      this.feed.getPosts(postUris, ctx.includeTakedowns),
-      this.feed.getReposts(repostUris, ctx.includeTakedowns),
-      this.hydrateProfiles(repostUris.map(didFromUri), ctx),
-    ])
+    // get posts, collect reply refs
+    const posts = await this.feed.getPosts(
+      items.map((item) => item.post.uri),
+      ctx.includeTakedowns,
+    )
+    const rootUris: string[] = []
+    const parentUris: string[] = []
     const postAndReplyRefs: ItemRef[] = []
     posts.forEach((post, uri) => {
       if (!post) return
       postAndReplyRefs.push({ uri, cid: post.cid })
       if (post.record.reply) {
+        rootUris.push(post.record.reply.root.uri)
+        parentUris.push(post.record.reply.parent.uri)
         postAndReplyRefs.push(post.record.reply.root, post.record.reply.parent)
       }
     })
-    const postState = await this.hydratePosts(postAndReplyRefs, ctx, { posts })
+    // get replies, collect reply parent authors
+    const replies = await this.feed.getPosts(
+      [...rootUris, ...parentUris],
+      ctx.includeTakedowns,
+    )
+    const replyParentAuthors: string[] = []
+    parentUris.forEach((uri) => {
+      const parent = replies.get(uri)
+      if (!parent?.record.reply) return
+      replyParentAuthors.push(didFromUri(parent.record.reply.parent.uri))
+    })
+    // hydrate state for all posts, reposts, authors of reposts + reply parent authors
+    const repostUris = mapDefined(items, (item) => item.repost?.uri)
+    const [postState, repostProfileState, reposts] = await Promise.all([
+      this.hydratePosts(postAndReplyRefs, ctx, {
+        posts: posts.merge(replies), // avoids refetches of posts
+      }),
+      this.hydrateProfiles(
+        [...repostUris.map(didFromUri), ...replyParentAuthors],
+        ctx,
+      ),
+      this.feed.getReposts(repostUris, ctx.includeTakedowns),
+    ])
     return mergeManyStates(postState, repostProfileState, {
       reposts,
       ctx,

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -4833,6 +4833,12 @@ export const schemaDict = {
               'lex:app.bsky.feed.defs#blockedPost',
             ],
           },
+          grandparentAuthor: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileViewBasic',
+            description:
+              'When parent is a reply to another post, this is the author of that post.',
+          },
         },
       },
       reasonRepost: {

diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -97,6 +97,7 @@ export interface ReplyRef {
     | NotFoundPost
     | BlockedPost
     | { $type: string; [k: string]: unknown }
+  grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
   [k: string]: unknown
 }
 

diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/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 {

diff --git a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap b/packages/bsky/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 {

diff --git a/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap b/packages/bsky/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 {