@atproto/bsky 0.0.151 → 0.0.153

package/src/api/app/bsky/unspecced/getPostThreadHiddenV2.ts

@@ -0,0 +1,117 @@
+import { ServerConfig } from '../../../../config'
+import { AppContext } from '../../../../context'
+import { Code, DataPlaneClient, isDataplaneError } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getPostThreadHiddenV2'
+import {
+  HydrationFnInput,
+  PresentationFnInput,
+  SkeletonFnInput,
+  createPipeline,
+  noRules,
+} from '../../../../pipeline'
+import { Views } from '../../../../views'
+import { resHeaders } from '../../../util'
+
+// No parents for hidden replies (it would be the anchor post).
+const ABOVE = 0
+
+// For hidden replies we don't get more than the top-level replies.
+// To get nested replies, load the thread as one of the hidden replies as anchor.
+const BELOW = 1
+
+// It doesn't really matter since BELOW is 1, so it will not be used.
+const BRANCHING_FACTOR = 0
+
+export default function (server: Server, ctx: AppContext) {
+  const getPostThreadHidden = createPipeline(
+    skeleton,
+    hydration,
+    noRules, // handled in presentation: 3p block-violating replies are turned to #blockedPost, viewer blocks turned to #notFoundPost.
+    presentation,
+  )
+  server.app.bsky.unspecced.getPostThreadHiddenV2({
+    auth: ctx.authVerifier.optionalStandardOrRole,
+    handler: async ({ params, auth, req }) => {
+      const { viewer, includeTakedowns, include3pBlocks } =
+        ctx.authVerifier.parseCreds(auth)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns,
+        include3pBlocks,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: await getPostThreadHidden({ ...params, hydrateCtx }, ctx),
+        headers: resHeaders({
+          labelers: hydrateCtx.labelers,
+        }),
+      }
+    },
+  })
+}
+
+const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
+  const { ctx, params } = inputs
+  const anchor = await ctx.hydrator.resolveUri(params.anchor)
+  try {
+    const res = await ctx.dataplane.getThread({
+      postUri: anchor,
+      above: ABOVE,
+      below: BELOW,
+    })
+    return {
+      anchor,
+      uris: res.uris,
+    }
+  } catch (err) {
+    if (isDataplaneError(err, Code.NotFound)) {
+      return {
+        anchor,
+        uris: [],
+      }
+    } else {
+      throw err
+    }
+  }
+}
+
+const hydration = async (
+  inputs: HydrationFnInput<Context, Params, Skeleton>,
+) => {
+  const { ctx, params, skeleton } = inputs
+  return ctx.hydrator.hydrateThreadPosts(
+    skeleton.uris.map((uri) => ({ uri })),
+    params.hydrateCtx,
+  )
+}
+
+const presentation = (
+  inputs: PresentationFnInput<Context, Params, Skeleton>,
+) => {
+  const { ctx, params, skeleton, hydration } = inputs
+  const thread = ctx.views.threadHiddenV2(skeleton, hydration, {
+    below: BELOW,
+    branchingFactor: BRANCHING_FACTOR,
+    prioritizeFollowedUsers: params.prioritizeFollowedUsers,
+  })
+  return { thread }
+}
+
+type Context = {
+  dataplane: DataPlaneClient
+  hydrator: Hydrator
+  views: Views
+  cfg: ServerConfig
+}
+
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
+
+type Skeleton = {
+  anchor: string
+  uris: string[]
+}

package/src/api/app/bsky/unspecced/getPostThreadV2.ts

