@atproto/bsky 0.0.154 → 0.0.156

package/src/lexicon/lexicons.ts

@@ -7239,6 +7239,48 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyFeedGetPosts: {
+    lexicon: 1,
+    id: 'app.bsky.feed.getPosts',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          "Gets post views for a specified list of posts (by AT-URI). This is sometimes referred to as 'hydrating' a 'feed skeleton'.",
+        parameters: {
+          type: 'params',
+          required: ['uris'],
+          properties: {
+            uris: {
+              type: 'array',
+              description: 'List of post AT-URIs to return hydrated views for.',
+              items: {
+                type: 'string',
+                format: 'at-uri',
+              },
+              maxLength: 25,
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['posts'],
+            properties: {
+              posts: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.feed.defs#postView',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyFeedGetPostThread: {
     lexicon: 1,
     id: 'app.bsky.feed.getPostThread',
@@ -7303,48 +7345,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyFeedGetPosts: {
-    lexicon: 1,
-    id: 'app.bsky.feed.getPosts',
-    defs: {
-      main: {
-        type: 'query',
-        description:
-          "Gets post views for a specified list of posts (by AT-URI). This is sometimes referred to as 'hydrating' a 'feed skeleton'.",
-        parameters: {
-          type: 'params',
-          required: ['uris'],
-          properties: {
-            uris: {
-              type: 'array',
-              description: 'List of post AT-URIs to return hydrated views for.',
-              items: {
-                type: 'string',
-                format: 'at-uri',
-              },
-              maxLength: 25,
-            },
-          },
-        },
-        output: {
-          encoding: 'application/json',
-          schema: {
-            type: 'object',
-            required: ['posts'],
-            properties: {
-              posts: {
-                type: 'array',
-                items: {
-                  type: 'ref',
-                  ref: 'lex:app.bsky.feed.defs#postView',
-                },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
   AppBskyFeedGetQuotes: {
     lexicon: 1,
     id: 'app.bsky.feed.getQuotes',
@@ -10354,14 +10354,14 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyUnspeccedGetPostThreadHiddenV2: {
+  AppBskyUnspeccedGetPostThreadOtherV2: {
     lexicon: 1,
-    id: 'app.bsky.unspecced.getPostThreadHiddenV2',
+    id: 'app.bsky.unspecced.getPostThreadOtherV2',
     defs: {
       main: {
         type: 'query',
         description:
-          "(NOTE: this endpoint is under development and WILL change without notice. Don't use it until it is moved out of `unspecced` or your application WILL break) Get the hidden posts in a thread. It is based in an anchor post at any depth of the tree, and returns hidden replies (recursive replies, with branching to their replies) below the anchor. It does not include ancestors nor the anchor. This should be called after exhausting `app.bsky.unspecced.getPostThreadV2`. Does not require auth, but additional metadata and filtering will be applied for authed requests.",
+          "(NOTE: this endpoint is under development and WILL change without notice. Don't use it until it is moved out of `unspecced` or your application WILL break) Get additional posts under a thread e.g. replies hidden by threadgate. Based on an anchor post at any depth of the tree, returns top-level replies below that anchor. It does not include ancestors nor the anchor itself. This should be called after exhausting `app.bsky.unspecced.getPostThreadV2`. Does not require auth, but additional metadata and filtering will be applied for authed requests.",
         parameters: {
           type: 'params',
           required: ['anchor'],
@@ -10389,17 +10389,17 @@ export const schemaDict = {
               thread: {
                 type: 'array',
                 description:
-                  'A flat list of hidden thread items. The depth of each item is indicated by the depth property inside the item.',
+                  'A flat list of other thread items. The depth of each item is indicated by the depth property inside the item.',
                 items: {
                   type: 'ref',
-                  ref: 'lex:app.bsky.unspecced.getPostThreadHiddenV2#threadHiddenItem',
+                  ref: 'lex:app.bsky.unspecced.getPostThreadOtherV2#threadItem',
                 },
               },
             },
           },
         },
       },
-      threadHiddenItem: {
+      threadItem: {
         type: 'object',
         required: ['uri', 'depth', 'value'],
         properties: {
@@ -10477,7 +10477,7 @@ export const schemaDict = {
           encoding: 'application/json',
           schema: {
             type: 'object',
-            required: ['thread', 'hasHiddenReplies'],
+            required: ['thread', 'hasOtherReplies'],
             properties: {
               thread: {
                 type: 'array',
@@ -10492,10 +10492,10 @@ export const schemaDict = {
                 type: 'ref',
                 ref: 'lex:app.bsky.feed.defs#threadgateView',
               },
-              hasHiddenReplies: {
+              hasOtherReplies: {
                 type: 'boolean',
                 description:
-                  'Whether this thread has hidden replies. If true, a call can be made to the `getPostThreadHiddenV2` endpoint to retrieve them.',
+                  'Whether this thread has additional replies. If true, a call can be made to the `getPostThreadOtherV2` endpoint to retrieve them.',
               },
             },
           },
@@ -12892,8 +12892,8 @@ export const ids = {
   AppBskyFeedGetFeedSkeleton: 'app.bsky.feed.getFeedSkeleton',
   AppBskyFeedGetLikes: 'app.bsky.feed.getLikes',
   AppBskyFeedGetListFeed: 'app.bsky.feed.getListFeed',
-  AppBskyFeedGetPostThread: 'app.bsky.feed.getPostThread',
   AppBskyFeedGetPosts: 'app.bsky.feed.getPosts',
+  AppBskyFeedGetPostThread: 'app.bsky.feed.getPostThread',
   AppBskyFeedGetQuotes: 'app.bsky.feed.getQuotes',
   AppBskyFeedGetRepostedBy: 'app.bsky.feed.getRepostedBy',
   AppBskyFeedGetSuggestedFeeds: 'app.bsky.feed.getSuggestedFeeds',
@@ -12950,8 +12950,8 @@ export const ids = {
   AppBskyUnspeccedGetConfig: 'app.bsky.unspecced.getConfig',
   AppBskyUnspeccedGetPopularFeedGenerators:
     'app.bsky.unspecced.getPopularFeedGenerators',
-  AppBskyUnspeccedGetPostThreadHiddenV2:
-    'app.bsky.unspecced.getPostThreadHiddenV2',
+  AppBskyUnspeccedGetPostThreadOtherV2:
+    'app.bsky.unspecced.getPostThreadOtherV2',
   AppBskyUnspeccedGetPostThreadV2: 'app.bsky.unspecced.getPostThreadV2',
   AppBskyUnspeccedGetSuggestedFeeds: 'app.bsky.unspecced.getSuggestedFeeds',
   AppBskyUnspeccedGetSuggestedFeedsSkeleton:

package/src/lexicon/types/app/bsky/unspecced/{getPostThreadHiddenV2.ts → getPostThreadOtherV2.ts}

@@ -15,7 +15,7 @@ import type * as AppBskyUnspeccedDefs from './defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
-const id = 'app.bsky.unspecced.getPostThreadHiddenV2'
+const id = 'app.bsky.unspecced.getPostThreadOtherV2'
 
 export interface QueryParams {
   /** Reference (AT-URI) to post record. This is the anchor post. */
@@ -27,8 +27,8 @@ export interface QueryParams {
 export type InputSchema = undefined
 
 export interface OutputSchema {
-  /** A flat list of hidden thread items. The depth of each item is indicated by the depth property inside the item. */
-  thread: ThreadHiddenItem[]
+  /** A flat list of other thread items. The depth of each item is indicated by the depth property inside the item. */
+  thread: ThreadItem[]
 }
 
 export type HandlerInput = undefined
@@ -57,20 +57,20 @@ export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
 ) => Promise<HandlerOutput> | HandlerOutput
 
-export interface ThreadHiddenItem {
-  $type?: 'app.bsky.unspecced.getPostThreadHiddenV2#threadHiddenItem'
+export interface ThreadItem {
+  $type?: 'app.bsky.unspecced.getPostThreadOtherV2#threadItem'
   uri: string
   /** The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths. */
   depth: number
   value: $Typed<AppBskyUnspeccedDefs.ThreadItemPost> | { $type: string }
 }
 
-const hashThreadHiddenItem = 'threadHiddenItem'
+const hashThreadItem = 'threadItem'
 
-export function isThreadHiddenItem<V>(v: V) {
-  return is$typed(v, id, hashThreadHiddenItem)
+export function isThreadItem<V>(v: V) {
+  return is$typed(v, id, hashThreadItem)
 }
 
-export function validateThreadHiddenItem<V>(v: V) {
-  return validate<ThreadHiddenItem & V>(v, id, hashThreadHiddenItem)
+export function validateThreadItem<V>(v: V) {
+  return validate<ThreadItem & V>(v, id, hashThreadItem)
 }

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

@@ -39,8 +39,8 @@ export interface OutputSchema {
   /** A flat list of thread items. The depth of each item is indicated by the depth property inside the item. */
   thread: ThreadItem[]
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  /** Whether this thread has hidden replies. If true, a call can be made to the `getPostThreadHiddenV2` endpoint to retrieve them. */
-  hasHiddenReplies: boolean
+  /** Whether this thread has additional replies. If true, a call can be made to the `getPostThreadOtherV2` endpoint to retrieve them. */
+  hasOtherReplies: boolean
 }
 
 export type HandlerInput = undefined

package/src/views/index.ts

@@ -59,7 +59,7 @@ import {
   isRecord as isLabelerRecord,
 } from '../lexicon/types/app/bsky/labeler/service'
 import { RecordDeleted as NotificationRecordDeleted } from '../lexicon/types/app/bsky/notification/defs'
-import { ThreadHiddenItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadHiddenV2'
+import { ThreadItem as ThreadOtherItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
 import {
   QueryParams as GetPostThreadV2QueryParams,
   ThreadItem,
@@ -75,13 +75,13 @@ import {
   uriToDid as creatorFromUri,
 } from '../util/uris'
 import {
-  ThreadHiddenAnchorPostNode,
-  ThreadHiddenItemValuePost,
-  ThreadHiddenPostNode,
   ThreadItemValueBlocked,
   ThreadItemValueNoUnauthenticated,
   ThreadItemValueNotFound,
   ThreadItemValuePost,
+  ThreadOtherAnchorPostNode,
+  ThreadOtherItemValuePost,
+  ThreadOtherPostNode,
   ThreadTree,
   ThreadTreeVisible,
   sortTrimFlattenThreadTree,
@@ -1161,7 +1161,7 @@ export class Views {
       prioritizeFollowedUsers: boolean
       sort: GetPostThreadV2QueryParams['sort']
     },
-  ): { hasHiddenReplies: boolean; thread: ThreadItem[] } {
+  ): { hasOtherReplies: boolean; thread: ThreadItem[] } {
     const { anchor: anchorUri, uris } = skeleton
 
     // Not found.
@@ -1169,7 +1169,7 @@ export class Views {
     const post = state.posts?.get(anchorUri)
     if (!post || !postView) {
       return {
-        hasHiddenReplies: false,
+        hasOtherReplies: false,
         thread: [
           this.threadV2ItemNotFound({
             uri: anchorUri,
@@ -1182,7 +1182,7 @@ export class Views {
     // Blocked (only 1p for anchor).
     if (this.viewerBlockExists(postView.author.did, state)) {
       return {
-        hasHiddenReplies: false,
+        hasOtherReplies: false,
         thread: [
           this.threadV2ItemBlocked({
             uri: anchorUri,
@@ -1229,7 +1229,7 @@ export class Views {
 
     const anchorDepth = 0 // The depth of the anchor post is always 0.
     let anchorTree: ThreadTree
-    let hasHiddenReplies = false
+    let hasOtherReplies = false
 
     if (this.noUnauthenticatedPost(state, postView)) {
       anchorTree = {
@@ -1241,7 +1241,7 @@ export class Views {
         parent,
       }
     } else {
-      const { replies, hasHiddenReplies: hasHiddenRepliesShadow } =
+      const { replies, hasOtherReplies: hasOtherRepliesShadow } =
         !anchorViolatesThreadGate
           ? this.threadV2Replies(
               {
@@ -1257,8 +1257,8 @@ export class Views {
               },
               state,
             )
-          : { replies: undefined, hasHiddenReplies: false }
-      hasHiddenReplies = hasHiddenRepliesShadow
+          : { replies: undefined, hasOtherReplies: false }
+      hasOtherReplies = hasOtherRepliesShadow
 
       anchorTree = {
         type: 'post',
@@ -1287,7 +1287,7 @@ export class Views {
     })
 
     return {
-      hasHiddenReplies,
+      hasOtherReplies,
       thread,
     }
   }
@@ -1432,14 +1432,14 @@ export class Views {
       prioritizeFollowedUsers: boolean
     },
     state: HydrationState,
-  ): { replies: ThreadTreeVisible[] | undefined; hasHiddenReplies: boolean } {
+  ): { replies: ThreadTreeVisible[] | undefined; hasOtherReplies: boolean } {
     // Reached the `below` limit.
     if (depth > below) {
-      return { replies: undefined, hasHiddenReplies: false }
+      return { replies: undefined, hasOtherReplies: false }
     }
 
     const childrenUris = childrenByParentUri[parentUri] ?? []
-    let hasHiddenReplies = false
+    let hasOtherReplies = false
     const replies = mapDefined(childrenUris, (uri) => {
       const replyInclusion = this.checkThreadV2ReplyInclusion({
         uri,
@@ -1452,14 +1452,14 @@ export class Views {
       const { authorDid, post, postView } = replyInclusion
 
       // Hidden.
-      const { isHidden } = this.isHiddenThreadPost(
+      const { isOther } = this.isOtherThreadPost(
         { post, postView, prioritizeFollowedUsers, rootUri, uri },
         state,
       )
-      if (isHidden) {
+      if (isOther) {
         // Only care about anchor replies
         if (depth === 1) {
-          hasHiddenReplies = true
+          hasOtherReplies = true
         }
         return undefined
       }
@@ -1504,7 +1504,7 @@ export class Views {
 
     return {
       replies,
-      hasHiddenReplies,
+      hasOtherReplies,
     }
   }
 
@@ -1537,8 +1537,8 @@ export class Views {
         moreParents: moreParents ?? false,
         moreReplies,
         opThread: isOPThread,
-        hiddenByThreadgate: false, // Hidden posts are handled by threadHiddenV2
-        mutedByViewer: false, // Hidden posts are handled by threadHiddenV2
+        hiddenByThreadgate: false, // Hidden posts are handled by threadOtherV2
+        mutedByViewer: false, // Hidden posts are handled by threadOtherV2
       },
     }
   }
@@ -1599,7 +1599,7 @@ export class Views {
     }
   }
 
-  threadHiddenV2(
+  threadOtherV2(
     skeleton: { anchor: string; uris: string[] },
     state: HydrationState,
     {
@@ -1611,7 +1611,7 @@ export class Views {
       branchingFactor: number
       prioritizeFollowedUsers: boolean
     },
-  ): ThreadHiddenItem[] {
+  ): ThreadOtherItem[] {
     const { anchor: anchorUri, uris } = skeleton
 
     // Not found.
@@ -1634,10 +1634,10 @@ export class Views {
     const rootUri = getRootUri(anchorUri, post)
     const opDid = uriToDid(rootUri)
 
-    const anchorTree: ThreadHiddenAnchorPostNode = {
+    const anchorTree: ThreadOtherAnchorPostNode = {
       type: 'hiddenAnchor',
-      item: this.threadHiddenV2ItemPostAnchor({ depth: 0, uri: anchorUri }),
-      replies: this.threadHiddenV2Replies(
+      item: this.threadOtherV2ItemPostAnchor({ depth: 0, uri: anchorUri }),
+      replies: this.threadOtherV2Replies(
         {
           parentUri: anchorUri,
           rootUri,
@@ -1660,7 +1660,7 @@ export class Views {
     })
   }
 
-  private threadHiddenV2Replies(
+  private threadOtherV2Replies(
     {
       parentUri,
       rootUri,
@@ -1677,7 +1677,7 @@ export class Views {
       prioritizeFollowedUsers: boolean
     },
     state: HydrationState,
-  ): ThreadHiddenPostNode[] | undefined {
+  ): ThreadOtherPostNode[] | undefined {
     // Reached the `below` limit.
     if (depth > below) {
       return undefined
@@ -1695,13 +1695,13 @@ export class Views {
       }
       const { post, postView } = replyInclusion
 
-      // Hidden.
-      const { isHidden, hiddenByThreadgate, mutedByViewer } =
-        this.isHiddenThreadPost(
+      // Other posts to pull out
+      const { isOther, hiddenByThreadgate, mutedByViewer } =
+        this.isOtherThreadPost(
           { post, postView, rootUri, prioritizeFollowedUsers, uri },
           state,
         )
-      if (isHidden) {
+      if (isOther) {
         // Only show hidden anchor replies, not all hidden.
         if (depth > 1) {
           return undefined
@@ -1712,7 +1712,7 @@ export class Views {
       }
 
       // Recurse down.
-      const replies = this.threadHiddenV2Replies(
+      const replies = this.threadOtherV2Replies(
         {
           parentUri: uri,
           rootUri,
@@ -1724,7 +1724,7 @@ export class Views {
         state,
       )
 
-      const item = this.threadHiddenV2ItemPost({
+      const item = this.threadOtherV2ItemPost({
         depth,
         hiddenByThreadgate,
         mutedByViewer,
@@ -1732,7 +1732,7 @@ export class Views {
         uri,
       })
 
-      const tree: ThreadHiddenPostNode = {
+      const tree: ThreadOtherPostNode = {
         type: 'hiddenPost',
         item: item,
         tags: post.tags,
@@ -1743,13 +1743,13 @@ export class Views {
     })
   }
 
-  private threadHiddenV2ItemPostAnchor({
+  private threadOtherV2ItemPostAnchor({
     depth,
     uri,
   }: {
     depth: number
     uri: string
-  }): ThreadHiddenAnchorPostNode['item'] {
+  }): ThreadOtherAnchorPostNode['item'] {
     return {
       uri,
       depth,
@@ -1759,7 +1759,7 @@ export class Views {
     }
   }
 
-  private threadHiddenV2ItemPost({
+  private threadOtherV2ItemPost({
     depth,
     hiddenByThreadgate,
     mutedByViewer,
@@ -1771,8 +1771,8 @@ export class Views {
     mutedByViewer: boolean
     postView: PostView
     uri: string
-  }): ThreadHiddenItemValuePost {
-    const base = this.threadHiddenV2ItemPostAnchor({ depth, uri })
+  }): ThreadOtherItemValuePost {
+    const base = this.threadOtherV2ItemPostAnchor({ depth, uri })
     return {
       ...base,
       value: {
@@ -1780,9 +1780,9 @@ export class Views {
         post: postView,
         hiddenByThreadgate,
         mutedByViewer,
-        moreParents: false, // Hidden replies don't have parents.
-        moreReplies: 0, // Hidden replies don't have replies hydrated.
-        opThread: false, // Hidden replies don't contain OP threads.
+        moreParents: false, // "Other" replies don't have parents.
+        moreReplies: 0, // "Other" replies don't have replies hydrated.
+        opThread: false, // "Other" replies don't contain OP threads.
       },
     }
   }
@@ -1834,7 +1834,7 @@ export class Views {
     return { authorDid, post, postView }
   }
 
-  private isHiddenThreadPost(
+  private isOtherThreadPost(
     {
       post,
       postView,
@@ -1850,7 +1850,7 @@ export class Views {
     },
     state: HydrationState,
   ): {
-    isHidden: boolean
+    isOther: boolean
     hiddenByTag: boolean
     hiddenByThreadgate: boolean
     mutedByViewer: boolean
@@ -1873,7 +1873,7 @@ export class Views {
     const mutedByViewer = this.viewerMuteExists(authorDid, state)
 
     return {
-      isHidden: hiddenByTag || hiddenByThreadgate || mutedByViewer,
+      isOther: hiddenByTag || hiddenByThreadgate || mutedByViewer,
       hiddenByTag,
       hiddenByThreadgate,
       mutedByViewer,

package/src/views/threads-v2.ts

@@ -7,18 +7,18 @@ import {
   ThreadItemNotFound,
   ThreadItemPost,
 } from '../lexicon/types/app/bsky/unspecced/defs'
-import { ThreadHiddenItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadHiddenV2'
+import { ThreadItem as ThreadOtherItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
 import {
   QueryParams as GetPostThreadV2QueryParams,
   ThreadItem,
 } from '../lexicon/types/app/bsky/unspecced/getPostThreadV2'
 import { $Typed } from '../lexicon/util'
 
-type ThreadMaybeHiddenPostNode = ThreadPostNode | ThreadHiddenPostNode
+type ThreadMaybeOtherPostNode = ThreadPostNode | ThreadOtherPostNode
 type ThreadNodeWithReplies =
   | ThreadPostNode
-  | ThreadHiddenPostNode
-  | ThreadHiddenAnchorPostNode
+  | ThreadOtherPostNode
+  | ThreadOtherAnchorPostNode
 
 type ThreadItemValue<T extends ThreadItem['value']> = Omit<
   ThreadItem,
@@ -63,37 +63,37 @@ type ThreadPostNode = {
   replies: ThreadTree[] | undefined
 }
 
-type ThreadHiddenItemValue<T extends ThreadHiddenItem['value']> = Omit<
-  ThreadHiddenItem,
+type ThreadOtherItemValue<T extends ThreadOtherItem['value']> = Omit<
+  ThreadOtherItem,
   'value'
 > & {
   value: T
 }
 
-export type ThreadHiddenItemValuePost = ThreadHiddenItemValue<
+export type ThreadOtherItemValuePost = ThreadOtherItemValue<
   $Typed<ThreadItemPost>
 >
 
 // This is an intermediary type that doesn't map to the views.
 // It is useful to differentiate between the anchor post and the replies for the hidden case,
 // while also differentiating between hidden and visible cases.
-export type ThreadHiddenAnchorPostNode = {
+export type ThreadOtherAnchorPostNode = {
   type: 'hiddenAnchor'
-  item: Omit<ThreadHiddenItem, 'value'> & { value: undefined }
-  replies: ThreadHiddenPostNode[] | undefined
+  item: Omit<ThreadOtherItem, 'value'> & { value: undefined }
+  replies: ThreadOtherPostNode[] | undefined
 }
 
-export type ThreadHiddenPostNode = {
+export type ThreadOtherPostNode = {
   type: 'hiddenPost'
-  item: ThreadHiddenItemValuePost
+  item: ThreadOtherItemValuePost
   tags: Set<string>
-  replies: ThreadHiddenPostNode[] | undefined
+  replies: ThreadOtherPostNode[] | undefined
 }
 
 const isNodeWithReplies = (node: ThreadTree): node is ThreadNodeWithReplies =>
   'replies' in node && node.replies !== undefined
 
-const isPostNode = (node: ThreadTree): node is ThreadMaybeHiddenPostNode =>
+const isPostNode = (node: ThreadTree): node is ThreadMaybeOtherPostNode =>
   node.type === 'post' || node.type === 'hiddenPost'
 
 export type ThreadTreeVisible =
@@ -102,9 +102,9 @@ export type ThreadTreeVisible =
   | ThreadNotFoundNode
   | ThreadPostNode
 
-export type ThreadTreeHidden = ThreadHiddenAnchorPostNode | ThreadHiddenPostNode
+export type ThreadTreeOther = ThreadOtherAnchorPostNode | ThreadOtherPostNode
 
-export type ThreadTree = ThreadTreeVisible | ThreadTreeHidden
+export type ThreadTree = ThreadTreeVisible | ThreadTreeOther
 
 /** This function mutates the tree parameter. */
 export function sortTrimFlattenThreadTree(
@@ -146,8 +146,8 @@ function sortTrimThreadTree(
       if (!isPostNode(bn)) {
         return -1
       }
-      const aNode: ThreadMaybeHiddenPostNode = an
-      const bNode: ThreadMaybeHiddenPostNode = bn
+      const aNode: ThreadMaybeOtherPostNode = an
+      const bNode: ThreadMaybeOtherPostNode = bn
 
       // First applies bumping.
       const bump = applyBumping(aNode, bNode, opts)
@@ -171,8 +171,8 @@ function sortTrimThreadTree(
 }
 
 function applyBumping(
-  aNode: ThreadMaybeHiddenPostNode,
-  bNode: ThreadMaybeHiddenPostNode,
+  aNode: ThreadMaybeOtherPostNode,
+  bNode: ThreadMaybeOtherPostNode,
   opts: SortTrimFlattenOptions,
 ): number | null {
   if (!isPostNode(aNode)) {
@@ -191,7 +191,7 @@ function applyBumping(
   } = opts
 
   type BumpDirection = 'up' | 'down'
-  type BumpPredicateFn = (i: ThreadMaybeHiddenPostNode) => boolean
+  type BumpPredicateFn = (i: ThreadMaybeOtherPostNode) => boolean
 
   const maybeBump = (
     bump: BumpDirection,
@@ -276,8 +276,8 @@ function applyBumping(
 }
 
 function applySorting(
-  aNode: ThreadMaybeHiddenPostNode,
-  bNode: ThreadMaybeHiddenPostNode,
+  aNode: ThreadMaybeOtherPostNode,
+  bNode: ThreadMaybeOtherPostNode,
   opts: SortTrimFlattenOptions,
 ): number {
   const a = aNode.item.value