@atproto/bsky 0.0.76 → 0.0.78

package/src/views/index.ts

@@ -28,13 +28,15 @@ import {
   StarterPackView,
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
-import { creatorFromUri, parseThreadGate, cidFromBlobJson } from './util'
+import { parseThreadGate, parsePostgate, cidFromBlobJson } from './util'
+import { uriToDid as creatorFromUri } from '../util/uris'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
   Embed,
   EmbedBlocked,
   EmbedNotFound,
+  EmbedDetached,
   EmbedView,
   ExternalEmbed,
   ExternalEmbedView,
@@ -61,6 +63,7 @@ import {
   LabelerViewDetailed,
 } from '../lexicon/types/app/bsky/labeler/defs'
 import { Notification } from '../proto/bsky_pb'
+import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
 
 export class Views {
   constructor(public imgUriBuilder: ImageUriBuilder) {}
@@ -104,6 +107,16 @@ export class Views {
     return actor.muted || !!actor.mutedByList
   }
 
+  replyIsHiddenByThreadgate(
+    replyUri: string,
+    rootPostUri: string,
+    state: HydrationState,
+  ) {
+    const threadgateUri = postUriToThreadgateUri(rootPostUri)
+    const threadgate = state.threadgates?.get(threadgateUri)
+    return !!threadgate?.record?.hiddenReplies?.includes(replyUri)
+  }
+
   profileDetailed(
     did: string,
     state: HydrationState,
@@ -291,7 +304,7 @@ export class Views {
   // ------------
 
   list(uri: string, state: HydrationState): ListView | undefined {
-    const creatorDid = new AtUri(uri).hostname
+    const creatorDid = creatorFromUri(uri)
     const list = state.lists?.get(uri)
     if (!list) return
     const creator = this.profile(creatorDid, state)
@@ -316,7 +329,7 @@ export class Views {
     const listAgg = state.listAggs?.get(uri)
     const listViewer = state.listViewers?.get(uri)
     const labels = state.labels?.getBySubject(uri) ?? []
-    const creator = new AtUri(uri).hostname
+    const creator = creatorFromUri(uri)
     return {
       uri,
       cid: list.cid,
@@ -399,7 +412,7 @@ export class Views {
     const { uri, cid, record } = details
     if (!uri || !cid || !record) return []
     if (!isSelfLabels(record.labels)) return []
-    const src = new AtUri(uri).host // record creator
+    const src = creatorFromUri(uri) // record creator
     const cts =
       typeof record.createdAt === 'string'
         ? normalizeDatetimeAlways(record.createdAt)
@@ -529,7 +542,7 @@ export class Views {
     }
   }
 
-  threadGate(uri: string, state: HydrationState): ThreadgateView | undefined {
+  threadgate(uri: string, state: HydrationState): ThreadgateView | undefined {
     const gate = state.threadgates?.get(uri)
     if (!gate) return
     return {
@@ -552,11 +565,7 @@ export class Views {
     if (!author) return
     const aggs = state.postAggs?.get(uri)
     const viewer = state.postViewers?.get(uri)
-    const gateUri = AtUri.make(
-      authorDid,
-      ids.AppBskyFeedThreadgate,
-      parsedUri.rkey,
-    ).toString()
+    const threadgateUri = postUriToThreadgateUri(uri)
     const labels = [
       ...(state.labels?.getBySubject(uri) ?? []),
       ...this.selfLabels({
@@ -577,6 +586,7 @@ export class Views {
       replyCount: aggs?.replies ?? 0,
       repostCount: aggs?.reposts ?? 0,
       likeCount: aggs?.likes ?? 0,
+      quoteCount: aggs?.quotes ?? 0,
       indexedAt: post.sortedAt.toISOString(),
       viewer: viewer
         ? {
@@ -584,11 +594,12 @@ export class Views {
             like: viewer.like,
             threadMuted: viewer.threadMuted,
             replyDisabled: this.userReplyDisabled(uri, state),
+            embeddingDisabled: this.userPostEmbeddingDisabled(uri, state),
           }
         : undefined,
       labels,
       threadgate: !post.record.reply // only hydrate gate on root post
-        ? this.threadGate(gateUri, state)
+        ? this.threadgate(threadgateUri, state)
         : undefined,
     }
   }
@@ -608,12 +619,13 @@ export class Views {
     }
     const post = this.post(item.post.uri, state)
     if (!post) return
+    const reply = !postInfo?.violatesThreadGate
+      ? this.replyRef(item.post.uri, state)
+      : undefined
     return {
       post,
       reason,
-      reply: !postInfo?.violatesThreadGate
-        ? this.replyRef(item.post.uri, state)
-        : undefined,
+      reply,
     }
   }
 
@@ -622,15 +634,16 @@ export class Views {
     if (!postRecord?.reply) return
     let root = this.maybePost(postRecord.reply.root.uri, state)
     let parent = this.maybePost(postRecord.reply.parent.uri, state)
-    if (
-      !state.ctx?.include3pBlocks &&
-      state.postBlocks?.get(uri)?.reply &&
-      isPostView(parent)
-    ) {
-      parent = this.blockedPost(parent.uri, parent.author.did, state)
-      // in a reply to the root of a thread, parent and root are the same post.
-      if (root.uri === parent.uri) {
-        root = parent
+    if (!state.ctx?.include3pBlocks) {
+      const childBlocks = state.postBlocks?.get(uri)
+      const parentBlocks = state.postBlocks?.get(parent.uri)
+      // if child blocks parent, block parent
+      if (isPostView(parent) && childBlocks?.parent) {
+        parent = this.blockedPost(parent.uri, parent.author.did, state)
+      }
+      // if child or parent blocks root, block root
+      if (isPostView(root) && (childBlocks?.root || parentBlocks?.root)) {
+        root = this.blockedPost(root.uri, root.author.did, state)
       }
     }
     let grandparentAuthor: ProfileViewBasic | undefined
@@ -755,7 +768,10 @@ export class Views {
     if (height < 1) return undefined
     const parentUri = state.posts?.get(childUri)?.record.reply?.parent.uri
     if (!parentUri) return undefined
-    if (!state.ctx?.include3pBlocks && state.postBlocks?.get(childUri)?.reply) {
+    if (
+      !state.ctx?.include3pBlocks &&
+      state.postBlocks?.get(childUri)?.parent
+    ) {
       return this.blockedPost(parentUri, creatorFromUri(parentUri), state)
     }
     const post = this.post(parentUri, state)
@@ -786,7 +802,7 @@ export class Views {
       if (postInfo?.violatesThreadGate) {
         return undefined
       }
-      if (!state.ctx?.include3pBlocks && state.postBlocks?.get(uri)?.reply) {
+      if (!state.ctx?.include3pBlocks && state.postBlocks?.get(uri)?.parent) {
         return undefined
       }
       const post = this.post(uri, state)
@@ -887,6 +903,17 @@ export class Views {
     }
   }
 
+  embedDetached(uri: string): { $type: string; record: EmbedDetached } {
+    return {
+      $type: 'app.bsky.embed.record#view',
+      record: {
+        $type: 'app.bsky.embed.record#viewDetached',
+        uri,
+        detached: true,
+      },
+    }
+  }
+
   embedBlocked(
     uri: string,
     state: HydrationState,
@@ -923,6 +950,7 @@ export class Views {
       likeCount: postView.likeCount,
       replyCount: postView.replyCount,
       repostCount: postView.repostCount,
+      quoteCount: postView.quoteCount,
       indexedAt: postView.indexedAt,
       embeds: depth > 1 ? undefined : postView.embed ? [postView.embed] : [],
     }
@@ -944,9 +972,19 @@ export class Views {
       return this.embedBlocked(uri, state)
     }
 
+    const post = state.posts?.get(postUri)
+    if (post?.violatesEmbeddingRules) {
+      return this.embedDetached(uri)
+    }
+
     if (parsedUri.collection === ids.AppBskyFeedPost) {
       const view = this.embedPostView(uri, state, depth)
       if (!view) return this.embedNotFound(uri)
+      const postgateRecordUri = postUriToPostgateUri(parsedUri.toString())
+      const postgate = state.postgates?.get(postgateRecordUri)
+      if (postgate?.record?.detachedEmbeddingUris?.includes(postUri)) {
+        return this.embedDetached(uri)
+      }
       return this.recordEmbedWrapper(view, withTypeTag)
     } else if (parsedUri.collection === ids.AppBskyFeedGenerator) {
       const view = this.feedGenerator(uri, state)
@@ -1010,13 +1048,15 @@ export class Views {
       return true
     }
     const rootUriStr: string = post?.record.reply?.root.uri ?? uri
-    const gate = state.threadgates?.get(postToGateUri(rootUriStr))?.record
+    const gate = state.threadgates?.get(
+      postUriToThreadgateUri(rootUriStr),
+    )?.record
     const viewer = state.ctx?.viewer
     if (!gate || !viewer) {
       return undefined
     }
     const rootPost = state.posts?.get(rootUriStr)?.record
-    const ownerDid = new AtUri(rootUriStr).hostname
+    const ownerDid = creatorFromUri(rootUriStr)
     const {
       canReply,
       allowFollowing,
@@ -1037,6 +1077,30 @@ export class Views {
     return true
   }
 
+  userPostEmbeddingDisabled(
+    uri: string,
+    state: HydrationState,
+  ): boolean | undefined {
+    const post = state.posts?.get(uri)
+    if (!post) {
+      return true
+    }
+    const postgateRecordUri = postUriToPostgateUri(uri)
+    const gate = state.postgates?.get(postgateRecordUri)?.record
+    const viewerDid = state.ctx?.viewer ?? undefined
+    const {
+      embeddingRules: { canEmbed },
+    } = parsePostgate({
+      gate,
+      viewerDid,
+      authorDid: creatorFromUri(uri),
+    })
+    if (canEmbed) {
+      return false
+    }
+    return true
+  }
+
   notification(
     notif: Notification,
     lastSeenAt: string | undefined,
@@ -1093,14 +1157,6 @@ export class Views {
   }
 }
 
-const postToGateUri = (uri: string) => {
-  const aturi = new AtUri(uri)
-  if (aturi.collection === ids.AppBskyFeedPost) {
-    aturi.collection = ids.AppBskyFeedThreadgate
-  }
-  return aturi.toString()
-}
-
 const getRootUri = (uri: string, post: Post): string => {
   return post.record.reply?.root.uri ?? uri
 }

package/src/views/types.ts

@@ -39,6 +39,7 @@ export type {
   View as RecordEmbedView,
   ViewBlocked as EmbedBlocked,
   ViewNotFound as EmbedNotFound,
+  ViewDetached as EmbedDetached,
   ViewRecord as PostEmbedView,
 } from '../lexicon/types/app/bsky/embed/record'
 export { isMain as isRecordEmbed } from '../lexicon/types/app/bsky/embed/record'

package/src/views/util.ts

@@ -1,4 +1,3 @@
-import { AtUri } from '@atproto/syntax'
 import { BlobRef } from '@atproto/lexicon'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import {
@@ -7,12 +6,12 @@ import {
   isListRule,
   isMentionRule,
 } from '../lexicon/types/app/bsky/feed/threadgate'
+import {
+  Record as PostgateRecord,
+  isDisableRule as isPostgateDisableRule,
+} from '../lexicon/types/app/bsky/feed/postgate'
 import { isMention } from '../lexicon/types/app/bsky/richtext/facet'
 
-export const creatorFromUri = (uri: string): string => {
-  return new AtUri(uri).hostname
-}
-
 export const parseThreadGate = (
   replierDid: string,
   ownerDid: string,
@@ -27,8 +26,8 @@ export const parseThreadGate = (
     return { canReply: true }
   }
 
-  const allowMentions = !!gate.allow.find(isMentionRule)
-  const allowFollowing = !!gate.allow.find(isFollowingRule)
+  const allowMentions = gate.allow.some(isMentionRule)
+  const allowFollowing = gate.allow.some(isFollowingRule)
   const allowListUris = gate.allow?.filter(isListRule).map((item) => item.list)
 
   // check mentions first since it's quick and synchronous
@@ -62,3 +61,34 @@ export const cidFromBlobJson = (json: BlobRef) => {
   }
   return (json['cid'] ?? '') as string
 }
+
+export const parsePostgate = ({
+  gate,
+  viewerDid,
+  authorDid,
+}: {
+  gate: PostgateRecord | undefined
+  viewerDid: string | undefined
+  authorDid: string
+}): ParsedPostgate => {
+  if (viewerDid === authorDid) {
+    return { embeddingRules: { canEmbed: true } }
+  }
+  // default state is unset, allow everyone
+  if (!gate || !gate.embeddingRules) {
+    return { embeddingRules: { canEmbed: true } }
+  }
+
+  const disabled = gate.embeddingRules.some(isPostgateDisableRule)
+  if (disabled) {
+    return { embeddingRules: { canEmbed: false } }
+  }
+
+  return { embeddingRules: { canEmbed: true } }
+}
+
+type ParsedPostgate = {
+  embeddingRules: {
+    canEmbed: boolean
+  }
+}

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -26,6 +26,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -42,6 +43,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -73,6 +75,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -89,6 +92,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -160,6 +164,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -176,6 +181,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -249,6 +255,7 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [],
   "likeCount": 0,
+  "quoteCount": 0,
   "record": Object {
     "$type": "app.bsky.feed.post",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -265,6 +272,7 @@ Object {
   "repostCount": 0,
   "uri": "record(0)",
   "viewer": Object {
+    "embeddingDisabled": false,
     "threadMuted": false,
   },
 }
@@ -531,6 +539,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -548,6 +557,7 @@ Array [
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -573,6 +583,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -586,6 +597,7 @@ Array [
       "repostCount": 0,
       "uri": "record(2)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -644,6 +656,7 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 0,
+            "quoteCount": 1,
             "replyCount": 0,
             "repostCount": 0,
             "uri": "record(2)",
@@ -662,6 +675,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -707,6 +721,7 @@ Array [
       "repostCount": 0,
       "uri": "record(5)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "like": "record(8)",
         "threadMuted": false,
       },
@@ -730,6 +745,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -749,6 +765,7 @@ Array [
       "repostCount": 0,
       "uri": "record(9)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -786,6 +803,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -795,6 +813,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -831,6 +850,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -840,6 +860,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -919,6 +940,7 @@ Array [
                   "indexedAt": "1970-01-01T00:00:00.000Z",
                   "labels": Array [],
                   "likeCount": 0,
+                  "quoteCount": 1,
                   "replyCount": 0,
                   "repostCount": 0,
                   "uri": "record(2)",
@@ -938,6 +960,7 @@ Array [
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 2,
+          "quoteCount": 1,
           "replyCount": 0,
           "repostCount": 0,
           "uri": "record(5)",
@@ -987,6 +1010,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1017,6 +1041,7 @@ Array [
       "repostCount": 1,
       "uri": "record(11)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1079,6 +1104,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1139,6 +1165,7 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 0,
+            "quoteCount": 1,
             "replyCount": 0,
             "repostCount": 0,
             "uri": "record(3)",
@@ -1157,6 +1184,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1215,6 +1243,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1264,6 +1293,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1302,6 +1332,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1360,6 +1391,7 @@ Array [
         },
       ],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1377,6 +1409,7 @@ Array [
       "repostCount": 0,
       "uri": "record(0)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1435,6 +1468,7 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 0,
+            "quoteCount": 1,
             "replyCount": 0,
             "repostCount": 0,
             "uri": "record(5)",
@@ -1453,6 +1487,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 2,
+      "quoteCount": 1,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1498,6 +1533,7 @@ Array [
       "repostCount": 0,
       "uri": "record(2)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "like": "record(8)",
         "threadMuted": false,
       },
@@ -1521,6 +1557,7 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
+      "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
         "createdAt": "1970-01-01T00:00:00.000Z",
@@ -1540,6 +1577,7 @@ Array [
       "repostCount": 0,
       "uri": "record(9)",
       "viewer": Object {
+        "embeddingDisabled": false,
         "threadMuted": false,
       },
     },
@@ -1577,6 +1615,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1586,6 +1625,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
@@ -1622,6 +1662,7 @@ Array [
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
+        "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
           "createdAt": "1970-01-01T00:00:00.000000Z",
@@ -1631,6 +1672,7 @@ Array [
         "repostCount": 1,
         "uri": "record(10)",
         "viewer": Object {
+          "embeddingDisabled": false,
           "threadMuted": false,
         },
       },