@atproto/bsky 0.0.60 → 0.0.61

package/src/lexicon/lexicons.ts

@@ -4107,6 +4107,29 @@ export const schemaDict = {
             type: 'string',
             format: 'at-uri',
           },
+          knownFollowers: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#knownFollowers',
+          },
+        },
+      },
+      knownFollowers: {
+        type: 'object',
+        description: "The subject's followers whom you also follow",
+        required: ['count', 'followers'],
+        properties: {
+          count: {
+            type: 'integer',
+          },
+          followers: {
+            type: 'array',
+            minLength: 0,
+            maxLength: 5,
+            items: {
+              type: 'ref',
+              ref: 'lex:app.bsky.actor.defs#profileViewBasic',
+            },
+          },
         },
       },
       preferences: {
@@ -7101,6 +7124,59 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyGraphGetKnownFollowers: {
+    lexicon: 1,
+    id: 'app.bsky.graph.getKnownFollowers',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates accounts which follow a specified account (actor) and are followed by the viewer.',
+        parameters: {
+          type: 'params',
+          required: ['actor'],
+          properties: {
+            actor: {
+              type: 'string',
+              format: 'at-identifier',
+            },
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 100,
+              default: 50,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['subject', 'followers'],
+            properties: {
+              subject: {
+                type: 'ref',
+                ref: 'lex:app.bsky.actor.defs#profileView',
+              },
+              cursor: {
+                type: 'string',
+              },
+              followers: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.actor.defs#profileView',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyGraphGetList: {
     lexicon: 1,
     id: 'app.bsky.graph.getList',
@@ -9523,6 +9599,7 @@ export const ids = {
   AppBskyGraphGetBlocks: 'app.bsky.graph.getBlocks',
   AppBskyGraphGetFollowers: 'app.bsky.graph.getFollowers',
   AppBskyGraphGetFollows: 'app.bsky.graph.getFollows',
+  AppBskyGraphGetKnownFollowers: 'app.bsky.graph.getKnownFollowers',
   AppBskyGraphGetList: 'app.bsky.graph.getList',
   AppBskyGraphGetListBlocks: 'app.bsky.graph.getListBlocks',
   AppBskyGraphGetListMutes: 'app.bsky.graph.getListMutes',

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

@@ -133,6 +133,7 @@ export interface ViewerState {
   blockingByList?: AppBskyGraphDefs.ListViewBasic
   following?: string
   followedBy?: string
+  knownFollowers?: KnownFollowers
   [k: string]: unknown
 }
 
@@ -148,6 +149,25 @@ export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#viewerState', v)
 }
 
+/** The subject's followers whom you also follow */
+export interface KnownFollowers {
+  count: number
+  followers: ProfileViewBasic[]
+  [k: string]: unknown
+}
+
+export function isKnownFollowers(v: unknown): v is KnownFollowers {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#knownFollowers'
+  )
+}
+
+export function validateKnownFollowers(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+}
+
 export type Preferences = (
   | AdultContentPref
   | ContentLabelPref

package/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts

@@ -0,0 +1,50 @@
+/**
+ * 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 AppBskyActorDefs from '../actor/defs'
+
+export interface QueryParams {
+  actor: string
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  subject: AppBskyActorDefs.ProfileView
+  cursor?: string
+  followers: AppBskyActorDefs.ProfileView[]
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+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/logger.ts

@@ -12,6 +12,8 @@ export const subLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky:sub')
 export const labelerLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky:labeler')
+export const hydrationLogger: ReturnType<typeof subsystemLogger> =
+  subsystemLogger('bsky:hydration')
 export const httpLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky')
 

package/src/proto/bsky_pb.ts

@@ -9820,9 +9820,9 @@ export class GetFollowsFollowingRequest extends Message<GetFollowsFollowingReque
   actorDid = ''
 
   /**
-   * @generated from field: string target_did = 2;
+   * @generated from field: repeated string target_dids = 2;
    */
-  targetDid = ''
+  targetDids: string[] = []
 
   constructor(data?: PartialMessage<GetFollowsFollowingRequest>) {
     super()
@@ -9833,7 +9833,13 @@ export class GetFollowsFollowingRequest extends Message<GetFollowsFollowingReque
   static readonly typeName = 'bsky.GetFollowsFollowingRequest'
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: 'actor_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-    { no: 2, name: 'target_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+    {
+      no: 2,
+      name: 'target_dids',
+      kind: 'scalar',
+      T: 9 /* ScalarType.STRING */,
+      repeated: true,
+    },
   ])
 
   static fromBinary(
@@ -9871,14 +9877,75 @@ export class GetFollowsFollowingRequest extends Message<GetFollowsFollowingReque
   }
 }
 
+/**
+ * @generated from message bsky.FollowsFollowing
+ */
+export class FollowsFollowing extends Message<FollowsFollowing> {
+  /**
+   * @generated from field: string target_did = 1;
+   */
+  targetDid = ''
+
+  /**
+   * @generated from field: repeated string dids = 2;
+   */
+  dids: string[] = []
+
+  constructor(data?: PartialMessage<FollowsFollowing>) {
+    super()
+    proto3.util.initPartial(data, this)
+  }
+
+  static readonly runtime: typeof proto3 = proto3
+  static readonly typeName = 'bsky.FollowsFollowing'
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: 'target_did', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
+    {
+      no: 2,
+      name: 'dids',
+      kind: 'scalar',
+      T: 9 /* ScalarType.STRING */,
+      repeated: true,
+    },
+  ])
+
+  static fromBinary(
+    bytes: Uint8Array,
+    options?: Partial<BinaryReadOptions>,
+  ): FollowsFollowing {
+    return new FollowsFollowing().fromBinary(bytes, options)
+  }
+
+  static fromJson(
+    jsonValue: JsonValue,
+    options?: Partial<JsonReadOptions>,
+  ): FollowsFollowing {
+    return new FollowsFollowing().fromJson(jsonValue, options)
+  }
+
+  static fromJsonString(
+    jsonString: string,
+    options?: Partial<JsonReadOptions>,
+  ): FollowsFollowing {
+    return new FollowsFollowing().fromJsonString(jsonString, options)
+  }
+
+  static equals(
+    a: FollowsFollowing | PlainMessage<FollowsFollowing> | undefined,
+    b: FollowsFollowing | PlainMessage<FollowsFollowing> | undefined,
+  ): boolean {
+    return proto3.util.equals(FollowsFollowing, a, b)
+  }
+}
+
 /**
  * @generated from message bsky.GetFollowsFollowingResponse
  */
 export class GetFollowsFollowingResponse extends Message<GetFollowsFollowingResponse> {
   /**
-   * @generated from field: repeated string dids = 1;
+   * @generated from field: repeated bsky.FollowsFollowing results = 1;
    */
-  dids: string[] = []
+  results: FollowsFollowing[] = []
 
   constructor(data?: PartialMessage<GetFollowsFollowingResponse>) {
     super()
@@ -9890,9 +9957,9 @@ export class GetFollowsFollowingResponse extends Message<GetFollowsFollowingResp
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     {
       no: 1,
-      name: 'dids',
-      kind: 'scalar',
-      T: 9 /* ScalarType.STRING */,
+      name: 'results',
+      kind: 'message',
+      T: FollowsFollowing,
       repeated: true,
     },
   ])

package/src/views/index.ts

@@ -2,6 +2,7 @@ import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { mapDefined } from '@atproto/common'
 import { ImageUriBuilder } from '../image/uri'
 import { HydrationState } from '../hydration/hydrator'
+import { ProfileViewerState as HydratorProfileViewerState } from '../hydration/actor'
 import { ids } from '../lexicon/lexicons'
 import {
   ProfileViewDetailed,
@@ -107,9 +108,19 @@ export class Views {
     if (!actor) return
     const baseView = this.profile(did, state)
     if (!baseView) return
+    const knownFollowersSkeleton = state.knownFollowers?.get(did)
+    const knownFollowers = knownFollowersSkeleton
+      ? this.knownFollowers(knownFollowersSkeleton, state)
+      : undefined
     const profileAggs = state.profileAggs?.get(did)
     return {
       ...baseView,
+      viewer: baseView.viewer
+        ? {
+            ...baseView.viewer,
+            knownFollowers,
+          }
+        : undefined,
       banner: actor.profile?.banner
         ? this.imgUriBuilder.getPresetUri(
             'banner',
@@ -216,6 +227,19 @@ export class Views {
     }
   }
 
+  knownFollowers(
+    knownFollowers: Required<HydratorProfileViewerState>['knownFollowers'],
+    state: HydrationState,
+  ) {
+    const followers = mapDefined(knownFollowers.followers, (did) => {
+      if (this.viewerBlockExists(did, state)) {
+        return undefined
+      }
+      return this.profileBasic(did, state)
+    })
+    return { count: knownFollowers.count, followers }
+  }
+
   blockedProfileViewer(
     did: string,
     state: HydrationState,

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

@@ -18,6 +18,24 @@ Array [
     "postsCount": 5,
     "viewer": Object {
       "blockedBy": false,
+      "knownFollowers": Object {
+        "count": 1,
+        "followers": Array [
+          Object {
+            "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+            "did": "user(1)",
+            "displayName": "bobby",
+            "handle": "bob.test",
+            "labels": Array [],
+            "viewer": Object {
+              "blockedBy": false,
+              "followedBy": "record(1)",
+              "following": "record(0)",
+              "muted": false,
+            },
+          },
+        ],
+      },
       "muted": false,
     },
   },
@@ -35,7 +53,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(0)",
+          "cid": "cids(1)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
@@ -46,7 +64,7 @@ Array [
           },
           "replyCount": 0,
           "repostCount": 0,
-          "uri": "record(0)",
+          "uri": "record(2)",
           "viewer": Object {},
         },
       },
@@ -61,7 +79,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(1)",
+          "cid": "cids(2)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 0,
@@ -70,19 +88,19 @@ Array [
             "createdAt": "1970-01-01T00:00:00.000Z",
             "reply": Object {
               "parent": Object {
-                "cid": "cids(3)",
-                "uri": "record(3)",
+                "cid": "cids(4)",
+                "uri": "record(5)",
               },
               "root": Object {
-                "cid": "cids(2)",
-                "uri": "record(2)",
+                "cid": "cids(3)",
+                "uri": "record(4)",
               },
             },
             "text": "thanks bob",
           },
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(1)",
+          "uri": "record(3)",
           "viewer": Object {},
         },
         "reply": Object {
@@ -98,19 +116,19 @@ Array [
           "parent": Object {
             "$type": "app.bsky.feed.defs#postView",
             "author": Object {
-              "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(4)@jpeg",
+              "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
               "did": "user(1)",
               "displayName": "bobby",
               "handle": "bob.test",
               "labels": Array [],
               "viewer": Object {
                 "blockedBy": false,
-                "followedBy": "record(5)",
-                "following": "record(4)",
+                "followedBy": "record(1)",
+                "following": "record(0)",
                 "muted": false,
               },
             },
-            "cid": "cids(3)",
+            "cid": "cids(4)",
             "embed": Object {
               "$type": "app.bsky.embed.images#view",
               "images": Array [
@@ -124,17 +142,17 @@ Array [
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [
               Object {
-                "cid": "cids(3)",
+                "cid": "cids(4)",
                 "cts": "1970-01-01T00:00:00.000Z",
                 "src": "did:example:labeler",
-                "uri": "record(3)",
+                "uri": "record(5)",
                 "val": "test-label",
               },
               Object {
-                "cid": "cids(3)",
+                "cid": "cids(4)",
                 "cts": "1970-01-01T00:00:00.000Z",
                 "src": "did:example:labeler",
-                "uri": "record(3)",
+                "uri": "record(5)",
                 "val": "test-label-2",
               },
             ],
@@ -160,19 +178,19 @@ Array [
               },
               "reply": Object {
                 "parent": Object {
-                  "cid": "cids(2)",
-                  "uri": "record(2)",
+                  "cid": "cids(3)",
+                  "uri": "record(4)",
                 },
                 "root": Object {
-                  "cid": "cids(2)",
-                  "uri": "record(2)",
+                  "cid": "cids(3)",
+                  "uri": "record(4)",
                 },
               },
               "text": "hear that label_me label_me_2",
             },
             "replyCount": 1,
             "repostCount": 0,
-            "uri": "record(3)",
+            "uri": "record(5)",
             "viewer": Object {},
           },
           "root": Object {
@@ -186,7 +204,7 @@ Array [
                 "muted": false,
               },
             },
-            "cid": "cids(2)",
+            "cid": "cids(3)",
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
             "likeCount": 3,
@@ -197,7 +215,7 @@ Array [
             },
             "replyCount": 2,
             "repostCount": 1,
-            "uri": "record(2)",
+            "uri": "record(4)",
             "viewer": Object {},
           },
         },
@@ -374,7 +392,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(2)",
+          "cid": "cids(3)",
           "indexedAt": "1970-01-01T00:00:00.000Z",
           "labels": Array [],
           "likeCount": 3,
@@ -385,7 +403,7 @@ Array [
           },
           "replyCount": 2,
           "repostCount": 1,
-          "uri": "record(2)",
+          "uri": "record(4)",
           "viewer": Object {},
         },
       },
@@ -452,7 +470,7 @@ Array [
         },
       },
       Object {
-        "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(4)@jpeg",
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
         "description": "hi im bob label_me",
         "did": "user(1)",
         "displayName": "bobby",
@@ -461,8 +479,8 @@ Array [
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "followedBy": "record(5)",
-          "following": "record(4)",
+          "followedBy": "record(1)",
+          "following": "record(0)",
           "muted": false,
         },
       },

package/tests/label-hydration.test.ts

@@ -4,7 +4,6 @@ import axios from 'axios'
 
 describe('label hydration', () => {
   let network: TestNetwork
-  let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
 
@@ -17,7 +16,6 @@ describe('label hydration', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_label_hydration',
     })
-    agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)

package/tests/query-labels.test.ts

@@ -1,10 +1,8 @@
 import { AtpAgent } from '@atproto/api'
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import axios from 'axios'
 
 describe('label hydration', () => {
   let network: TestNetwork
-  let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
 
@@ -17,7 +15,6 @@ describe('label hydration', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_label_hydration',
     })
-    agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)