@atproto/bsky 0.0.195 → 0.0.197

package/src/index.ts

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

package/src/proto/bsky_pb.ts

@@ -775,6 +775,16 @@ export class GetPostRecordsRequest extends Message<GetPostRecordsRequest> {
    */
   uris: string[] = [];
 
+  /**
+   * @generated from field: optional string process_dynamic_tags_for_view = 2;
+   */
+  processDynamicTagsForView?: string;
+
+  /**
+   * @generated from field: optional string viewer_did = 3;
+   */
+  viewerDid?: string;
+
   constructor(data?: PartialMessage<GetPostRecordsRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -784,6 +794,8 @@ export class GetPostRecordsRequest extends Message<GetPostRecordsRequest> {
   static readonly typeName = "bsky.GetPostRecordsRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "uris", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
+    { no: 2, name: "process_dynamic_tags_for_view", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 3, name: "viewer_did", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GetPostRecordsRequest {

package/src/views/index.ts

@@ -1,5 +1,6 @@
 import { HOUR, MINUTE, mapDefined } from '@atproto/common'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
+import { FeatureGateID } from '../feature-gates'
 import { Actor, ProfileViewerState } from '../hydration/actor'
 import { FeedItem, Like, Post, Repost } from '../hydration/feed'
 import { Follow, Verification } from '../hydration/graph'
@@ -139,6 +140,8 @@ export class Views {
   public indexedAtEpoch: Date | undefined = this.opts.indexedAtEpoch
   private threadTagsBumpDown: readonly string[] = this.opts.threadTagsBumpDown
   private threadTagsHide: readonly string[] = this.opts.threadTagsHide
+  private visibilityTagHide: string = this.opts.visibilityTagHide
+  private visibilityTagRankPrefix: string = this.opts.visibilityTagRankPrefix
   constructor(
     private opts: {
       imgUriBuilder: ImageUriBuilder
@@ -146,6 +149,8 @@ export class Views {
       indexedAtEpoch: Date | undefined
       threadTagsBumpDown: readonly string[]
       threadTagsHide: readonly string[]
+      visibilityTagHide: string
+      visibilityTagRankPrefix: string
     },
   ) {}
 
@@ -1367,14 +1372,21 @@ export class Views {
       }
     }
 
-    const thread = sortTrimFlattenThreadTree(anchorTree, {
-      opDid,
-      branchingFactor,
-      sort,
-      viewer: state.ctx?.viewer ?? null,
-      threadTagsBumpDown: this.threadTagsBumpDown,
-      threadTagsHide: this.threadTagsHide,
-    })
+    const thread = sortTrimFlattenThreadTree(
+      anchorTree,
+      {
+        opDid,
+        branchingFactor,
+        sort,
+        viewer: state.ctx?.viewer ?? null,
+        threadTagsBumpDown: this.threadTagsBumpDown,
+        threadTagsHide: this.threadTagsHide,
+        visibilityTagRankPrefix: this.visibilityTagRankPrefix,
+      },
+      state.ctx?.featureGates.get(
+        FeatureGateID.ThreadsV2ReplyRankingExploration,
+      ),
+    )
 
     return {
       hasOtherReplies,
@@ -1734,13 +1746,20 @@ export class Views {
       ),
     }
 
-    return sortTrimFlattenThreadTree(anchorTree, {
-      opDid,
-      branchingFactor,
-      viewer: state.ctx?.viewer ?? null,
-      threadTagsBumpDown: this.threadTagsBumpDown,
-      threadTagsHide: this.threadTagsHide,
-    })
+    return sortTrimFlattenThreadTree(
+      anchorTree,
+      {
+        opDid,
+        branchingFactor,
+        viewer: state.ctx?.viewer ?? null,
+        threadTagsBumpDown: this.threadTagsBumpDown,
+        threadTagsHide: this.threadTagsHide,
+        visibilityTagRankPrefix: this.visibilityTagRankPrefix,
+      },
+      state.ctx?.featureGates.get(
+        FeatureGateID.ThreadsV2ReplyRankingExploration,
+      ),
+    )
   }
 
   private threadOtherV2Replies(
@@ -1933,21 +1952,32 @@ export class Views {
     const opDid = creatorFromUri(rootUri)
     const authorDid = creatorFromUri(uri)
 
-    const showBecauseFollowing = !!postView.author.viewer?.following
-    const hiddenByTag =
-      authorDid !== opDid &&
-      authorDid !== state.ctx?.viewer &&
-      !showBecauseFollowing &&
-      this.threadTagsHide.some((t) => post.tags.has(t))
+    let hiddenByTag = false
+    if (
+      state.ctx?.featureGates.get(
+        FeatureGateID.ThreadsV2ReplyRankingExploration,
+      )
+    ) {
+      hiddenByTag = authorDid !== opDid && post.tags.has(this.visibilityTagHide)
+    } else {
+      const showBecauseFollowing = !!postView.author.viewer?.following
+      hiddenByTag =
+        authorDid !== opDid &&
+        authorDid !== state.ctx?.viewer &&
+        !showBecauseFollowing &&
+        this.threadTagsHide.some((t) => post.tags.has(t))
+    }
 
     const hiddenByThreadgate =
       state.ctx?.viewer !== authorDid &&
       this.replyIsHiddenByThreadgate(uri, rootUri, state)
 
     const mutedByViewer = this.viewerMuteExists(authorDid, state)
+    const isPushPin =
+      isPostRecord(post.record) && post.record.text.trim() === '📌'
 
     return {
-      isOther: hiddenByTag || hiddenByThreadgate || mutedByViewer,
+      isOther: hiddenByTag || hiddenByThreadgate || mutedByViewer || isPushPin,
       hiddenByTag,
       hiddenByThreadgate,
       mutedByViewer,

package/src/views/threads-v2.ts

@@ -1,6 +1,4 @@
-import { asPredicate } from '@atproto/api'
 import { HydrateCtx } from '../hydration/hydrator'
-import { validateRecord as validatePostRecord } from '../lexicon/types/app/bsky/feed/post'
 import {
   ThreadItemBlocked,
   ThreadItemNoUnauthenticated,
@@ -110,8 +108,11 @@ export type ThreadTree = ThreadTreeVisible | ThreadTreeOther
 export function sortTrimFlattenThreadTree(
   anchorTree: ThreadTree,
   options: SortTrimFlattenOptions,
+  useExploration?: boolean,
 ) {
-  const sortedAnchorTree = sortTrimThreadTree(anchorTree, options)
+  const sortedAnchorTree = useExploration
+    ? sortTrimThreadTreeExploration(anchorTree, options)
+    : sortTrimThreadTree(anchorTree, options)
 
   return flattenTree(sortedAnchorTree)
 }
@@ -123,10 +124,9 @@ type SortTrimFlattenOptions = {
   viewer: HydrateCtx['viewer']
   threadTagsBumpDown: readonly string[]
   threadTagsHide: readonly string[]
+  visibilityTagRankPrefix: string
 }
 
-const isPostRecord = asPredicate(validatePostRecord)
-
 /** This function mutates the tree parameter. */
 function sortTrimThreadTree(
   n: ThreadTree,
@@ -227,14 +227,6 @@ function applyBumping(
       'down',
       (i) => i.type === 'post' && threadTagsBumpDown.some((t) => i.tags.has(t)),
     ],
-    // Pushpin-only.
-    [
-      'down',
-      (i) =>
-        i.type === 'post' &&
-        isPostRecord(i.item.value.post.record) &&
-        i.item.value.post.record.text.trim() === '📌',
-    ],
 
     /*
       Bumps within hidden replies.
@@ -367,3 +359,154 @@ function* flattenInDirection({
     }
   }
 }
+
+export function sortTrimThreadTreeExploration(
+  n: ThreadTree,
+  opts: SortTrimFlattenOptions,
+): ThreadTree {
+  if (!isNodeWithReplies(n)) {
+    return n
+  }
+  const node: ThreadNodeWithReplies = n
+
+  if (node.replies) {
+    node.replies.sort((an: ThreadTree, bn: ThreadTree) => {
+      if (!isPostNode(an)) {
+        return 1
+      }
+      if (!isPostNode(bn)) {
+        return -1
+      }
+      const aNode: ThreadMaybeOtherPostNode = an
+      const bNode: ThreadMaybeOtherPostNode = bn
+
+      // First applies bumping.
+      const bump = applyBumpingExploration(aNode, bNode, opts)
+      if (bump !== null) {
+        return bump
+      }
+
+      // Then applies sorting.
+      return applySortingExploration(aNode, bNode, opts)
+    })
+
+    // Trimming: after sorting, apply branching factor to all levels of replies except the anchor direct replies.
+    if (node.item.depth !== 0) {
+      node.replies = node.replies.slice(0, opts.branchingFactor)
+    }
+
+    node.replies.forEach((reply) => sortTrimThreadTreeExploration(reply, opts))
+  }
+
+  return node
+}
+
+function applyBumpingExploration(
+  aNode: ThreadMaybeOtherPostNode,
+  bNode: ThreadMaybeOtherPostNode,
+  opts: SortTrimFlattenOptions,
+): number | null {
+  if (!isPostNode(aNode)) {
+    return null
+  }
+  if (!isPostNode(bNode)) {
+    return null
+  }
+
+  const { opDid, viewer } = opts
+
+  type BumpDirection = 'up' | 'down'
+  type BumpPredicateFn = (i: ThreadMaybeOtherPostNode) => boolean
+
+  const maybeBump = (
+    bump: BumpDirection,
+    predicateFn: BumpPredicateFn,
+  ): number | null => {
+    const aPredicate = predicateFn(aNode)
+    const bPredicate = predicateFn(bNode)
+    if (aPredicate && bPredicate) {
+      return applySortingExploration(aNode, bNode, opts)
+    } else if (aPredicate) {
+      return bump === 'up' ? -1 : 1
+    } else if (bPredicate) {
+      return bump === 'up' ? 1 : -1
+    }
+    return null
+  }
+
+  // The order of the bumps determines the priority with which they are applied.
+  // Bumps-up applied first make the item appear higher in the list than later bumps-up.
+  // Bumps-down applied first make the item appear lower in the list than later bumps-down.
+  const bumps: [BumpDirection, BumpPredicateFn][] = [
+    /*
+      General bumps.
+    */
+    // OP replies.
+    ['up', (i) => i.item.value.post.author.did === opDid],
+    // Viewer replies.
+    ['up', (i) => i.item.value.post.author.did === viewer],
+  ]
+
+  for (const [bump, predicateFn] of bumps) {
+    const bumpResult = maybeBump(bump, predicateFn)
+    if (bumpResult !== null) {
+      return bumpResult
+    }
+  }
+
+  return null
+}
+
+function applySortingExploration(
+  aNode: ThreadMaybeOtherPostNode,
+  bNode: ThreadMaybeOtherPostNode,
+  opts: SortTrimFlattenOptions,
+): number {
+  const { visibilityTagRankPrefix: rp } = opts
+
+  const a = aNode.item.value
+  const ar = !rp ? 0 : parseRankFromTag(rp, findRankTag(aNode.tags, rp))
+  const b = bNode.item.value
+  const br = !rp ? 0 : parseRankFromTag(rp, findRankTag(bNode.tags, rp))
+
+  // Only customize sort for visible posts.
+  if (aNode.type === 'post' && bNode.type === 'post') {
+    const { sort } = opts
+
+    if (sort === 'oldest') {
+      return a.post.indexedAt.localeCompare(b.post.indexedAt)
+    }
+    if (sort === 'top') {
+      const aLikes = a.post.likeCount ?? 0
+      const bLikes = b.post.likeCount ?? 0
+      const aTop = topSortValue(aLikes, aNode.hasOPLike)
+      const bTop = topSortValue(bLikes, bNode.hasOPLike)
+      const aRank = aTop + ar
+      const bRank = bTop + br
+      if (aRank !== bRank) {
+        return bRank - aRank
+      }
+    }
+  }
+
+  // Fallback to newest.
+  return b.post.indexedAt.localeCompare(a.post.indexedAt)
+}
+
+function findRankTag(tags: Set<string>, prefix: string) {
+  return Array.from(tags.values()).find((tag) => tag.startsWith(prefix))
+}
+
+function parseRankFromTag(prefix: string, tag?: string) {
+  if (!tag) return 0
+
+  try {
+    const rank = parseInt(tag.slice(prefix.length), 10)
+    if (typeof rank !== 'number' || isNaN(rank)) {
+      return 0
+    }
+    return rank
+  } catch (e) {
+    return 0
+  }
+}