@@ -0,0 +1,130 @@
+import { ServerConfig } from '../../../../config'
+import { AppContext } from '../../../../context'
+import { Code, DataPlaneClient, isDataplaneError } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getPostThreadV2'
+import {
+  HydrationFnInput,
+  PresentationFnInput,
+  SkeletonFnInput,
+  createPipeline,
+  noRules,
+} from '../../../../pipeline'
+import { postUriToThreadgateUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
+import { resHeaders } from '../../../util'
+
+export default function (server: Server, ctx: AppContext) {
+  const getPostThread = createPipeline(
+    skeleton,
+    hydration,
+    noRules, // handled in presentation: 3p block-violating replies are turned to #blockedPost, viewer blocks turned to #notFoundPost.
+    presentation,
+  )
+  server.app.bsky.unspecced.getPostThreadV2({
+    auth: ctx.authVerifier.optionalStandardOrRole,
+    handler: async ({ params, auth, req }) => {
+      const { viewer, includeTakedowns, include3pBlocks } =
+        ctx.authVerifier.parseCreds(auth)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns,
+        include3pBlocks,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: await getPostThread({ ...params, hydrateCtx }, ctx),
+        headers: resHeaders({
+          labelers: hydrateCtx.labelers,
+        }),
+      }
+    },
+  })
+}
+
+const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
+  const { ctx, params } = inputs
+  const anchor = await ctx.hydrator.resolveUri(params.anchor)
+  try {
+    const res = await ctx.dataplane.getThread({
+      postUri: anchor,
+      above: calculateAbove(ctx, params),
+      below: calculateBelow(ctx, anchor, params),
+    })
+    return {
+      anchor,
+      uris: res.uris,
+    }
+  } catch (err) {
+    if (isDataplaneError(err, Code.NotFound)) {
+      return {
+        anchor,
+        uris: [],
+      }
+    } else {
+      throw err
+    }
+  }
+}
+
+const hydration = async (
+  inputs: HydrationFnInput<Context, Params, Skeleton>,
+) => {
+  const { ctx, params, skeleton } = inputs
+  return ctx.hydrator.hydrateThreadPosts(
+    skeleton.uris.map((uri) => ({ uri })),
+    params.hydrateCtx,
+  )
+}
+
+const presentation = (
+  inputs: PresentationFnInput<Context, Params, Skeleton>,
+) => {
+  const { ctx, params, skeleton, hydration } = inputs
+  const { hasHiddenReplies, thread } = ctx.views.threadV2(skeleton, hydration, {
+    above: calculateAbove(ctx, params),
+    below: calculateBelow(ctx, skeleton.anchor, params),
+    branchingFactor: params.branchingFactor,
+    prioritizeFollowedUsers: params.prioritizeFollowedUsers,
+    sort: params.sort,
+  })
+
+  const rootUri =
+    hydration.posts?.get(skeleton.anchor)?.record.reply?.root.uri ??
+    skeleton.anchor
+  const threadgate = ctx.views.threadgate(
+    postUriToThreadgateUri(rootUri),
+    hydration,
+  )
+  return { hasHiddenReplies, thread, threadgate }
+}
+
+type Context = {
+  dataplane: DataPlaneClient
+  hydrator: Hydrator
+  views: Views
+  cfg: ServerConfig
+}
+
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
+
+type Skeleton = {
+  anchor: string
+  uris: string[]
+}
+
+const calculateAbove = (ctx: Context, params: Params) => {
+  return params.above ? ctx.cfg.maxThreadParents : 0
+}
+
+const calculateBelow = (ctx: Context, anchor: string, params: Params) => {
+  let maxDepth = ctx.cfg.maxThreadDepth
+  if (ctx.cfg.bigThreadUris.has(anchor) && ctx.cfg.bigThreadDepth) {
+    maxDepth = ctx.cfg.bigThreadDepth
+  }
+  return maxDepth ? Math.min(maxDepth, params.below) : params.below
+}

package/src/api/com/atproto/repo/getRecord.ts

