Appview: enable insight into full thread context

.github/workflows/build-and-push-bsky-ghcr.yaml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-      - divy/appview-getrecord-nohost
+      - divy/mod-full-thread
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

packages/bsky/src/api/app/bsky/feed/getPostThread.ts

@@ -1,5 +1,4 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { AtUri } from '@atproto/syntax'
 import { Server } from '../../../../lexicon'
 import { isNotFoundPost } from '../../../../lexicon/types/app/bsky/feed/defs'
 import {
@@ -29,12 +28,14 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.feed.getPostThread({
     auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ params, auth, req, res }) => {
-      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)
+      const { viewer, includeTakedowns, include3pBlocks } =
+        ctx.authVerifier.parseCreds(auth)
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({
         labelers,
         viewer,
         includeTakedowns,
+        include3pBlocks,
       })
 
       let result: OutputSchema

packages/bsky/src/auth-verifier.ts

@@ -273,7 +273,7 @@ export class AuthVerifier {
   ) {
     const viewer =
       creds.credentials.type === 'standard' ? creds.credentials.iss : null
-    const includeTakedowns =
+    const includeTakedownsAnd3pBlocks =
       (creds.credentials.type === 'role' && creds.credentials.admin) ||
       creds.credentials.type === 'mod_service' ||
       (creds.credentials.type === 'standard' &&
@@ -284,7 +284,8 @@ export class AuthVerifier {
 
     return {
       viewer,
-      includeTakedowns,
+      includeTakedowns: includeTakedownsAnd3pBlocks,
+      include3pBlocks: includeTakedownsAnd3pBlocks,
       canPerformTakedown,
     }
   }

packages/bsky/src/hydration/hydrator.ts

@@ -59,12 +59,12 @@ import {
   FeedItem,
 } from './feed'
 import { ParsedLabelers } from '../util'
-import starterPack from '../data-plane/server/indexing/plugins/starter-pack'
 
 export class HydrateCtx {
   labelers = this.vals.labelers
   viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
   includeTakedowns = this.vals.includeTakedowns
+  include3pBlocks = this.vals.include3pBlocks
   constructor(private vals: HydrateCtxVals) {}
   copy<V extends Partial<HydrateCtxVals>>(vals?: V): HydrateCtx & V {
     return new HydrateCtx({ ...this.vals, ...vals }) as HydrateCtx & V
@@ -75,6 +75,7 @@ export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: string | null
   includeTakedowns?: boolean
+  include3pBlocks?: boolean
 }
 
 export type HydrationState = {
@@ -914,6 +915,7 @@ export class Hydrator {
       labelers: availableLabelers,
       viewer: vals.viewer,
       includeTakedowns: vals.includeTakedowns,
+      include3pBlocks: vals.include3pBlocks,
     })
   }
 

packages/bsky/src/views/index.ts

@@ -622,7 +622,11 @@ export class Views {
     if (!postRecord?.reply) return
     let root = this.maybePost(postRecord.reply.root.uri, state)
     let parent = this.maybePost(postRecord.reply.parent.uri, state)
-    if (state.postBlocks?.get(uri)?.reply && isPostView(parent)) {
+    if (
+      !state.ctx?.include3pBlocks &&
+      state.postBlocks?.get(uri)?.reply &&
+      isPostView(parent)
+    ) {
       parent = this.blockedPost(parent.uri, parent.author.did, state)
       // in a reply to the root of a thread, parent and root are the same post.
       if (root.uri === parent.uri) {
@@ -751,7 +755,7 @@ export class Views {
     if (height < 1) return undefined
     const parentUri = state.posts?.get(childUri)?.record.reply?.parent.uri
     if (!parentUri) return undefined
-    if (state.postBlocks?.get(childUri)?.reply) {
+    if (!state.ctx?.include3pBlocks && state.postBlocks?.get(childUri)?.reply) {
       return this.blockedPost(parentUri, creatorFromUri(parentUri), state)
     }
     const post = this.post(parentUri, state)
@@ -782,7 +786,7 @@ export class Views {
       if (postInfo?.violatesThreadGate) {
         return undefined
       }
-      if (state.postBlocks?.get(uri)?.reply) {
+      if (!state.ctx?.include3pBlocks && state.postBlocks?.get(uri)?.reply) {
         return undefined
       }
       const post = this.post(uri, state)
@@ -935,7 +939,7 @@ export class Views {
     const parsedUri = new AtUri(uri)
     if (
       this.viewerBlockExists(parsedUri.hostname, state) ||
-      state.postBlocks?.get(postUri)?.embed
+      (!state.ctx?.include3pBlocks && state.postBlocks?.get(postUri)?.embed)
     ) {
       return this.embedBlocked(uri, state)
     }