@atproto/bsky 0.0.150 → 0.0.152

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/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,7 @@ export interface ServerConfigValues {
   bigThreadUris: Set<string>
   bigThreadDepth?: number
   maxThreadDepth?: number
+  maxThreadParents: number
   // notifications
   notificationsDelayMs?: number
   // client config
@@ -191,6 +192,9 @@ 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 notificationsDelayMs = process.env.BSKY_NOTIFICATIONS_DELAY_MS
       ? parseInt(process.env.BSKY_NOTIFICATIONS_DELAY_MS || '', 10)
@@ -258,6 +262,7 @@ export class ServerConfig {
       bigThreadUris,
       bigThreadDepth,
       maxThreadDepth,
+      maxThreadParents,
       notificationsDelayMs,
       disableSsrfProtection,
       proxyAllowHTTP2,
@@ -458,6 +463,10 @@ export class ServerConfig {
     return this.cfg.maxThreadDepth
   }
 
+  get maxThreadParents() {
+    return this.cfg.maxThreadParents
+  }
+
   get notificationsDelayMs() {
     return this.cfg.notificationsDelayMs ?? 0
   }

package/src/data-plane/server/db/migrations/20250526T023712742Z-like-repost-via.ts

@@ -0,0 +1,17 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('like').addColumn('via', 'varchar').execute()
+  await db.schema.alterTable('like').addColumn('viaCid', 'varchar').execute()
+
+  await db.schema.alterTable('repost').addColumn('via', 'varchar').execute()
+  await db.schema.alterTable('repost').addColumn('viaCid', 'varchar').execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('like').dropColumn('via').execute()
+  await db.schema.alterTable('like').dropColumn('viaCid').execute()
+
+  await db.schema.alterTable('repost').dropColumn('via').execute()
+  await db.schema.alterTable('repost').dropColumn('viaCid').execute()
+}

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

@@ -48,3 +48,4 @@ export * as _20241114T153108102Z from './20241114T153108102Z-add-starter-packs-n
 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'

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

@@ -8,6 +8,8 @@ export interface Like {
   creator: string
   subject: string
   subjectCid: string
+  via: string | null
+  viaCid: string | null
   createdAt: string
   indexedAt: string
   sortAt: GeneratedAlways<string>

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

@@ -8,6 +8,8 @@ export interface Repost {
   creator: string
   subject: string
   subjectCid: string
+  via: string | null
+  viaCid: string | null
   createdAt: string
   indexedAt: string
   sortAt: GeneratedAlways<string>

package/src/data-plane/server/indexing/plugins/like.ts

@@ -1,4 +1,4 @@
-import { Selectable } from 'kysely'
+import { Insertable, Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
@@ -6,10 +6,13 @@ import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
 import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { Notification } from '../../db/tables/notification'
 import { countAll, excluded } from '../../db/util'
 import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedLike
+
+type Notif = Insertable<Notification>
 type IndexedLike = Selectable<DatabaseSchemaType['like']>
 
 const insertFn = async (
@@ -27,6 +30,8 @@ const insertFn = async (
       creator: uri.host,
       subject: obj.subject.uri,
       subjectCid: obj.subject.cid,
+      via: obj.via?.uri,
+      viaCid: obj.via?.cid,
       createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
@@ -53,20 +58,45 @@ const findDuplicate = async (
 const notifsForInsert = (obj: IndexedLike) => {
   const subjectUri = new AtUri(obj.subject)
   // prevent self-notifications
-  const isSelf = subjectUri.host === obj.creator
-  return isSelf
-    ? []
-    : [
+  const isLikeFromSubjectUser = subjectUri.host === obj.creator
+  if (isLikeFromSubjectUser) {
+    return []
+  }
+
+  const notifs: Notif[] = [
+    // Notification to the author of the liked record.
+    {
+      did: subjectUri.host,
+      author: obj.creator,
+      recordUri: obj.uri,
+      recordCid: obj.cid,
+      reason: 'like' as const,
+      reasonSubject: subjectUri.toString(),
+      sortAt: obj.sortAt,
+    },
+  ]
+
+  if (obj.via) {
+    const viaUri = new AtUri(obj.via)
+    const isLikeFromViaSubjectUser = viaUri.host === obj.creator
+    // prevent self-notifications
+    if (!isLikeFromViaSubjectUser) {
+      notifs.push(
+        // Notification to the reposter via whose repost the like was made.
         {
-          did: subjectUri.host,
+          did: viaUri.host,
           author: obj.creator,
           recordUri: obj.uri,
           recordCid: obj.cid,
-          reason: 'like' as const,
-          reasonSubject: subjectUri.toString(),
+          reason: 'like-via-repost' as const,
+          reasonSubject: viaUri.toString(),
           sortAt: obj.sortAt,
         },
-      ]
+      )
+    }
+  }
+
+  return notifs
 }
 
 const deleteFn = async (

package/src/data-plane/server/indexing/plugins/repost.ts

@@ -1,4 +1,4 @@
-import { Selectable } from 'kysely'
+import { Insertable, Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
@@ -6,10 +6,12 @@ import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
 import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { Notification } from '../../db/tables/notification'
 import { countAll, excluded } from '../../db/util'
 import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedRepost
+type Notif = Insertable<Notification>
 type IndexedRepost = Selectable<DatabaseSchemaType['repost']>
 
 const insertFn = async (
@@ -25,6 +27,8 @@ const insertFn = async (
     creator: uri.host,
     subject: obj.subject.uri,
     subjectCid: obj.subject.cid,
+    via: obj.via?.uri,
+    viaCid: obj.via?.cid,
     createdAt: normalizeDatetimeAlways(obj.createdAt),
     indexedAt: timestamp,
   }
@@ -72,20 +76,45 @@ const findDuplicate = async (
 const notifsForInsert = (obj: IndexedRepost) => {
   const subjectUri = new AtUri(obj.subject)
   // prevent self-notifications
-  const isSelf = subjectUri.host === obj.creator
-  return isSelf
-    ? []
-    : [
+  const isRepostFromSubjectUser = subjectUri.host === obj.creator
+  if (isRepostFromSubjectUser) {
+    return []
+  }
+
+  const notifs: Notif[] = [
+    // Notification to the author of the reposted record.
+    {
+      did: subjectUri.host,
+      author: obj.creator,
+      recordUri: obj.uri,
+      recordCid: obj.cid,
+      reason: 'repost' as const,
+      reasonSubject: subjectUri.toString(),
+      sortAt: obj.sortAt,
+    },
+  ]
+
+  if (obj.via) {
+    const viaUri = new AtUri(obj.via)
+    const isRepostFromViaSubjectUser = viaUri.host === obj.creator
+    // prevent self-notifications
+    if (!isRepostFromViaSubjectUser) {
+      notifs.push(
+        // Notification to the reposter via whose repost the repost was made.
         {
-          did: subjectUri.host,
+          did: viaUri.host,
           author: obj.creator,
           recordUri: obj.uri,
           recordCid: obj.cid,
-          reason: 'repost' as const,
-          reasonSubject: subjectUri.toString(),
+          reason: 'repost-via-repost' as const,
+          reasonSubject: viaUri.toString(),
           sortAt: obj.sortAt,
         },
-      ]
+      )
+    }
+  }
+
+  return notifs
 }
 
 const deleteFn = async (

package/src/hydration/feed.ts

@@ -37,6 +37,7 @@ export type PostViewerState = {
 export type PostViewerStates = HydrationMap<PostViewerState>
 
 export type ThreadContext = {
+  // Whether the root author has liked the post.
   like?: string
 }
 

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,