@atproto/bsky 0.0.194 → 0.0.195

package/dist/views/threads-v2.d.ts

@@ -56,7 +56,6 @@ export declare function sortTrimFlattenThreadTree(anchorTree: ThreadTree, option
 type SortTrimFlattenOptions = {
     branchingFactor: GetPostThreadV2QueryParams['branchingFactor'];
     opDid: string;
-    prioritizeFollowedUsers: boolean;
     sort?: GetPostThreadV2QueryParams['sort'];
     viewer: HydrateCtx['viewer'];
     threadTagsBumpDown: readonly string[];

package/dist/views/threads-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"threads-v2.d.ts","sourceRoot":"","sources":["../../src/views/threads-v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"threads-v2.d.ts","sourceRoot":"","sources":["../../src/views/threads-v2.ts"],"names":[],"mappings":"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"}

package/dist/views/threads-v2.js

@@ -50,7 +50,7 @@ function applyBumping(aNode, bNode, opts) {
     if (!isPostNode(bNode)) {
         return null;
     }
-    const { opDid, prioritizeFollowedUsers, viewer, threadTagsBumpDown, threadTagsHide, } = opts;
+    const { opDid, viewer, threadTagsBumpDown, threadTagsHide } = opts;
     const maybeBump = (bump, predicateFn) => {
         const aPredicate = predicateFn(aNode);
         const bPredicate = predicateFn(bNode);
@@ -82,9 +82,7 @@ function applyBumping(aNode, bNode, opts) {
         // Followers posts.
         [
             'up',
-            (i) => i.type === 'post' &&
-                prioritizeFollowedUsers &&
-                !!i.item.value.post.author.viewer?.following,
+            (i) => i.type === 'post' && !!i.item.value.post.author.viewer?.following,
         ],
         // Bump-down tags.
         [

package/dist/views/threads-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"threads-v2.js","sourceRoot":"","sources":["../../src/views/threads-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import { asPredicate } from '@atproto/api'\nimport { HydrateCtx } from '../hydration/hydrator'\nimport { validateRecord as validatePostRecord } from '../lexicon/types/app/bsky/feed/post'\nimport {\n  ThreadItemBlocked,\n  ThreadItemNoUnauthenticated,\n  ThreadItemNotFound,\n  ThreadItemPost,\n} from '../lexicon/types/app/bsky/unspecced/defs'\nimport { ThreadItem as ThreadOtherItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'\nimport {\n  QueryParams as GetPostThreadV2QueryParams,\n  ThreadItem,\n} from '../lexicon/types/app/bsky/unspecced/getPostThreadV2'\nimport { $Typed } from '../lexicon/util'\n\ntype ThreadMaybeOtherPostNode = ThreadPostNode | ThreadOtherPostNode\ntype ThreadNodeWithReplies =\n  | ThreadPostNode\n  | ThreadOtherPostNode\n  | ThreadOtherAnchorPostNode\n\ntype ThreadItemValue<T extends ThreadItem['value']> = Omit<\n  ThreadItem,\n  'value'\n> & {\n  value: T\n}\n\nexport type ThreadItemValueBlocked = ThreadItemValue<$Typed<ThreadItemBlocked>>\n\nexport type ThreadItemValueNoUnauthenticated = ThreadItemValue<\n  $Typed<ThreadItemNoUnauthenticated>\n>\n\nexport type ThreadItemValueNotFound = ThreadItemValue<\n  $Typed<ThreadItemNotFound>\n>\n\nexport type ThreadItemValuePost = ThreadItemValue<$Typed<ThreadItemPost>>\n\ntype ThreadBlockedNode = {\n  type: 'blocked'\n  item: ThreadItemValueBlocked\n}\ntype ThreadNoUnauthenticatedNode = {\n  type: 'noUnauthenticated'\n  parent: ThreadTree | undefined\n  item: ThreadItemValueNoUnauthenticated\n}\n\ntype ThreadNotFoundNode = {\n  type: 'notFound'\n  item: ThreadItemValueNotFound\n}\n\ntype ThreadPostNode = {\n  type: 'post'\n  item: ThreadItemValuePost\n  tags: Set<string>\n  hasOPLike: boolean\n  parent: ThreadTree | undefined\n  replies: ThreadTree[] | undefined\n}\n\ntype ThreadOtherItemValue<T extends ThreadOtherItem['value']> = Omit<\n  ThreadOtherItem,\n  'value'\n> & {\n  value: T\n}\n\nexport type ThreadOtherItemValuePost = ThreadOtherItemValue<\n  $Typed<ThreadItemPost>\n>\n\n// This is an intermediary type that doesn't map to the views.\n// It is useful to differentiate between the anchor post and the replies for the hidden case,\n// while also differentiating between hidden and visible cases.\nexport type ThreadOtherAnchorPostNode = {\n  type: 'hiddenAnchor'\n  item: Omit<ThreadOtherItem, 'value'> & { value: undefined }\n  replies: ThreadOtherPostNode[] | undefined\n}\n\nexport type ThreadOtherPostNode = {\n  type: 'hiddenPost'\n  item: ThreadOtherItemValuePost\n  tags: Set<string>\n  replies: ThreadOtherPostNode[] | undefined\n}\n\nconst isNodeWithReplies = (node: ThreadTree): node is ThreadNodeWithReplies =>\n  'replies' in node && node.replies !== undefined\n\nconst isPostNode = (node: ThreadTree): node is ThreadMaybeOtherPostNode =>\n  node.type === 'post' || node.type === 'hiddenPost'\n\nexport type ThreadTreeVisible =\n  | ThreadBlockedNode\n  | ThreadNoUnauthenticatedNode\n  | ThreadNotFoundNode\n  | ThreadPostNode\n\nexport type ThreadTreeOther = ThreadOtherAnchorPostNode | ThreadOtherPostNode\n\nexport type ThreadTree = ThreadTreeVisible | ThreadTreeOther\n\n/** This function mutates the tree parameter. */\nexport function sortTrimFlattenThreadTree(\n  anchorTree: ThreadTree,\n  options: SortTrimFlattenOptions,\n) {\n  const sortedAnchorTree = sortTrimThreadTree(anchorTree, options)\n\n  return flattenTree(sortedAnchorTree)\n}\n\ntype SortTrimFlattenOptions = {\n  branchingFactor: GetPostThreadV2QueryParams['branchingFactor']\n  opDid: string\n  prioritizeFollowedUsers: boolean\n  sort?: GetPostThreadV2QueryParams['sort']\n  viewer: HydrateCtx['viewer']\n  threadTagsBumpDown: readonly string[]\n  threadTagsHide: readonly string[]\n}\n\nconst isPostRecord = asPredicate(validatePostRecord)\n\n/** This function mutates the tree parameter. */\nfunction sortTrimThreadTree(\n  n: ThreadTree,\n  opts: SortTrimFlattenOptions,\n): ThreadTree {\n  if (!isNodeWithReplies(n)) {\n    return n\n  }\n  const node: ThreadNodeWithReplies = n\n\n  if (node.replies) {\n    node.replies.sort((an: ThreadTree, bn: ThreadTree) => {\n      if (!isPostNode(an)) {\n        return 1\n      }\n      if (!isPostNode(bn)) {\n        return -1\n      }\n      const aNode: ThreadMaybeOtherPostNode = an\n      const bNode: ThreadMaybeOtherPostNode = bn\n\n      // First applies bumping.\n      const bump = applyBumping(aNode, bNode, opts)\n      if (bump !== null) {\n        return bump\n      }\n\n      // Then applies sorting.\n      return applySorting(aNode, bNode, opts)\n    })\n\n    // Trimming: after sorting, apply branching factor to all levels of replies except the anchor direct replies.\n    if (node.item.depth !== 0) {\n      node.replies = node.replies.slice(0, opts.branchingFactor)\n    }\n\n    node.replies.forEach((reply) => sortTrimThreadTree(reply, opts))\n  }\n\n  return node\n}\n\nfunction applyBumping(\n  aNode: ThreadMaybeOtherPostNode,\n  bNode: ThreadMaybeOtherPostNode,\n  opts: SortTrimFlattenOptions,\n): number | null {\n  if (!isPostNode(aNode)) {\n    return null\n  }\n  if (!isPostNode(bNode)) {\n    return null\n  }\n\n  const {\n    opDid,\n    prioritizeFollowedUsers,\n    viewer,\n    threadTagsBumpDown,\n    threadTagsHide,\n  } = opts\n\n  type BumpDirection = 'up' | 'down'\n  type BumpPredicateFn = (i: ThreadMaybeOtherPostNode) => boolean\n\n  const maybeBump = (\n    bump: BumpDirection,\n    predicateFn: BumpPredicateFn,\n  ): number | null => {\n    const aPredicate = predicateFn(aNode)\n    const bPredicate = predicateFn(bNode)\n    if (aPredicate && bPredicate) {\n      return applySorting(aNode, bNode, opts)\n    } else if (aPredicate) {\n      return bump === 'up' ? -1 : 1\n    } else if (bPredicate) {\n      return bump === 'up' ? 1 : -1\n    }\n    return null\n  }\n\n  // The order of the bumps determines the priority with which they are applied.\n  // Bumps-up applied first make the item appear higher in the list than later bumps-up.\n  // Bumps-down applied first make the item appear lower in the list than later bumps-down.\n  const bumps: [BumpDirection, BumpPredicateFn][] = [\n    /*\n      General bumps.\n    */\n    // OP replies.\n    ['up', (i) => i.item.value.post.author.did === opDid],\n    // Viewer replies.\n    ['up', (i) => i.item.value.post.author.did === viewer],\n\n    /*\n      Bumps within visible replies.\n    */\n    // Followers posts.\n    [\n      'up',\n      (i) =>\n        i.type === 'post' &&\n        prioritizeFollowedUsers &&\n        !!i.item.value.post.author.viewer?.following,\n    ],\n    // Bump-down tags.\n    [\n      'down',\n      (i) => i.type === 'post' && threadTagsBumpDown.some((t) => i.tags.has(t)),\n    ],\n    // Pushpin-only.\n    [\n      'down',\n      (i) =>\n        i.type === 'post' &&\n        isPostRecord(i.item.value.post.record) &&\n        i.item.value.post.record.text.trim() === '📌',\n    ],\n\n    /*\n      Bumps within hidden replies.\n      This determines the order of hidden replies:\n        1. hidden by threadgate.\n        2. hidden by tags.\n        3. muted by viewer.\n    */\n    // Muted account by the viewer.\n    ['down', (i) => i.type === 'hiddenPost' && i.item.value.mutedByViewer],\n    // Hidden by tags.\n    [\n      'down',\n      (i) =>\n        i.type === 'hiddenPost' && threadTagsHide.some((t) => i.tags.has(t)),\n    ],\n    // Hidden by threadgate.\n    ['down', (i) => i.type === 'hiddenPost' && i.item.value.hiddenByThreadgate],\n  ]\n\n  for (const [bump, predicateFn] of bumps) {\n    const bumpResult = maybeBump(bump, predicateFn)\n    if (bumpResult !== null) {\n      return bumpResult\n    }\n  }\n\n  return null\n}\n\nfunction applySorting(\n  aNode: ThreadMaybeOtherPostNode,\n  bNode: ThreadMaybeOtherPostNode,\n  opts: SortTrimFlattenOptions,\n): number {\n  const a = aNode.item.value\n  const b = bNode.item.value\n\n  // Only customize sort for visible posts.\n  if (aNode.type === 'post' && bNode.type === 'post') {\n    const { sort } = opts\n\n    if (sort === 'oldest') {\n      return a.post.indexedAt.localeCompare(b.post.indexedAt)\n    }\n    if (sort === 'top') {\n      const aLikes = a.post.likeCount ?? 0\n      const bLikes = b.post.likeCount ?? 0\n      const aTop = topSortValue(aLikes, aNode.hasOPLike)\n      const bTop = topSortValue(bLikes, bNode.hasOPLike)\n      if (aTop !== bTop) {\n        return bTop - aTop\n      }\n    }\n  }\n\n  // Fallback to newest.\n  return b.post.indexedAt.localeCompare(a.post.indexedAt)\n}\n\nfunction topSortValue(likeCount: number, hasOPLike: boolean): number {\n  return Math.log(3 + likeCount) * (hasOPLike ? 1.45 : 1.0)\n}\n\nfunction flattenTree(tree: ThreadTree) {\n  return [\n    // All parents above.\n    ...Array.from(\n      flattenInDirection({\n        tree,\n        direction: 'up',\n      }),\n    ),\n\n    // The anchor.\n    // In the case of hidden replies, the anchor item itself is undefined.\n    ...(tree.item.value ? [tree.item] : []),\n\n    // All replies below.\n    ...Array.from(\n      flattenInDirection({\n        tree,\n        direction: 'down',\n      }),\n    ),\n  ]\n}\n\nfunction* flattenInDirection({\n  tree,\n  direction,\n}: {\n  tree: ThreadTree\n  direction: 'up' | 'down'\n}) {\n  if (tree.type === 'noUnauthenticated') {\n    if (direction === 'up') {\n      if (tree.parent) {\n        // Unfold all parents above.\n        yield* flattenTree(tree.parent)\n      }\n    }\n  }\n\n  if (tree.type === 'post') {\n    if (direction === 'up') {\n      if (tree.parent) {\n        // Unfold all parents above.\n        yield* flattenTree(tree.parent)\n      }\n    } else {\n      // Unfold all replies below.\n      if (tree.replies?.length) {\n        for (const reply of tree.replies) {\n          yield* flattenTree(reply)\n        }\n      }\n    }\n  }\n\n  // For the first level of hidden replies, the items are undefined.\n  if (tree.type === 'hiddenAnchor' || tree.type === 'hiddenPost') {\n    if (direction === 'down') {\n      // Unfold all replies below.\n      if (tree.replies?.length) {\n        for (const reply of tree.replies) {\n          yield* flattenTree(reply)\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"threads-v2.js","sourceRoot":"","sources":["../../src/views/threads-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import { asPredicate } from '@atproto/api'\nimport { HydrateCtx } from '../hydration/hydrator'\nimport { validateRecord as validatePostRecord } from '../lexicon/types/app/bsky/feed/post'\nimport {\n  ThreadItemBlocked,\n  ThreadItemNoUnauthenticated,\n  ThreadItemNotFound,\n  ThreadItemPost,\n} from '../lexicon/types/app/bsky/unspecced/defs'\nimport { ThreadItem as ThreadOtherItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'\nimport {\n  QueryParams as GetPostThreadV2QueryParams,\n  ThreadItem,\n} from '../lexicon/types/app/bsky/unspecced/getPostThreadV2'\nimport { $Typed } from '../lexicon/util'\n\ntype ThreadMaybeOtherPostNode = ThreadPostNode | ThreadOtherPostNode\ntype ThreadNodeWithReplies =\n  | ThreadPostNode\n  | ThreadOtherPostNode\n  | ThreadOtherAnchorPostNode\n\ntype ThreadItemValue<T extends ThreadItem['value']> = Omit<\n  ThreadItem,\n  'value'\n> & {\n  value: T\n}\n\nexport type ThreadItemValueBlocked = ThreadItemValue<$Typed<ThreadItemBlocked>>\n\nexport type ThreadItemValueNoUnauthenticated = ThreadItemValue<\n  $Typed<ThreadItemNoUnauthenticated>\n>\n\nexport type ThreadItemValueNotFound = ThreadItemValue<\n  $Typed<ThreadItemNotFound>\n>\n\nexport type ThreadItemValuePost = ThreadItemValue<$Typed<ThreadItemPost>>\n\ntype ThreadBlockedNode = {\n  type: 'blocked'\n  item: ThreadItemValueBlocked\n}\ntype ThreadNoUnauthenticatedNode = {\n  type: 'noUnauthenticated'\n  parent: ThreadTree | undefined\n  item: ThreadItemValueNoUnauthenticated\n}\n\ntype ThreadNotFoundNode = {\n  type: 'notFound'\n  item: ThreadItemValueNotFound\n}\n\ntype ThreadPostNode = {\n  type: 'post'\n  item: ThreadItemValuePost\n  tags: Set<string>\n  hasOPLike: boolean\n  parent: ThreadTree | undefined\n  replies: ThreadTree[] | undefined\n}\n\ntype ThreadOtherItemValue<T extends ThreadOtherItem['value']> = Omit<\n  ThreadOtherItem,\n  'value'\n> & {\n  value: T\n}\n\nexport type ThreadOtherItemValuePost = ThreadOtherItemValue<\n  $Typed<ThreadItemPost>\n>\n\n// This is an intermediary type that doesn't map to the views.\n// It is useful to differentiate between the anchor post and the replies for the hidden case,\n// while also differentiating between hidden and visible cases.\nexport type ThreadOtherAnchorPostNode = {\n  type: 'hiddenAnchor'\n  item: Omit<ThreadOtherItem, 'value'> & { value: undefined }\n  replies: ThreadOtherPostNode[] | undefined\n}\n\nexport type ThreadOtherPostNode = {\n  type: 'hiddenPost'\n  item: ThreadOtherItemValuePost\n  tags: Set<string>\n  replies: ThreadOtherPostNode[] | undefined\n}\n\nconst isNodeWithReplies = (node: ThreadTree): node is ThreadNodeWithReplies =>\n  'replies' in node && node.replies !== undefined\n\nconst isPostNode = (node: ThreadTree): node is ThreadMaybeOtherPostNode =>\n  node.type === 'post' || node.type === 'hiddenPost'\n\nexport type ThreadTreeVisible =\n  | ThreadBlockedNode\n  | ThreadNoUnauthenticatedNode\n  | ThreadNotFoundNode\n  | ThreadPostNode\n\nexport type ThreadTreeOther = ThreadOtherAnchorPostNode | ThreadOtherPostNode\n\nexport type ThreadTree = ThreadTreeVisible | ThreadTreeOther\n\n/** This function mutates the tree parameter. */\nexport function sortTrimFlattenThreadTree(\n  anchorTree: ThreadTree,\n  options: SortTrimFlattenOptions,\n) {\n  const sortedAnchorTree = sortTrimThreadTree(anchorTree, options)\n\n  return flattenTree(sortedAnchorTree)\n}\n\ntype SortTrimFlattenOptions = {\n  branchingFactor: GetPostThreadV2QueryParams['branchingFactor']\n  opDid: string\n  sort?: GetPostThreadV2QueryParams['sort']\n  viewer: HydrateCtx['viewer']\n  threadTagsBumpDown: readonly string[]\n  threadTagsHide: readonly string[]\n}\n\nconst isPostRecord = asPredicate(validatePostRecord)\n\n/** This function mutates the tree parameter. */\nfunction sortTrimThreadTree(\n  n: ThreadTree,\n  opts: SortTrimFlattenOptions,\n): ThreadTree {\n  if (!isNodeWithReplies(n)) {\n    return n\n  }\n  const node: ThreadNodeWithReplies = n\n\n  if (node.replies) {\n    node.replies.sort((an: ThreadTree, bn: ThreadTree) => {\n      if (!isPostNode(an)) {\n        return 1\n      }\n      if (!isPostNode(bn)) {\n        return -1\n      }\n      const aNode: ThreadMaybeOtherPostNode = an\n      const bNode: ThreadMaybeOtherPostNode = bn\n\n      // First applies bumping.\n      const bump = applyBumping(aNode, bNode, opts)\n      if (bump !== null) {\n        return bump\n      }\n\n      // Then applies sorting.\n      return applySorting(aNode, bNode, opts)\n    })\n\n    // Trimming: after sorting, apply branching factor to all levels of replies except the anchor direct replies.\n    if (node.item.depth !== 0) {\n      node.replies = node.replies.slice(0, opts.branchingFactor)\n    }\n\n    node.replies.forEach((reply) => sortTrimThreadTree(reply, opts))\n  }\n\n  return node\n}\n\nfunction applyBumping(\n  aNode: ThreadMaybeOtherPostNode,\n  bNode: ThreadMaybeOtherPostNode,\n  opts: SortTrimFlattenOptions,\n): number | null {\n  if (!isPostNode(aNode)) {\n    return null\n  }\n  if (!isPostNode(bNode)) {\n    return null\n  }\n\n  const { opDid, viewer, threadTagsBumpDown, threadTagsHide } = opts\n\n  type BumpDirection = 'up' | 'down'\n  type BumpPredicateFn = (i: ThreadMaybeOtherPostNode) => boolean\n\n  const maybeBump = (\n    bump: BumpDirection,\n    predicateFn: BumpPredicateFn,\n  ): number | null => {\n    const aPredicate = predicateFn(aNode)\n    const bPredicate = predicateFn(bNode)\n    if (aPredicate && bPredicate) {\n      return applySorting(aNode, bNode, opts)\n    } else if (aPredicate) {\n      return bump === 'up' ? -1 : 1\n    } else if (bPredicate) {\n      return bump === 'up' ? 1 : -1\n    }\n    return null\n  }\n\n  // The order of the bumps determines the priority with which they are applied.\n  // Bumps-up applied first make the item appear higher in the list than later bumps-up.\n  // Bumps-down applied first make the item appear lower in the list than later bumps-down.\n  const bumps: [BumpDirection, BumpPredicateFn][] = [\n    /*\n      General bumps.\n    */\n    // OP replies.\n    ['up', (i) => i.item.value.post.author.did === opDid],\n    // Viewer replies.\n    ['up', (i) => i.item.value.post.author.did === viewer],\n\n    /*\n      Bumps within visible replies.\n    */\n    // Followers posts.\n    [\n      'up',\n      (i) => i.type === 'post' && !!i.item.value.post.author.viewer?.following,\n    ],\n    // Bump-down tags.\n    [\n      'down',\n      (i) => i.type === 'post' && threadTagsBumpDown.some((t) => i.tags.has(t)),\n    ],\n    // Pushpin-only.\n    [\n      'down',\n      (i) =>\n        i.type === 'post' &&\n        isPostRecord(i.item.value.post.record) &&\n        i.item.value.post.record.text.trim() === '📌',\n    ],\n\n    /*\n      Bumps within hidden replies.\n      This determines the order of hidden replies:\n        1. hidden by threadgate.\n        2. hidden by tags.\n        3. muted by viewer.\n    */\n    // Muted account by the viewer.\n    ['down', (i) => i.type === 'hiddenPost' && i.item.value.mutedByViewer],\n    // Hidden by tags.\n    [\n      'down',\n      (i) =>\n        i.type === 'hiddenPost' && threadTagsHide.some((t) => i.tags.has(t)),\n    ],\n    // Hidden by threadgate.\n    ['down', (i) => i.type === 'hiddenPost' && i.item.value.hiddenByThreadgate],\n  ]\n\n  for (const [bump, predicateFn] of bumps) {\n    const bumpResult = maybeBump(bump, predicateFn)\n    if (bumpResult !== null) {\n      return bumpResult\n    }\n  }\n\n  return null\n}\n\nfunction applySorting(\n  aNode: ThreadMaybeOtherPostNode,\n  bNode: ThreadMaybeOtherPostNode,\n  opts: SortTrimFlattenOptions,\n): number {\n  const a = aNode.item.value\n  const b = bNode.item.value\n\n  // Only customize sort for visible posts.\n  if (aNode.type === 'post' && bNode.type === 'post') {\n    const { sort } = opts\n\n    if (sort === 'oldest') {\n      return a.post.indexedAt.localeCompare(b.post.indexedAt)\n    }\n    if (sort === 'top') {\n      const aLikes = a.post.likeCount ?? 0\n      const bLikes = b.post.likeCount ?? 0\n      const aTop = topSortValue(aLikes, aNode.hasOPLike)\n      const bTop = topSortValue(bLikes, bNode.hasOPLike)\n      if (aTop !== bTop) {\n        return bTop - aTop\n      }\n    }\n  }\n\n  // Fallback to newest.\n  return b.post.indexedAt.localeCompare(a.post.indexedAt)\n}\n\nfunction topSortValue(likeCount: number, hasOPLike: boolean): number {\n  return Math.log(3 + likeCount) * (hasOPLike ? 1.45 : 1.0)\n}\n\nfunction flattenTree(tree: ThreadTree) {\n  return [\n    // All parents above.\n    ...Array.from(\n      flattenInDirection({\n        tree,\n        direction: 'up',\n      }),\n    ),\n\n    // The anchor.\n    // In the case of hidden replies, the anchor item itself is undefined.\n    ...(tree.item.value ? [tree.item] : []),\n\n    // All replies below.\n    ...Array.from(\n      flattenInDirection({\n        tree,\n        direction: 'down',\n      }),\n    ),\n  ]\n}\n\nfunction* flattenInDirection({\n  tree,\n  direction,\n}: {\n  tree: ThreadTree\n  direction: 'up' | 'down'\n}) {\n  if (tree.type === 'noUnauthenticated') {\n    if (direction === 'up') {\n      if (tree.parent) {\n        // Unfold all parents above.\n        yield* flattenTree(tree.parent)\n      }\n    }\n  }\n\n  if (tree.type === 'post') {\n    if (direction === 'up') {\n      if (tree.parent) {\n        // Unfold all parents above.\n        yield* flattenTree(tree.parent)\n      }\n    } else {\n      // Unfold all replies below.\n      if (tree.replies?.length) {\n        for (const reply of tree.replies) {\n          yield* flattenTree(reply)\n        }\n      }\n    }\n  }\n\n  // For the first level of hidden replies, the items are undefined.\n  if (tree.type === 'hiddenAnchor' || tree.type === 'hiddenPost') {\n    if (direction === 'down') {\n      // Unfold all replies below.\n      if (tree.replies?.length) {\n        for (const reply of tree.replies) {\n          yield* flattenTree(reply)\n        }\n      }\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.194",
+  "version": "0.0.195",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -53,14 +53,14 @@
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.2.0",
     "@atproto-labs/xrpc-utils": "0.0.22",
-    "@atproto/api": "^0.17.7",
+    "@atproto/api": "^0.18.0",
     "@atproto/common": "^0.4.12",
     "@atproto/crypto": "^0.4.4",
     "@atproto/did": "^0.2.1",
     "@atproto/identity": "^0.4.9",
     "@atproto/lexicon": "^0.5.1",
     "@atproto/repo": "^0.8.10",
-    "@atproto/sync": "^0.1.35",
+    "@atproto/sync": "^0.1.36",
     "@atproto/syntax": "^0.4.1",
     "@atproto/xrpc-server": "^0.9.5"
   },
@@ -77,9 +77,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.17.7",
+    "@atproto/api": "^0.18.0",
     "@atproto/lex-cli": "^0.9.6",
-    "@atproto/pds": "^0.4.191",
+    "@atproto/pds": "^0.4.192",
     "@atproto/xrpc": "^0.7.5"
   },
   "scripts": {

package/src/api/app/bsky/feed/searchPosts.ts

@@ -1,7 +1,12 @@
 import { AtpAgent } from '@atproto/api'
 import { mapDefined } from '@atproto/common'
+import { ServerConfig } from '../../../../config'
 import { AppContext } from '../../../../context'
 import { DataPlaneClient } from '../../../../data-plane'
+import {
+  PostSearchQuery,
+  parsePostSearchQuery,
+} from '../../../../data-plane/server/util'
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { parseString } from '../../../../hydration/util'
 import { Server } from '../../../../lexicon'
@@ -21,16 +26,20 @@ export default function (server: Server, ctx: AppContext) {
   const searchPosts = createPipeline(
     skeleton,
     hydration,
-    noBlocks,
+    noBlocksOrTagged,
     presentation,
   )
   server.app.bsky.feed.searchPosts({
     auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params, req }) => {
-      const viewer = auth.credentials.iss
+      const { viewer, isModService } = ctx.authVerifier.parseCreds(auth)
+
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
-      const results = await searchPosts({ ...params, hydrateCtx }, ctx)
+      const results = await searchPosts(
+        { ...params, hydrateCtx, isModService },
+        ctx,
+      )
       return {
         encoding: 'application/json',
         body: results,
@@ -42,6 +51,9 @@ export default function (server: Server, ctx: AppContext) {
 
 const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
   const { ctx, params } = inputs
+  const parsedQuery = parsePostSearchQuery(params.q, {
+    author: params.author,
+  })
 
   if (ctx.searchAgent) {
     // @NOTE cursors won't change on appview swap
@@ -64,6 +76,7 @@ const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
     return {
       posts: res.posts.map(({ uri }) => uri),
       cursor: parseString(res.cursor),
+      parsedQuery,
     }
   }
 
@@ -75,6 +88,7 @@ const skeleton = async (inputs: SkeletonFnInput<Context, Params>) => {
   return {
     posts: res.uris,
     cursor: parseString(res.cursor),
+    parsedQuery,
   }
 }
 
@@ -88,11 +102,30 @@ const hydration = async (
   )
 }
 
-const noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
-  const { ctx, skeleton, hydration } = inputs
+const noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
+  const { ctx, params, skeleton, hydration } = inputs
+  const { parsedQuery } = skeleton
+
   skeleton.posts = skeleton.posts.filter((uri) => {
+    const post = hydration.posts?.get(uri)
+    if (!post) return
+
     const creator = creatorFromUri(uri)
-    return !ctx.views.viewerBlockExists(creator, hydration)
+    const isCuratedSearch = params.sort === 'top'
+    const isPostByViewer = creator === params.hydrateCtx.viewer
+
+    // Cases to always show.
+    if (isPostByViewer) return true
+    if (params.isModService) return true
+
+    // Cases to never show.
+    if (ctx.views.viewerBlockExists(creator, hydration)) return false
+
+    // Cases to conditionally show based on tagging.
+    const tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))
+    if (isCuratedSearch && tagged) return false
+    if (!parsedQuery.author && tagged) return false
+    return true
   })
   return skeleton
 }
@@ -101,9 +134,12 @@ const presentation = (
   inputs: PresentationFnInput<Context, Params, Skeleton>,
 ) => {
   const { ctx, skeleton, hydration } = inputs
-  const posts = mapDefined(skeleton.posts, (uri) =>
-    ctx.views.post(uri, hydration),
-  )
+  const posts = mapDefined(skeleton.posts, (uri) => {
+    const post = hydration.posts?.get(uri)
+    if (!post) return
+
+    return ctx.views.post(uri, hydration)
+  })
   return {
     posts,
     cursor: skeleton.cursor,
@@ -112,16 +148,21 @@ const presentation = (
 }
 
 type Context = {
+  cfg: ServerConfig
   dataplane: DataPlaneClient
   hydrator: Hydrator
   views: Views
   searchAgent?: AtpAgent
 }
 
-type Params = QueryParams & { hydrateCtx: HydrateCtx }
+type Params = QueryParams & {
+  hydrateCtx: HydrateCtx
+  isModService: boolean
+}
 
 type Skeleton = {
   posts: string[]
   hitsTotal?: number
   cursor?: string
+  parsedQuery: PostSearchQuery
 }

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

@@ -93,11 +93,10 @@ const hydration = async (
 const presentation = (
   inputs: PresentationFnInput<Context, Params, Skeleton>,
 ) => {
-  const { ctx, params, skeleton, hydration } = inputs
+  const { ctx, skeleton, hydration } = inputs
   const thread = ctx.views.threadOtherV2(skeleton, hydration, {
     below: BELOW,
     branchingFactor: BRANCHING_FACTOR,
-    prioritizeFollowedUsers: params.prioritizeFollowedUsers,
   })
   return { thread }
 }

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

@@ -89,7 +89,6 @@ const presentation = (
     above: calculateAbove(ctx, params),
     below: calculateBelow(ctx, skeleton.anchor, params),
     branchingFactor: params.branchingFactor,
-    prioritizeFollowedUsers: params.prioritizeFollowedUsers,
     sort: params.sort,
   })
 

package/src/auth-verifier.ts

@@ -388,12 +388,17 @@ export class AuthVerifier {
     const canPerformTakedown =
       (creds.credentials.type === 'role' && creds.credentials.admin) ||
       creds.credentials.type === 'mod_service'
+    const isModService =
+      creds.credentials.type === 'mod_service' ||
+      (creds.credentials.type === 'standard' &&
+        this.isModService(creds.credentials.iss))
 
     return {
       viewer,
       includeTakedowns: includeTakedownsAnd3pBlocks,
       include3pBlocks: includeTakedownsAnd3pBlocks,
       canPerformTakedown,
+      isModService,
     }
   }
 }

package/src/config.ts

@@ -42,6 +42,7 @@ export interface ServerConfigValues {
   courierHttpVersion?: '1.1' | '2'
   courierIgnoreBadTls?: boolean
   searchUrl?: string
+  searchTagsHide: Set<string>
   suggestionsUrl?: string
   suggestionsApiKey?: string
   topicsUrl?: string
@@ -133,6 +134,7 @@ export class ServerConfig {
       process.env.BSKY_SEARCH_URL ||
       process.env.BSKY_SEARCH_ENDPOINT ||
       undefined
+    const searchTagsHide = new Set(envList(process.env.BSKY_SEARCH_TAGS_HIDE))
     const suggestionsUrl = process.env.BSKY_SUGGESTIONS_URL || undefined
     const suggestionsApiKey = process.env.BSKY_SUGGESTIONS_API_KEY || undefined
     const topicsUrl = process.env.BSKY_TOPICS_URL || undefined
@@ -296,6 +298,7 @@ export class ServerConfig {
       dataplaneHttpVersion,
       dataplaneIgnoreBadTls,
       searchUrl,
+      searchTagsHide,
       suggestionsUrl,
       suggestionsApiKey,
       topicsUrl,
@@ -440,6 +443,10 @@ export class ServerConfig {
     return this.cfg.searchUrl
   }
 
+  get searchTagsHide() {
+    return this.cfg.searchTagsHide
+  }
+
   get suggestionsUrl() {
     return this.cfg.suggestionsUrl
   }
@@ -539,6 +546,7 @@ export class ServerConfig {
   get threadTagsHide() {
     return this.cfg.threadTagsHide
   }
+
   get threadTagsBumpDown() {
     return this.cfg.threadTagsBumpDown
   }

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

@@ -2,6 +2,7 @@ import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { IndexedAtDidKeyset, TimeCidKeyset, paginate } from '../db/pagination'
+import { parsePostSearchQuery } from '../util'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   // @TODO actor search endpoints still fall back to search service
@@ -35,12 +36,28 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   // @TODO post search endpoint still falls back to search service
   async searchPosts(req) {
     const { term, limit, cursor } = req
+    const { q, author } = parsePostSearchQuery(term)
+
+    let authorDid = author
+    if (author && !author?.startsWith('did:')) {
+      const res = await db.db
+        .selectFrom('actor')
+        .where('handle', '=', author)
+        .selectAll()
+        .executeTakeFirst()
+      authorDid = res?.did
+    }
+
     const { ref } = db.db.dynamic
     let builder = db.db
       .selectFrom('post')
-      .where('post.text', 'like', `%${term}%`)
+      .where('post.text', 'like', `%${q}%`)
       .selectAll()
 
+    if (authorDid) {
+      builder = builder.where('post.creator', '=', authorDid)
+    }
+
     const keyset = new TimeCidKeyset(ref('post.sortAt'), ref('post.cid'))
     builder = paginate(builder, {
       limit,

package/src/data-plane/server/util.ts

@@ -153,3 +153,54 @@ export const violatesThreadGate = async (
 
   return true
 }
+
+// @NOTE: This type is not complete with all supported options.
+// Only the ones that we needed to apply custom logic on are currently present.
+export type PostSearchQuery = {
+  q: string
+  author: string | undefined
+}
+
+export const parsePostSearchQuery = (
+  qParam: string,
+  params?: {
+    author?: string
+  },
+): PostSearchQuery => {
+  // Accept individual params, but give preference to options embedded in `q`.
+  let author = params?.author
+
+  const parts: string[] = []
+  let curr = ''
+  let quoted = false
+  for (const c of qParam) {
+    if (c === ' ' && !quoted) {
+      curr.trim() && parts.push(curr)
+      curr = ''
+      continue
+    }
+
+    if (c === '"') {
+      quoted = !quoted
+    }
+    curr += c
+  }
+  curr.trim() && parts.push(curr)
+
+  const qParts: string[] = []
+  for (const p of parts) {
+    const tokens = p.split(':')
+    if (tokens[0] === 'did') {
+      author = p
+    } else if (tokens[0] === 'author' || tokens[0] === 'from') {
+      author = tokens[1]
+    } else {
+      qParts.push(p)
+    }
+  }
+
+  return {
+    q: qParts.join(' '),
+    author,
+  }
+}

package/src/lexicon/index.ts

@@ -145,6 +145,7 @@ import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/ident
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
 import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
 import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+import * as ComAtprotoLexiconResolveLexicon from './types/com/atproto/lexicon/resolveLexicon.js'
 import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
 import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
 import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
@@ -2108,6 +2109,18 @@ export class ComAtprotoLexiconNS {
   constructor(server: Server) {
     this._server = server
   }
+
+  resolveLexicon<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      ComAtprotoLexiconResolveLexicon.QueryParams,
+      ComAtprotoLexiconResolveLexicon.HandlerInput,
+      ComAtprotoLexiconResolveLexicon.HandlerOutput
+    >,
+  ) {
+    const nsid = 'com.atproto.lexicon.resolveLexicon' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
 }
 
 export class ComAtprotoModerationNS {

package/src/lexicon/lexicons.ts

@@ -555,10 +555,6 @@ export const schemaDict = {
               'hotness',
             ],
           },
-          prioritizeFollowedUsers: {
-            type: 'boolean',
-            description: 'Show followed users at the top of all replies.',
-          },
         },
       },
       interestsPref: {
@@ -6799,12 +6795,6 @@ export const schemaDict = {
               description:
                 'Reference (AT-URI) to post record. This is the anchor post.',
             },
-            prioritizeFollowedUsers: {
-              type: 'boolean',
-              description:
-                'Whether to prioritize posts from followed users. It only has effect when the user is authenticated.',
-              default: false,
-            },
           },
         },
         output: {
@@ -6886,12 +6876,6 @@ export const schemaDict = {
               minimum: 0,
               maximum: 100,
             },
-            prioritizeFollowedUsers: {
-              type: 'boolean',
-              description:
-                'Whether to prioritize posts from followed users. It only has effect when the user is authenticated.',
-              default: false,
-            },
             sort: {
               type: 'string',
               description: 'Sorting for the thread replies.',
@@ -10531,6 +10515,57 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoLexiconResolveLexicon: {
+    lexicon: 1,
+    id: 'com.atproto.lexicon.resolveLexicon',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Resolves an atproto lexicon (NSID) to a schema.',
+        parameters: {
+          type: 'params',
+          properties: {
+            nsid: {
+              format: 'nsid',
+              type: 'string',
+              description: 'The lexicon NSID to resolve.',
+            },
+          },
+          required: ['nsid'],
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              cid: {
+                type: 'string',
+                format: 'cid',
+                description: 'The CID of the lexicon schema record.',
+              },
+              schema: {
+                type: 'ref',
+                ref: 'lex:com.atproto.lexicon.schema#main',
+                description: 'The resolved lexicon schema record.',
+              },
+              uri: {
+                type: 'string',
+                format: 'at-uri',
+                description: 'The AT-URI of the lexicon schema record.',
+              },
+            },
+            required: ['uri', 'cid', 'schema'],
+          },
+        },
+        errors: [
+          {
+            description: 'No lexicon was resolved for the NSID.',
+            name: 'LexiconNotFound',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoLexiconSchema: {
     lexicon: 1,
     id: 'com.atproto.lexicon.schema',
@@ -14177,6 +14212,7 @@ export const ids = {
   ComAtprotoLabelDefs: 'com.atproto.label.defs',
   ComAtprotoLabelQueryLabels: 'com.atproto.label.queryLabels',
   ComAtprotoLabelSubscribeLabels: 'com.atproto.label.subscribeLabels',
+  ComAtprotoLexiconResolveLexicon: 'com.atproto.lexicon.resolveLexicon',
   ComAtprotoLexiconSchema: 'com.atproto.lexicon.schema',
   ComAtprotoModerationCreateReport: 'com.atproto.moderation.createReport',
   ComAtprotoModerationDefs: 'com.atproto.moderation.defs',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -406,8 +406,6 @@ export interface ThreadViewPref {
     | 'random'
     | 'hotness'
     | (string & {})
-  /** Show followed users at the top of all replies. */
-  prioritizeFollowedUsers?: boolean
 }
 
 const hashThreadViewPref = 'threadViewPref'

package/src/lexicon/types/app/bsky/unspecced/getPostThreadOtherV2.ts

@@ -18,8 +18,6 @@ const id = 'app.bsky.unspecced.getPostThreadOtherV2'
 export type QueryParams = {
   /** Reference (AT-URI) to post record. This is the anchor post. */
   anchor: string
-  /** Whether to prioritize posts from followed users. It only has effect when the user is authenticated. */
-  prioritizeFollowedUsers: boolean
 }
 export type InputSchema = undefined
 

package/src/lexicon/types/app/bsky/unspecced/getPostThreadV2.ts

@@ -25,8 +25,6 @@ export type QueryParams = {
   below: number
   /** Maximum of replies to include at each level of the thread, except for the direct replies to the anchor, which are (NOTE: currently, during unspecced phase) all returned (NOTE: later they might be paginated). */
   branchingFactor: number
-  /** Whether to prioritize posts from followed users. It only has effect when the user is authenticated. */
-  prioritizeFollowedUsers: boolean
   /** Sorting for the thread replies. */
   sort: 'newest' | 'oldest' | 'top' | (string & {})
 }