@atproto/bsky 0.0.76 → 0.0.77

package/src/proto/bsky_connect.ts

@@ -128,12 +128,16 @@ import {
   GetNotificationSeenResponse,
   GetNotificationsRequest,
   GetNotificationsResponse,
+  GetPostGateRecordsRequest,
+  GetPostGateRecordsResponse,
   GetPostRecordsRequest,
   GetPostRecordsResponse,
   GetPostReplyCountsRequest,
   GetPostReplyCountsResponse,
   GetProfileRecordsRequest,
   GetProfileRecordsResponse,
+  GetQuotesBySubjectRequest,
+  GetQuotesBySubjectResponse,
   GetRecordTakedownRequest,
   GetRecordTakedownResponse,
   GetRelationshipsRequest,
@@ -309,6 +313,15 @@ export const Service = {
       O: GetThreadGateRecordsResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * @generated from rpc bsky.Service.GetPostGateRecords
+     */
+    getPostGateRecords: {
+      name: 'GetPostGateRecords',
+      I: GetPostGateRecordsRequest,
+      O: GetPostGateRecordsResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * @generated from rpc bsky.Service.GetLabelerRecords
      */
@@ -423,6 +436,17 @@ export const Service = {
       O: GetActorRepostsResponse,
       kind: MethodKind.Unary,
     },
+    /**
+     * Quotes
+     *
+     * @generated from rpc bsky.Service.GetQuotesBySubject
+     */
+    getQuotesBySubject: {
+      name: 'GetQuotesBySubject',
+      I: GetQuotesBySubjectRequest,
+      O: GetQuotesBySubjectResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * Interaction Counts
      *

package/src/proto/bsky_pb.ts

@@ -960,6 +960,21 @@ export class PostRecordMeta extends Message<PostRecordMeta> {
    */
   isReply = false
 
+  /**
+   * @generated from field: bool violates_embedding_rules = 4;
+   */
+  violatesEmbeddingRules = false
+
+  /**
+   * @generated from field: bool has_post_gate = 5;
+   */
+  hasPostGate = false
+
+  /**
+   * @generated from field: bool has_thread_gate = 6;
+   */
+  hasThreadGate = false
+
   constructor(data?: PartialMessage<PostRecordMeta>) {
     super()
     proto3.util.initPartial(data, this)
@@ -976,6 +991,24 @@ export class PostRecordMeta extends Message<PostRecordMeta> {
     },
     { no: 2, name: 'has_media', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
     { no: 3, name: 'is_reply', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
+    {
+      no: 4,
+      name: 'violates_embedding_rules',
+      kind: 'scalar',
+      T: 8 /* ScalarType.BOOL */,
+    },
+    {
+      no: 5,
+      name: 'has_post_gate',
+      kind: 'scalar',
+      T: 8 /* ScalarType.BOOL */,
+    },
+    {
+      no: 6,
+      name: 'has_thread_gate',
+      kind: 'scalar',
+      T: 8 /* ScalarType.BOOL */,
+    },
   ])
 
   static fromBinary(
@@ -1608,6 +1641,122 @@ export class GetThreadGateRecordsResponse extends Message<GetThreadGateRecordsRe
   }
 }
 
+/**
+ * @generated from message bsky.GetPostGateRecordsRequest
+ */
+export class GetPostGateRecordsRequest extends Message<GetPostGateRecordsRequest> {
+  /**
+   * @generated from field: repeated string uris = 1;
+   */
+  uris: string[] = []
+
+  constructor(data?: PartialMessage<GetPostGateRecordsRequest>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetPostGateRecordsRequest'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    {
+      no: 1,
+      name: 'uris',
+      kind: 'scalar',
+      T: 9 /* ScalarType.STRING */,
+      repeated: true,
+    },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetPostGateRecordsRequest {
+    return new GetPostGateRecordsRequest().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetPostGateRecordsRequest {
+    return new GetPostGateRecordsRequest().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetPostGateRecordsRequest {
+    return new GetPostGateRecordsRequest().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetPostGateRecordsRequest
+      | PlainMessage<GetPostGateRecordsRequest>
+      | undefined,
+    b:
+      | GetPostGateRecordsRequest
+      | PlainMessage<GetPostGateRecordsRequest>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetPostGateRecordsRequest, a, b)
+  }
+}
+
+/**
+ * @generated from message bsky.GetPostGateRecordsResponse
+ */
+export class GetPostGateRecordsResponse extends Message<GetPostGateRecordsResponse> {
+  /**
+   * @generated from field: repeated bsky.Record records = 1;
+   */
+  records: Record[] = []
+
+  constructor(data?: PartialMessage<GetPostGateRecordsResponse>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetPostGateRecordsResponse'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: 'records', kind: 'message', T: Record, repeated: true },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetPostGateRecordsResponse {
+    return new GetPostGateRecordsResponse().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetPostGateRecordsResponse {
+    return new GetPostGateRecordsResponse().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetPostGateRecordsResponse {
+    return new GetPostGateRecordsResponse().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetPostGateRecordsResponse
+      | PlainMessage<GetPostGateRecordsResponse>
+      | undefined,
+    b:
+      | GetPostGateRecordsResponse
+      | PlainMessage<GetPostGateRecordsResponse>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetPostGateRecordsResponse, a, b)
+  }
+}
+
 /**
  * @generated from message bsky.GetLabelerRecordsRequest
  */
@@ -2984,6 +3133,134 @@ export class GetActorLikesResponse extends Message<GetActorLikesResponse> {
   }
 }
 
+/**
+ * @generated from message bsky.GetQuotesBySubjectRequest
+ */
+export class GetQuotesBySubjectRequest extends Message<GetQuotesBySubjectRequest> {
+  /**
+   * @generated from field: bsky.RecordRef subject = 1;
+   */
+  subject?: RecordRef
+
+  /**
+   * @generated from field: int32 limit = 2;
+   */
+  limit = 0
+
+  /**
+   * @generated from field: string cursor = 3;
+   */
+  cursor = ''
+
+  constructor(data?: PartialMessage<GetQuotesBySubjectRequest>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetQuotesBySubjectRequest'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: 'subject', kind: 'message', T: RecordRef },
+    { no: 2, name: 'limit', kind: 'scalar', T: 5 /* ScalarType.INT32 */ },
+    { no: 3, name: 'cursor', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetQuotesBySubjectRequest {
+    return new GetQuotesBySubjectRequest().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetQuotesBySubjectRequest {
+    return new GetQuotesBySubjectRequest().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetQuotesBySubjectRequest {
+    return new GetQuotesBySubjectRequest().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetQuotesBySubjectRequest
+      | PlainMessage<GetQuotesBySubjectRequest>
+      | undefined,
+    b:
+      | GetQuotesBySubjectRequest
+      | PlainMessage<GetQuotesBySubjectRequest>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetQuotesBySubjectRequest, a, b)
+  }
+}
+
+/**
+ * @generated from message bsky.GetQuotesBySubjectResponse
+ */
+export class GetQuotesBySubjectResponse extends Message<GetQuotesBySubjectResponse> {
+  /**
+   * @generated from field: repeated bsky.RecordRef refs = 1;
+   */
+  refs: RecordRef[] = []
+
+  /**
+   * @generated from field: string cursor = 2;
+   */
+  cursor = ''
+
+  constructor(data?: PartialMessage<GetQuotesBySubjectResponse>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.GetQuotesBySubjectResponse'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: 'refs', kind: 'message', T: RecordRef, repeated: true },
+    { no: 2, name: 'cursor', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): GetQuotesBySubjectResponse {
+    return new GetQuotesBySubjectResponse().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): GetQuotesBySubjectResponse {
+    return new GetQuotesBySubjectResponse().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): GetQuotesBySubjectResponse {
+    return new GetQuotesBySubjectResponse().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a:
+      | GetQuotesBySubjectResponse
+      | PlainMessage<GetQuotesBySubjectResponse>
+      | undefined,
+    b:
+      | GetQuotesBySubjectResponse
+      | PlainMessage<GetQuotesBySubjectResponse>
+      | undefined,
+  ): boolean {
+    return proto3.util.equals(GetQuotesBySubjectResponse, a, b)
+  }
+}
+
 /**
  *
  * Interactions
@@ -3062,6 +3339,11 @@ export class GetInteractionCountsResponse extends Message<GetInteractionCountsRe
    */
   replies: number[] = []
 
+  /**
+   * @generated from field: repeated int32 quotes = 4;
+   */
+  quotes: number[] = []
+
   constructor(data?: PartialMessage<GetInteractionCountsResponse>) {
     super()
     proto3.util.initPartial(data, this)
@@ -3091,6 +3373,13 @@ export class GetInteractionCountsResponse extends Message<GetInteractionCountsRe
       T: 5 /* ScalarType.INT32 */,
       repeated: true,
     },
+    {
+      no: 4,
+      name: 'quotes',
+      kind: 'scalar',
+      T: 5 /* ScalarType.INT32 */,
+      repeated: true,
+    },
   ])
 
   static fromBinary(

package/src/util/uris.ts

@@ -0,0 +1,31 @@
+import assert from 'node:assert'
+import { AtUri } from '@atproto/syntax'
+import { ids } from '../lexicon/lexicons'
+
+/**
+ * Convert a post URI to a threadgate URI. If the URI is not a valid
+ * post URI, return URI unchanged. Threadgate lookups will then fail.
+ */
+export function postUriToThreadgateUri(postUri: string) {
+  const urip = new AtUri(postUri)
+  if (urip.collection === ids.AppBskyFeedPost) {
+    urip.collection = ids.AppBskyFeedThreadgate
+  }
+  return urip.toString()
+}
+
+/**
+ * Convert a post URI to a postgate URI. If the URI is not a valid
+ * post URI, return URI unchanged. Postgate lookups will then fail.
+ */
+export function postUriToPostgateUri(postUri: string) {
+  const urip = new AtUri(postUri)
+  if (urip.collection === ids.AppBskyFeedPost) {
+    urip.collection = ids.AppBskyFeedPostgate
+  }
+  return urip.toString()
+}
+
+export function uriToDid(uri: string) {
+  return new AtUri(uri).hostname
+}

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,
@@ -944,9 +971,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 +1047,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 +1076,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 +1156,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'