@atproto/bsky 0.0.44 → 0.0.45

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

@@ -69,6 +69,8 @@ export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
   reason?: ReasonRepost | { $type: string; [k: string]: unknown }
+  /** Context provided by feed generator that may be passed back alongside interactions. */
+  feedContext?: string
   [k: string]: unknown
 }
 
@@ -219,6 +221,7 @@ export interface GeneratorView {
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: string
   likeCount?: number
+  acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
   indexedAt: string
@@ -257,6 +260,8 @@ export function validateGeneratorViewerState(v: unknown): ValidationResult {
 export interface SkeletonFeedPost {
   post: string
   reason?: SkeletonReasonRepost | { $type: string; [k: string]: unknown }
+  /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
+  feedContext?: string
   [k: string]: unknown
 }
 
@@ -308,3 +313,61 @@ export function isThreadgateView(v: unknown): v is ThreadgateView {
 export function validateThreadgateView(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
 }
+
+export interface Interaction {
+  item?: string
+  event?:
+    | 'app.bsky.feed.defs#requestLess'
+    | 'app.bsky.feed.defs#requestMore'
+    | 'app.bsky.feed.defs#clickthroughItem'
+    | 'app.bsky.feed.defs#clickthroughAuthor'
+    | 'app.bsky.feed.defs#clickthroughReposter'
+    | 'app.bsky.feed.defs#clickthroughEmbed'
+    | 'app.bsky.feed.defs#interactionSeen'
+    | 'app.bsky.feed.defs#interactionLike'
+    | 'app.bsky.feed.defs#interactionRepost'
+    | 'app.bsky.feed.defs#interactionReply'
+    | 'app.bsky.feed.defs#interactionQuote'
+    | 'app.bsky.feed.defs#interactionShare'
+    | (string & {})
+  /** Context on a feed item that was orginally supplied by the feed generator on getFeedSkeleton. */
+  feedContext?: string
+  [k: string]: unknown
+}
+
+export function isInteraction(v: unknown): v is Interaction {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#interaction'
+  )
+}
+
+export function validateInteraction(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+}
+
+/** Request that less content like the given feed item be shown in the feed */
+export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+/** Request that more content like the given feed item be shown in the feed */
+export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+/** User clicked through to the feed item */
+export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+/** User clicked through to the author of the feed item */
+export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+/** User clicked through to the reposter of the feed item */
+export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+/** User clicked through to the embedded content of the feed item */
+export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Feed item was seen by user */
+export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+/** User liked the feed item */
+export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+/** User reposted the feed item */
+export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+/** User replied to the feed item */
+export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+/** User quoted the feed item */
+export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+/** User shared the feed item */
+export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'

package/src/lexicon/types/app/bsky/feed/generator.ts

@@ -14,6 +14,8 @@ export interface Record {
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
+  /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
+  acceptsInteractions?: boolean
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }

package/src/lexicon/types/app/bsky/feed/searchPosts.ts

@@ -12,6 +12,24 @@ import * as AppBskyFeedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
+  /** Specifies the ranking order of results. */
+  sort: 'top' | 'latest' | (string & {})
+  /** Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD). */
+  since?: string
+  /** Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD). */
+  until?: string
+  /** Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions. */
+  mentions?: string
+  /** Filter to posts by the given account. Handles are resolved to DID before query-time. */
+  author?: string
+  /** Filter to posts in the given language. Expected to be based on post language field, though server may override language detection. */
+  lang?: string
+  /** Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization. */
+  domain?: string
+  /** Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching. */
+  url?: string
+  /** Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching. */
+  tag?: string[]
   limit: number
   /** Optional pagination mechanism; may not necessarily allow scrolling through entire result set. */
   cursor?: string

package/src/lexicon/types/app/bsky/feed/sendInteractions.ts

@@ -0,0 +1,49 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as AppBskyFeedDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  interactions: AppBskyFeedDefs.Interaction[]
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

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

@@ -12,6 +12,8 @@ import * as AppBskyUnspeccedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
+  /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
+  viewer?: string
   /** If true, acts as fast/simple 'typeahead' query. */
   typeahead?: boolean
   limit: number

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

@@ -12,6 +12,26 @@ import * as AppBskyUnspeccedDefs from './defs'
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
+  /** Specifies the ranking order of results. */
+  sort: 'top' | 'latest' | (string & {})
+  /** Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD). */
+  since?: string
+  /** Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD). */
+  until?: string
+  /** Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions. */
+  mentions?: string
+  /** Filter to posts by the given account. Handles are resolved to DID before query-time. */
+  author?: string
+  /** Filter to posts in the given language. Expected to be based on post language field, though server may override language detection. */
+  lang?: string
+  /** Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization. */
+  domain?: string
+  /** Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching. */
+  url?: string
+  /** Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching. */
+  tag?: string[]
+  /** DID of the account making the request (not included for public/unauthenticated queries). Used for 'from:me' queries. */
+  viewer?: string
   limit: number
   /** Optional pagination mechanism; may not necessarily allow scrolling through entire result set. */
   cursor?: string

package/src/views/index.ts

@@ -18,6 +18,7 @@ import {
   ReasonRepost,
   ThreadViewPost,
   ThreadgateView,
+  isPostView,
 } from '../lexicon/types/app/bsky/feed/defs'
 import { ListView, ListViewBasic } from '../lexicon/types/app/bsky/graph/defs'
 import { creatorFromUri, parseThreadGate, cidFromBlobJson } from './util'
@@ -101,9 +102,9 @@ export class Views {
             cidFromBlobJson(actor.profile.banner),
           )
         : undefined,
-      followersCount: profileAggs?.followers,
-      followsCount: profileAggs?.follows,
-      postsCount: profileAggs?.posts,
+      followersCount: profileAggs?.followers ?? 0,
+      followsCount: profileAggs?.follows ?? 0,
+      postsCount: profileAggs?.posts ?? 0,
       associated: {
         lists: profileAggs?.lists,
         feedgens: profileAggs?.feeds,
@@ -296,7 +297,7 @@ export class Views {
       uri,
       cid: labeler.cid.toString(),
       creator,
-      likeCount: aggs?.likes,
+      likeCount: aggs?.likes ?? 0,
       viewer: viewer
         ? {
             like: viewer.like,
@@ -371,7 +372,7 @@ export class Views {
             cidFromBlobJson(feedgen.record.avatar),
           )
         : undefined,
-      likeCount: aggs?.likes,
+      likeCount: aggs?.likes ?? 0,
       labels,
       viewer: viewer
         ? {
@@ -427,9 +428,9 @@ export class Views {
         depth < 2 && post.record.embed
           ? this.embed(uri, post.record.embed, state, depth + 1)
           : undefined,
-      replyCount: aggs?.replies,
-      repostCount: aggs?.reposts,
-      likeCount: aggs?.likes,
+      replyCount: aggs?.replies ?? 0,
+      repostCount: aggs?.reposts ?? 0,
+      likeCount: aggs?.likes ?? 0,
       indexedAt: post.sortedAt.toISOString(),
       viewer: viewer
         ? {
@@ -469,35 +470,28 @@ export class Views {
     }
   }
 
-  replyRef(uri: string, state: HydrationState, usePostViewUnion = false) {
-    // don't hydrate reply if there isn't it violates a block
-    if (state.postBlocks?.get(uri)?.reply) return undefined
+  replyRef(uri: string, state: HydrationState) {
     const postRecord = state.posts?.get(uri.toString())?.record
     if (!postRecord?.reply) return
-    const root = this.maybePost(
-      postRecord.reply.root.uri,
-      state,
-      usePostViewUnion,
-    )
-    const parent = this.maybePost(
-      postRecord.reply.parent.uri,
-      state,
-      usePostViewUnion,
-    )
+    let root = this.maybePost(postRecord.reply.root.uri, state)
+    let parent = this.maybePost(postRecord.reply.parent.uri, state)
+    if (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
+      }
+    }
     return root && parent ? { root, parent } : undefined
   }
 
-  maybePost(
-    uri: string,
-    state: HydrationState,
-    usePostViewUnion = false,
-  ): MaybePostView | undefined {
+  maybePost(uri: string, state: HydrationState): MaybePostView {
     const post = this.post(uri, state)
-    if (!post) return usePostViewUnion ? this.notFoundPost(uri) : undefined
+    if (!post) {
+      return this.notFoundPost(uri)
+    }
     if (this.viewerBlockExists(post.author.did, state)) {
-      return usePostViewUnion
-        ? this.blockedPost(uri, post.author.did, state)
-        : undefined
+      return this.blockedPost(uri, post.author.did, state)
     }
     return {
       $type: 'app.bsky.feed.defs#postView',
@@ -759,6 +753,9 @@ export class Views {
       author: postView.author,
       value: postView.record,
       labels: postView.labels,
+      likeCount: postView.likeCount,
+      replyCount: postView.replyCount,
+      repostCount: postView.repostCount,
       indexedAt: postView.indexedAt,
       embeds: depth > 1 ? undefined : postView.embed ? [postView.embed] : [],
     }

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

@@ -485,6 +485,9 @@ Array [
             "embeds": Array [],
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
+            "likeCount": 0,
+            "replyCount": 0,
+            "repostCount": 0,
             "uri": "record(2)",
             "value": Object {
               "$type": "app.bsky.feed.post",
@@ -740,6 +743,9 @@ Array [
                   "cid": "cids(3)",
                   "indexedAt": "1970-01-01T00:00:00.000Z",
                   "labels": Array [],
+                  "likeCount": 0,
+                  "replyCount": 0,
+                  "repostCount": 0,
                   "uri": "record(2)",
                   "value": Object {
                     "$type": "app.bsky.feed.post",
@@ -756,6 +762,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 2,
+          "replyCount": 0,
+          "repostCount": 0,
           "uri": "record(5)",
           "value": Object {
             "$type": "app.bsky.feed.post",
@@ -948,6 +957,9 @@ Array [
             "embeds": Array [],
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
+            "likeCount": 0,
+            "replyCount": 0,
+            "repostCount": 0,
             "uri": "record(3)",
             "value": Object {
               "$type": "app.bsky.feed.post",
@@ -1232,6 +1244,9 @@ Array [
             "embeds": Array [],
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
+            "likeCount": 0,
+            "replyCount": 0,
+            "repostCount": 0,
             "uri": "record(5)",
             "value": Object {
               "$type": "app.bsky.feed.post",

package/tests/data-plane/__snapshots__/indexing.test.ts.snap

@@ -238,6 +238,9 @@ Array [
                     "cid": "cids(8)",
                     "indexedAt": "1970-01-01T00:00:00.000Z",
                     "labels": Array [],
+                    "likeCount": 2,
+                    "replyCount": 0,
+                    "repostCount": 0,
                     "uri": "record(9)",
                     "value": Object {
                       "$type": "app.bsky.feed.post",
@@ -285,6 +288,9 @@ Array [
               ],
               "indexedAt": "1970-01-01T00:00:00.000Z",
               "labels": Array [],
+              "likeCount": 0,
+              "replyCount": 0,
+              "repostCount": 1,
               "uri": "record(7)",
               "value": Object {
                 "$type": "app.bsky.feed.post",

package/tests/views/__snapshots__/actor-search.test.ts.snap

@@ -36,7 +36,7 @@ Array [
     "avatar": "https://bsky.public.url/img/avatar/plain/user(5)/cids(0)@jpeg",
     "did": "user(4)",
     "displayName": "Latoya Windler",
-    "handle": "carolina-mcdermott77.test",
+    "handle": "carolina-mcderm77.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "viewer": Object {
@@ -115,7 +115,7 @@ Array [
     "avatar": "https://bsky.public.url/img/avatar/plain/user(5)/cids(0)@jpeg",
     "did": "user(4)",
     "displayName": "Latoya Windler",
-    "handle": "carolina-mcdermott77.test",
+    "handle": "carolina-mcderm77.test",
     "viewer": Object {
       "blockedBy": false,
       "muted": false,

package/tests/views/__snapshots__/author-feed.test.ts.snap

@@ -242,6 +242,9 @@ Array [
                 "cid": "cids(8)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
+                "likeCount": 2,
+                "replyCount": 0,
+                "repostCount": 0,
                 "uri": "record(9)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
@@ -289,6 +292,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 1,
           "uri": "record(7)",
           "value": Object {
             "$type": "app.bsky.feed.post",
@@ -754,6 +760,9 @@ Array [
                   "cid": "cids(4)",
                   "indexedAt": "1970-01-01T00:00:00.000Z",
                   "labels": Array [],
+                  "likeCount": 0,
+                  "replyCount": 0,
+                  "repostCount": 0,
                   "uri": "record(2)",
                   "value": Object {
                     "$type": "app.bsky.feed.post",
@@ -770,6 +779,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 2,
+          "replyCount": 0,
+          "repostCount": 0,
           "uri": "record(1)",
           "value": Object {
             "$type": "app.bsky.feed.post",
@@ -1042,6 +1054,9 @@ Array [
             "embeds": Array [],
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
+            "likeCount": 0,
+            "replyCount": 0,
+            "repostCount": 0,
             "uri": "record(2)",
             "value": Object {
               "$type": "app.bsky.feed.post",
@@ -1428,6 +1443,9 @@ Array [
                   "cid": "cids(9)",
                   "indexedAt": "1970-01-01T00:00:00.000Z",
                   "labels": Array [],
+                  "likeCount": 0,
+                  "replyCount": 0,
+                  "repostCount": 0,
                   "uri": "record(11)",
                   "value": Object {
                     "$type": "app.bsky.feed.post",
@@ -1444,6 +1462,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 2,
+          "replyCount": 0,
+          "repostCount": 0,
           "uri": "record(10)",
           "value": Object {
             "$type": "app.bsky.feed.post",
@@ -1798,6 +1819,9 @@ Array [
                 "cid": "cids(8)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
+                "likeCount": 2,
+                "replyCount": 0,
+                "repostCount": 0,
                 "uri": "record(10)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
@@ -1845,6 +1869,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 1,
           "uri": "record(9)",
           "value": Object {
             "$type": "app.bsky.feed.post",

package/tests/views/__snapshots__/block-lists.test.ts.snap

@@ -66,6 +66,9 @@ Object {
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 1,
           "uri": "record(3)",
           "value": Object {
             "$type": "app.bsky.feed.post",

package/tests/views/__snapshots__/blocks.test.ts.snap

@@ -66,6 +66,9 @@ Object {
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 1,
           "uri": "record(3)",
           "value": Object {
             "$type": "app.bsky.feed.post",

package/tests/views/__snapshots__/list-feed.test.ts.snap

@@ -420,6 +420,9 @@ Array [
                 "cid": "cids(8)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
+                "likeCount": 2,
+                "replyCount": 0,
+                "repostCount": 0,
                 "uri": "record(10)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
@@ -467,6 +470,9 @@ Array [
           ],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 1,
           "uri": "record(9)",
           "value": Object {
             "$type": "app.bsky.feed.post",

package/tests/views/__snapshots__/posts.test.ts.snap

@@ -182,6 +182,9 @@ Array [
           "embeds": Array [],
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
+          "likeCount": 0,
+          "replyCount": 0,
+          "repostCount": 0,
           "uri": "record(3)",
           "value": Object {
             "$type": "app.bsky.feed.post",
@@ -311,6 +314,9 @@ Array [
                 "cid": "cids(4)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
+                "likeCount": 0,
+                "replyCount": 0,
+                "repostCount": 0,
                 "uri": "record(3)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
@@ -327,6 +333,9 @@ Array [
         ],
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
+        "likeCount": 2,
+        "replyCount": 0,
+        "repostCount": 0,
         "uri": "record(6)",
         "value": Object {
           "$type": "app.bsky.feed.post",