@@ -25,7 +25,10 @@ export default function (server: Server, ctx: AppContext) {
       const result = await ctx.hydrator.getRecord(uri, includeTakedowns)
 
       if (!result || (cid && result.cid !== cid)) {
-        throw new InvalidRequestError(`Could not locate record: ${uri}`)
+        throw new InvalidRequestError(
+          `Could not locate record: ${uri}`,
+          'RecordNotFound',
+        )
       }
 
       return {

package/src/api/index.ts

@@ -49,6 +49,8 @@ import registerPush from './app/bsky/notification/registerPush'
 import updateSeen from './app/bsky/notification/updateSeen'
 import getConfig from './app/bsky/unspecced/getConfig'
 import getPopularFeedGenerators from './app/bsky/unspecced/getPopularFeedGenerators'
+import getPostThreadHiddenV2 from './app/bsky/unspecced/getPostThreadHiddenV2'
+import getPostThreadV2 from './app/bsky/unspecced/getPostThreadV2'
 import getUnspeccedSuggestedFeeds from './app/bsky/unspecced/getSuggestedFeeds'
 import getSuggestedStarterPacks from './app/bsky/unspecced/getSuggestedStarterPacks'
 import getSuggestedUsers from './app/bsky/unspecced/getSuggestedUsers'
@@ -82,6 +84,8 @@ export default function (server: Server, ctx: AppContext) {
   getListFeed(server, ctx)
   getQuotes(server, ctx)
   getPostThread(server, ctx)
+  getPostThreadHiddenV2(server, ctx)
+  getPostThreadV2(server, ctx)
   getPosts(server, ctx)
   searchPosts(server, ctx)
   getActorLikes(server, ctx)

package/src/config.ts

@@ -56,6 +56,9 @@ export interface ServerConfigValues {
   bigThreadUris: Set<string>
   bigThreadDepth?: number
   maxThreadDepth?: number
+  maxThreadParents: number
+  threadTagsHide: Set<string>
+  threadTagsBumpDown: Set<string>
   // notifications
   notificationsDelayMs?: number
   // client config
@@ -191,6 +194,13 @@ export class ServerConfig {
     const maxThreadDepth = process.env.BSKY_MAX_THREAD_DEPTH
       ? parseInt(process.env.BSKY_MAX_THREAD_DEPTH || '', 10)
       : undefined
+    const maxThreadParents = process.env.BSKY_MAX_THREAD_PARENTS
+      ? parseInt(process.env.BSKY_MAX_THREAD_PARENTS || '', 10)
+      : 50
+    const threadTagsHide = new Set(envList(process.env.BSKY_THREAD_TAGS_HIDE))
+    const threadTagsBumpDown = new Set(
+      envList(process.env.BSKY_THREAD_TAGS_BUMP_DOWN),
+    )
 
     const notificationsDelayMs = process.env.BSKY_NOTIFICATIONS_DELAY_MS
       ? parseInt(process.env.BSKY_NOTIFICATIONS_DELAY_MS || '', 10)
@@ -258,6 +268,9 @@ export class ServerConfig {
       bigThreadUris,
       bigThreadDepth,
       maxThreadDepth,
+      maxThreadParents,
+      threadTagsHide,
+      threadTagsBumpDown,
       notificationsDelayMs,
       disableSsrfProtection,
       proxyAllowHTTP2,
@@ -458,6 +471,17 @@ export class ServerConfig {
     return this.cfg.maxThreadDepth
   }
 
+  get maxThreadParents() {
+    return this.cfg.maxThreadParents
+  }
+
+  get threadTagsHide() {
+    return this.cfg.threadTagsHide
+  }
+  get threadTagsBumpDown() {
+    return this.cfg.threadTagsBumpDown
+  }
+
   get notificationsDelayMs() {
     return this.cfg.notificationsDelayMs ?? 0
   }

package/src/data-plane/server/db/migrations/20250528T221913281Z-add-record-tags.ts

@@ -0,0 +1,9 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('record').addColumn('tags', 'jsonb').execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('record').dropColumn('tags').execute()
+}

package/src/data-plane/server/db/migrations/index.ts

@@ -49,3 +49,4 @@ export * as _20250116T222618297Z from './20250116T222618297Z-post-embed-video'
 export * as _20250207T174822012Z from './20250207T174822012Z-add-label-exp'
 export * as _20250404T163421487Z from './20250404T163421487Z-verifications'
 export * as _20250526T023712742Z from './20250526T023712742Z-like-repost-via'
+export * as _20250528T221913281Z from './20250528T221913281Z-add-record-tags'

package/src/data-plane/server/db/tables/record.ts

@@ -5,6 +5,7 @@ export interface Record {
   json: string
   indexedAt: string
   takedownRef: string | null
+  tags: string[] | null
 }
 
 export const tableName = 'record'

package/src/data-plane/server/routes/records.ts

@@ -61,6 +61,7 @@ export const getRecords =
         sortedAt: compositeTime(createdAt, indexedAt),
         takenDown: !!row?.takedownRef,
         takedownRef: row?.takedownRef ?? undefined,
+        tags: row?.tags ?? undefined,
       })
     })
     return { records }

package/src/hydration/feed.ts

@@ -25,6 +25,7 @@ export type Post = RecordInfo<PostRecord> & {
   violatesEmbeddingRules: boolean
   hasThreadGate: boolean
   hasPostGate: boolean
+  tags: Set<string>
 }
 export type Posts = HydrationMap<Post>
 
@@ -37,6 +38,7 @@ export type PostViewerState = {
 export type PostViewerStates = HydrationMap<PostViewerState>
 
 export type ThreadContext = {
+  // Whether the root author has liked the post.
   like?: string
 }
 
@@ -112,6 +114,7 @@ export class FeedHydrator {
       const violatesEmbeddingRules = res.meta[i].violatesEmbeddingRules
       const hasThreadGate = res.meta[i].hasThreadGate
       const hasPostGate = res.meta[i].hasPostGate
+      const tags = new Set<string>(res.records[i].tags ?? [])
       return acc.set(
         uri,
         record
@@ -121,6 +124,7 @@ export class FeedHydrator {
               violatesEmbeddingRules,
               hasThreadGate,
               hasPostGate,
+              tags,
             }
           : null,
       )

package/src/index.ts

@@ -125,6 +125,8 @@ export class BskyAppView {
       imgUriBuilder: imgUriBuilder,
       videoUriBuilder: videoUriBuilder,
       indexedAtEpoch: config.indexedAtEpoch,
+      threadTagsBumpDown: [...config.threadTagsBumpDown],
+      threadTagsHide: [...config.threadTagsHide],
     })
 
     const bsyncClient = createBsyncClient({

package/src/lexicon/index.ts

@@ -108,8 +108,8 @@ import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGene
 import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
 import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
 import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
-import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
 import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
 import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
 import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
 import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
@@ -145,6 +145,8 @@ import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
 import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+import * as AppBskyUnspeccedGetPostThreadHiddenV2 from './types/app/bsky/unspecced/getPostThreadHiddenV2.js'
+import * as AppBskyUnspeccedGetPostThreadV2 from './types/app/bsky/unspecced/getPostThreadV2.js'
 import * as AppBskyUnspeccedGetSuggestedFeeds from './types/app/bsky/unspecced/getSuggestedFeeds.js'
 import * as AppBskyUnspeccedGetSuggestedFeedsSkeleton from './types/app/bsky/unspecced/getSuggestedFeedsSkeleton.js'
 import * as AppBskyUnspeccedGetSuggestedStarterPacks from './types/app/bsky/unspecced/getSuggestedStarterPacks.js'
@@ -1497,25 +1499,25 @@ export class AppBskyFeedNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
-  getPosts<AV extends AuthVerifier>(
+  getPostThread<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
-      AppBskyFeedGetPosts.Handler<ExtractAuth<AV>>,
-      AppBskyFeedGetPosts.HandlerReqCtx<ExtractAuth<AV>>
+      AppBskyFeedGetPostThread.Handler<ExtractAuth<AV>>,
+      AppBskyFeedGetPostThread.HandlerReqCtx<ExtractAuth<AV>>
     >,
   ) {
-    const nsid = 'app.bsky.feed.getPosts' // @ts-ignore
+    const nsid = 'app.bsky.feed.getPostThread' // @ts-ignore
     return this._server.xrpc.method(nsid, cfg)
   }
 
-  getPostThread<AV extends AuthVerifier>(
+  getPosts<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
-      AppBskyFeedGetPostThread.Handler<ExtractAuth<AV>>,
-      AppBskyFeedGetPostThread.HandlerReqCtx<ExtractAuth<AV>>
+      AppBskyFeedGetPosts.Handler<ExtractAuth<AV>>,
+      AppBskyFeedGetPosts.HandlerReqCtx<ExtractAuth<AV>>
     >,
   ) {
-    const nsid = 'app.bsky.feed.getPostThread' // @ts-ignore
+    const nsid = 'app.bsky.feed.getPosts' // @ts-ignore
     return this._server.xrpc.method(nsid, cfg)
   }
 
@@ -1944,6 +1946,28 @@ export class AppBskyUnspeccedNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getPostThreadHiddenV2<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyUnspeccedGetPostThreadHiddenV2.Handler<ExtractAuth<AV>>,
+      AppBskyUnspeccedGetPostThreadHiddenV2.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.unspecced.getPostThreadHiddenV2' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getPostThreadV2<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyUnspeccedGetPostThreadV2.Handler<ExtractAuth<AV>>,
+      AppBskyUnspeccedGetPostThreadV2.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.unspecced.getPostThreadV2' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getSuggestedFeeds<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,