@atproto/bsky 0.0.96 → 0.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.96",
+  "version": "0.0.97",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -42,10 +42,10 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.18",
-    "@atproto/common": "^0.4.4",
+    "@atproto/api": "^0.13.19",
     "@atproto/crypto": "^0.4.2",
     "@atproto/identity": "^0.4.3",
+    "@atproto/common": "^0.4.4",
     "@atproto/lexicon": "^0.4.3",
     "@atproto/repo": "^0.5.5",
     "@atproto/sync": "^0.1.6",
@@ -66,9 +66,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.13.18",
+    "@atproto/api": "^0.13.19",
+    "@atproto/pds": "^0.4.75",
     "@atproto/lex-cli": "^0.5.2",
-    "@atproto/pds": "^0.4.73",
     "@atproto/xrpc": "^0.6.4"
   },
   "scripts": {

package/src/api/app/bsky/actor/getProfile.ts

@@ -60,7 +60,9 @@ const hydration = async (input: {
   const { ctx, params, skeleton } = input
   return ctx.hydrator.hydrateProfilesDetailed(
     [skeleton.did],
-    params.hydrateCtx.copy({ includeTakedowns: true }),
+    params.hydrateCtx.copy({
+      includeActorTakedowns: true,
+    }),
   )
 }
 

package/src/api/app/bsky/feed/getLikes.ts

@@ -3,11 +3,12 @@ import { normalizeDatetimeAlways } from '@atproto/syntax'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getLikes'
 import AppContext from '../../../../context'
-import { createPipeline } from '../../../../pipeline'
+import { createPipeline, RulesFnInput } from '../../../../pipeline'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
+  mergeStates,
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
@@ -43,8 +44,10 @@ const skeleton = async (inputs: {
   params: Params
 }): Promise<Skeleton> => {
   const { ctx, params } = inputs
+  const authorDid = creatorFromUri(params.uri)
+
   if (clearlyBadCursor(params.cursor)) {
-    return { likes: [] }
+    return { authorDid, likes: [] }
   }
   if (looksLikeNonSortedCursor(params.cursor)) {
     throw new InvalidRequestError(
@@ -57,6 +60,7 @@ const skeleton = async (inputs: {
     limit: params.limit,
   })
   return {
+    authorDid,
     likes: likesRes.uris,
     cursor: parseString(likesRes.cursor),
   }
@@ -68,18 +72,25 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }) => {
   const { ctx, params, skeleton } = inputs
-  return await ctx.hydrator.hydrateLikes(skeleton.likes, params.hydrateCtx)
+  const likesState = await ctx.hydrator.hydrateLikes(
+    skeleton.authorDid,
+    skeleton.likes,
+    params.hydrateCtx,
+  )
+  return likesState
 }
 
-const noBlocks = (inputs: {
-  ctx: Context
-  skeleton: Skeleton
-  hydration: HydrationState
-}) => {
-  const { ctx, skeleton, hydration } = inputs
-  skeleton.likes = skeleton.likes.filter((uri) => {
-    const creator = creatorFromUri(uri)
-    return !ctx.views.viewerBlockExists(creator, hydration)
+const noBlocks = (input: RulesFnInput<Context, Params, Skeleton>) => {
+  const { ctx, skeleton, hydration } = input
+
+  skeleton.likes = skeleton.likes.filter((likeUri) => {
+    const like = hydration.likes?.get(likeUri)
+    if (!like) return false
+    const likerDid = creatorFromUri(likeUri)
+    return (
+      !hydration.likeBlocks?.get(likeUri) &&
+      !ctx.views.viewerBlockExists(likerDid, hydration)
+    )
   })
   return skeleton
 }
@@ -123,6 +134,7 @@ type Context = {
 type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
+  authorDid: string
   likes: string[]
   cursor?: string
 }

package/src/auth-verifier.ts

@@ -18,14 +18,7 @@ import {
   unpackIdentityKeys,
 } from './data-plane'
 import { GetIdentityByDidResponse } from './proto/bsky_pb'
-import {
-  extractMultikey,
-  extractPrefixedBytes,
-  hasPrefix,
-  parseDidKey,
-  SECP256K1_DID_PREFIX,
-  SECP256K1_JWT_ALG,
-} from '@atproto/crypto'
+import { parseDidKey, SECP256K1_JWT_ALG } from '@atproto/crypto'
 
 type ReqCtx = {
   req: express.Request

package/src/hydration/hydrator.ts

@@ -65,6 +65,7 @@ export class HydrateCtx {
   labelers = this.vals.labelers
   viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
   includeTakedowns = this.vals.includeTakedowns
+  includeActorTakedowns = this.vals.includeActorTakedowns
   include3pBlocks = this.vals.include3pBlocks
   constructor(private vals: HydrateCtxVals) {}
   copy<V extends Partial<HydrateCtxVals>>(vals?: V): HydrateCtx & V {
@@ -76,6 +77,7 @@ export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: string | null
   includeTakedowns?: boolean
+  includeActorTakedowns?: boolean
   include3pBlocks?: boolean
 }
 
@@ -98,6 +100,7 @@ export type HydrationState = {
   listViewers?: ListViewerStates
   listItems?: ListItems
   likes?: Likes
+  likeBlocks?: LikeBlocks
   labels?: Labels
   feedgens?: FeedGens
   feedgenViewers?: FeedGenViewerStates
@@ -119,6 +122,9 @@ type PostBlockPairs = {
   root?: RelationshipPair
 }
 
+export type LikeBlock = boolean
+export type LikeBlocks = HydrationMap<LikeBlock>
+
 export type FollowBlock = boolean
 export type FollowBlocks = HydrationMap<FollowBlock>
 
@@ -179,12 +185,13 @@ export class Hydrator {
     dids: string[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
+    const includeTakedowns = ctx.includeTakedowns || ctx.includeActorTakedowns
     const [actors, labels, profileViewersState] = await Promise.all([
-      this.actor.getActors(dids, ctx.includeTakedowns),
+      this.actor.getActors(dids, includeTakedowns),
       this.label.getLabelsForSubjects(labelSubjectsForDid(dids), ctx.labelers),
       this.hydrateProfileViewers(dids, ctx),
     ])
-    if (!ctx.includeTakedowns) {
+    if (!includeTakedowns) {
       actionTakedownLabels(dids, actors, labels)
     }
     return mergeStates(profileViewersState ?? {}, {
@@ -743,12 +750,33 @@ export class Hydrator {
   // - like
   //   - profile
   //     - list basic
-  async hydrateLikes(uris: string[], ctx: HydrateCtx): Promise<HydrationState> {
+  async hydrateLikes(
+    authorDid: string,
+    uris: string[],
+    ctx: HydrateCtx,
+  ): Promise<HydrationState> {
     const [likes, profileState] = await Promise.all([
       this.feed.getLikes(uris, ctx.includeTakedowns),
       this.hydrateProfiles(uris.map(didFromUri), ctx),
     ])
-    return mergeStates(profileState, { likes, ctx })
+
+    const pairs: RelationshipPair[] = []
+    for (const [uri, like] of likes) {
+      if (like) {
+        pairs.push([authorDid, didFromUri(uri)])
+      }
+    }
+    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const likeBlocks = new HydrationMap<LikeBlock>()
+    for (const [uri, like] of likes) {
+      if (like) {
+        likeBlocks.set(uri, blocks.isBlocked(authorDid, didFromUri(uri)))
+      } else {
+        likeBlocks.set(uri, null)
+      }
+    }
+
+    return mergeStates(profileState, { likes, likeBlocks, ctx })
   }
 
   // app.bsky.feed.getRepostedBy#repostedBy
@@ -1151,6 +1179,7 @@ export const mergeStates = (
     listViewers: mergeMaps(stateA.listViewers, stateB.listViewers),
     listItems: mergeMaps(stateA.listItems, stateB.listItems),
     likes: mergeMaps(stateA.likes, stateB.likes),
+    likeBlocks: mergeMaps(stateA.likeBlocks, stateB.likeBlocks),
     labels: mergeMaps(stateA.labels, stateB.labels),
     feedgens: mergeMaps(stateA.feedgens, stateB.feedgens),
     feedgenAggs: mergeMaps(stateA.feedgenAggs, stateB.feedgenAggs),

package/src/lexicon/lexicons.ts

@@ -10728,8 +10728,9 @@ export const schemaDict = {
       },
     },
   },
-}
-export const schemas: LexiconDoc[] = Object.values(schemaDict) as LexiconDoc[]
+} as const satisfies Record<string, LexiconDoc>
+
+export const schemas = Object.values(schemaDict)
 export const lexicons: Lexicons = new Lexicons(schemas)
 export const ids = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',

package/tests/views/labels-takedown.test.ts

@@ -5,6 +5,7 @@ import { ids } from '../../src/lexicon/lexicons'
 describe('bsky takedown labels', () => {
   let network: TestNetwork
   let agent: AtpAgent
+  let pdsAgent: AtpAgent
   let sc: SeedClient
 
   let takendownSubjects: string[]
@@ -20,10 +21,21 @@ describe('bsky takedown labels', () => {
       dbPostgresSchema: 'bsky_views_takedown_labels',
     })
     agent = network.bsky.getClient()
+    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
 
     aliceListRef = await sc.createList(sc.dids.alice, 'alice list', 'mod')
+    // carol blocks dan via alice's (takendown) list
+    await sc.addToList(sc.dids.alice, sc.dids.dan, aliceListRef)
+    await pdsAgent.app.bsky.graph.listblock.create(
+      { repo: sc.dids.carol },
+      {
+        subject: aliceListRef.uriStr,
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(sc.dids.carol),
+    )
     carolListRef = await sc.createList(sc.dids.carol, 'carol list', 'mod')
     aliceGenRef = await sc.createFeedGen(
       sc.dids.alice,
@@ -159,6 +171,25 @@ describe('bsky takedown labels', () => {
     await expect(attempt2).rejects.toThrow('List not found')
   })
 
+  it('halts application of mod lists', async () => {
+    const { data: profile } = await agent.app.bsky.actor.getProfile(
+      {
+        actor: sc.dids.dan, // blocked via alice's takendown list
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.carol,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
+    )
+    expect(profile.did).toBe(sc.dids.dan)
+    expect(profile.viewer).not.toBeUndefined()
+    expect(profile.viewer?.blockedBy).toBe(false)
+    expect(profile.viewer?.blocking).toBeUndefined()
+    expect(profile.viewer?.blockingByList).toBeUndefined()
+  })
+
   it('takesdown feed generators', async () => {
     const res = await agent.api.app.bsky.feed.getFeedGenerators({
       feeds: [aliceGenRef.uriStr, bobGenRef.uriStr, carolGenRef.uriStr],

package/tests/views/likes.test.ts

@@ -11,6 +11,8 @@ describe('pds like views', () => {
   // account dids, for convenience
   let alice: string
   let bob: string
+  let carol: string
+  let frankie: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -19,9 +21,17 @@ describe('pds like views', () => {
     agent = network.bsky.getClient()
     sc = network.getSeedClient()
     await likesSeed(sc)
+    await sc.createAccount('frankie', {
+      handle: 'frankie.test',
+      email: 'frankie@frankie.com',
+      password: 'password',
+    })
     await network.processAll()
+
     alice = sc.dids.alice
     bob = sc.dids.bob
+    carol = sc.dids.carol
+    frankie = sc.dids.frankie
   })
 
   afterAll(async () => {
@@ -108,4 +118,70 @@ describe('pds like views', () => {
       }),
     )
   })
+
+  it(`author viewer doesn't see likes by user the author blocked`, async () => {
+    await sc.like(frankie, sc.posts[alice][1].ref)
+    await network.processAll()
+
+    const beforeBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(beforeBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.frankie,
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+
+    await sc.block(alice, frankie)
+    await network.processAll()
+
+    const afterBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(alice, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(afterBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+  })
+
+  it(`non-author viewer doesn't see likes by user the author blocked and by user the viewer blocked `, async () => {
+    await sc.unblock(alice, frankie)
+    await network.processAll()
+
+    const beforeBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(bob, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(beforeBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.frankie,
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.carol,
+      sc.dids.bob,
+    ])
+
+    await sc.block(alice, frankie)
+    await sc.block(bob, carol)
+    await network.processAll()
+
+    const afterBlock = await agent.app.bsky.feed.getLikes(
+      { uri: sc.posts[alice][1].ref.uriStr },
+      { headers: await network.serviceHeaders(bob, ids.AppBskyFeedGetLikes) },
+    )
+
+    expect(afterBlock.data.likes.map((like) => like.actor.did)).toStrictEqual([
+      sc.dids.eve,
+      sc.dids.dan,
+      sc.dids.bob,
+    ])
+  })
 })