@atproto/bsky 0.0.112 → 0.0.113

package/src/hydration/hydrator.ts

@@ -43,7 +43,7 @@ import {
   mergeNestedMaps,
   mergeManyMaps,
 } from './util'
-import { uriToDid as didFromUri } from '../util/uris'
+import { uriToDid as didFromUri, uriToDid } from '../util/uris'
 import {
   FeedGenAggs,
   FeedGens,
@@ -279,10 +279,11 @@ export class Hydrator {
   //   - profile basic
   async hydrateLists(uris: string[], ctx: HydrateCtx): Promise<HydrationState> {
     const [listsState, profilesState] = await Promise.all([
-      await this.hydrateListsBasic(uris, ctx),
-      await this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
+      this.hydrateListsBasic(uris, ctx, {
+        skipAuthors: true, // handled via author profile hydration
+      }),
+      this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
     ])
-
     return mergeStates(listsState, profilesState)
   }
 
@@ -291,19 +292,26 @@ export class Hydrator {
   async hydrateListsBasic(
     uris: string[],
     ctx: HydrateCtx,
+    opts?: { skipAuthors: boolean },
   ): Promise<HydrationState> {
-    const [lists, listAggs, listViewers, labels] = await Promise.all([
+    const includeAuthorDids = opts?.skipAuthors ? [] : uris.map(uriToDid)
+    const [lists, listAggs, listViewers, labels, actors] = await Promise.all([
       this.graph.getLists(uris, ctx.includeTakedowns),
       this.graph.getListAggregates(uris.map((uri) => ({ uri }))),
       ctx.viewer ? this.graph.getListViewerStates(uris, ctx.viewer) : undefined,
-      this.label.getLabelsForSubjects(uris, ctx.labelers),
+      this.label.getLabelsForSubjects(
+        [...uris, ...includeAuthorDids],
+        ctx.labelers,
+      ),
+      this.actor.getActors(includeAuthorDids, ctx.includeTakedowns),
     ])
 
     if (!ctx.includeTakedowns) {
       actionTakedownLabels(uris, lists, labels)
+      actionTakedownLabels(includeAuthorDids, actors, labels)
     }
 
-    return { lists, listAggs, listViewers, labels, ctx }
+    return { lists, listAggs, listViewers, labels, actors, ctx }
   }
 
   // app.bsky.graph.defs#listItemView
@@ -533,12 +541,14 @@ export class Hydrator {
       }
     }
     // replace embed/parent/root pairs with block state
-    const blocks = await this.graph.getBidirectionalBlocks(relationships)
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(relationships),
+    )
     for (const [uri, { embed, parent, root }] of postBlocksPairs) {
       postBlocks.set(uri, {
-        embed: !!embed && blocks.isBlocked(...embed),
-        parent: !!parent && blocks.isBlocked(...parent),
-        root: !!root && blocks.isBlocked(...root),
+        embed: !!embed && !!isBlocked(blocks, embed),
+        parent: !!parent && !!isBlocked(blocks, parent),
+        root: !!root && !!isBlocked(blocks, root),
       })
     }
     return postBlocks
@@ -756,8 +766,8 @@ export class Hydrator {
         )
       },
     )
-    const blocks = await this.graph.getBidirectionalBlocks(
-      listCreatorMemberPairs,
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(listCreatorMemberPairs),
     )
     // sample top list items per starter pack based on their follows
     const listMemberAggs = await this.actor.getProfileAggregates(listMemberDids)
@@ -772,7 +782,8 @@ export class Hydrator {
       // update aggregation with list items for top 12 most followed members
       agg.listItemSampleUris = [
         ...members.listitems.filter(
-          (li) => ctx.viewer === creator || !blocks?.isBlocked(creator, li.did),
+          (li) =>
+            ctx.viewer === creator || !isBlocked(blocks, [creator, li.did]),
         ),
       ]
         .sort((li1, li2) => {
@@ -814,11 +825,11 @@ export class Hydrator {
         pairs.push([authorDid, didFromUri(uri)])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const likeBlocks = new HydrationMap<LikeBlock>()
     for (const [uri, like] of likes) {
       if (like) {
-        likeBlocks.set(uri, blocks.isBlocked(authorDid, didFromUri(uri)))
+        likeBlocks.set(uri, isBlocked(blocks, [authorDid, didFromUri(uri)]))
       } else {
         likeBlocks.set(uri, null)
       }
@@ -898,13 +909,13 @@ export class Hydrator {
         pairs.push([didFromUri(uri), follow.record.subject])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const followBlocks = new HydrationMap<FollowBlock>()
     for (const [uri, follow] of follows) {
       if (follow) {
         followBlocks.set(
           uri,
-          blocks.isBlocked(didFromUri(uri), follow.record.subject),
+          isBlocked(blocks, [didFromUri(uri), follow.record.subject]),
         )
       } else {
         followBlocks.set(uri, null)
@@ -926,10 +937,32 @@ export class Hydrator {
     const result = new HydrationMap<HydrationMap<boolean>>()
     const blocks = await this.graph.getBidirectionalBlocks(pairs)
 
+    // lookup list authors to apply takedown status to blocklists
+    const listAuthorDids = new Set<string>()
+    for (const [source, targets] of didMap) {
+      for (const target of targets) {
+        const block = blocks.get(source, target)
+        if (block?.blockListUri) {
+          listAuthorDids.add(uriToDid(block.blockListUri))
+        }
+      }
+    }
+
+    const activeListAuthors = await this.actor.getActors(
+      [...listAuthorDids],
+      false,
+    )
+
     for (const [source, targets] of didMap) {
       const didBlocks = new HydrationMap<boolean>()
       for (const target of targets) {
-        didBlocks.set(target, blocks.isBlocked(source, target))
+        const block = blocks.get(source, target)
+        const isBlocked = !!(
+          block?.blockUri ||
+          (block?.blockListUri &&
+            activeListAuthors.get(uriToDid(block.blockListUri)))
+        )
+        didBlocks.set(target, isBlocked)
       }
       result.set(source, didBlocks)
     }
@@ -1198,6 +1231,20 @@ const getListUrisFromThreadgates = (gates: Threadgates) => {
   return uris
 }
 
+const isBlocked = (blocks: BidirectionalBlocks, [a, b]: RelationshipPair) => {
+  return blocks.get(a)?.get(b) ?? null
+}
+
+const pairsToMap = (pairs: RelationshipPair[]): Map<string, string[]> => {
+  const map = new Map<string, string[]>()
+  for (const [a, b] of pairs) {
+    const list = map.get(a) ?? []
+    list.push(b)
+    map.set(a, list)
+  }
+  return map
+}
+
 export const mergeStates = (
   stateA: HydrationState,
   stateB: HydrationState,

package/src/views/index.ts

@@ -7,7 +7,7 @@ import {
   ProfileViewDetailed,
   ProfileView,
   ProfileViewBasic,
-  ViewerState as ProfileViewerState,
+  ViewerState as ProfileViewer,
 } from '../lexicon/types/app/bsky/actor/defs'
 import {
   BlockedPost,
@@ -35,7 +35,11 @@ import {
   VideoUriBuilder,
   parsePostgate,
 } from './util'
-import { uriToDid as creatorFromUri, safePinnedPost } from '../util/uris'
+import {
+  uriToDid as creatorFromUri,
+  safePinnedPost,
+  uriToDid,
+} from '../util/uris'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
@@ -73,6 +77,7 @@ import {
 } from '../lexicon/types/app/bsky/labeler/defs'
 import { Notification } from '../proto/bsky_pb'
 import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
+import { ProfileViewerState } from '../hydration/actor'
 
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
@@ -101,9 +106,10 @@ export class Views {
   }
 
   actorIsTakendown(did: string, state: HydrationState): boolean {
-    if (state.actors?.get(did)?.takedownRef) return true
-    if (state.actors?.get(did)?.upstreamStatus === 'takendown') return true
-    if (state.actors?.get(did)?.upstreamStatus === 'suspended') return true
+    const actor = state.actors?.get(did)
+    if (actor?.takedownRef) return true
+    if (actor?.upstreamStatus === 'takendown') return true
+    if (actor?.upstreamStatus === 'suspended') return true
     if (state.labels?.get(did)?.isTakendown) return true
     return false
   }
@@ -111,18 +117,45 @@ export class Views {
   viewerBlockExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return (
-      !!actor.blockedBy ||
-      !!actor.blocking ||
-      !!actor.blockedByList ||
-      !!actor.blockingByList
+    return !!(
+      actor.blockedBy ||
+      actor.blocking ||
+      this.blockedByList(actor, state) ||
+      this.blockingByList(actor, state)
     )
   }
 
   viewerMuteExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return actor.muted || !!actor.mutedByList
+    return !!(actor.muted || this.mutedByList(actor, state))
+  }
+
+  blockingByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockingByList && this.recordActive(viewer.blockingByList, state)
+    )
+  }
+
+  blockedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockedByList && this.recordActive(viewer.blockedByList, state)
+    )
+  }
+
+  mutedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return viewer.mutedByList && this.recordActive(viewer.mutedByList, state)
+  }
+
+  recordActive(uri: string, state: HydrationState) {
+    const did = uriToDid(uri)
+    const actor = state.actors?.get(did)
+    if (!actor || this.actorIsTakendown(did, state)) {
+      // actor may not be present when takedowns are eagerly applied during hydration.
+      // so it's important to _try_ to hydrate the actor for records checked this way.
+      return
+    }
+    return uri
   }
 
   viewerSeesNeedsReview(did: string, state: HydrationState): boolean {
@@ -276,24 +309,22 @@ export class Views {
     }
   }
 
-  profileViewer(
-    did: string,
-    state: HydrationState,
-  ): ProfileViewerState | undefined {
+  profileViewer(did: string, state: HydrationState): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByList = this.blockedByList(viewer, state)
+    const blockedByUri = viewer.blockedBy || blockedByList
+    const blockingByList = this.blockingByList(viewer, state)
+    const blockingUri = viewer.blocking || blockingByList
     const block = !!blockedByUri || !!blockingUri
+    const mutedByList = this.mutedByList(viewer, state)
     return {
-      muted: viewer.muted || !!viewer.mutedByList,
-      mutedByList: viewer.mutedByList
-        ? this.listBasic(viewer.mutedByList, state)
-        : undefined,
+      muted: !!(viewer.muted || mutedByList),
+      mutedByList: mutedByList ? this.listBasic(mutedByList, state) : undefined,
       blockedBy: !!blockedByUri,
       blocking: blockingUri,
-      blockingByList: viewer.blockingByList
-        ? this.listBasic(viewer.blockingByList, state)
+      blockingByList: blockingByList
+        ? this.listBasic(blockingByList, state)
         : undefined,
       following: viewer.following && !block ? viewer.following : undefined,
       followedBy: viewer.followedBy && !block ? viewer.followedBy : undefined,
@@ -323,11 +354,11 @@ export class Views {
   blockedProfileViewer(
     did: string,
     state: HydrationState,
-  ): ProfileViewerState | undefined {
+  ): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByUri = viewer.blockedBy || this.blockedByList(viewer, state)
+    const blockingUri = viewer.blocking || this.blockingByList(viewer, state)
     return {
       blockedBy: !!blockedByUri,
       blocking: blockingUri,

package/tests/label-hydration.test.ts

@@ -73,8 +73,11 @@ describe('label hydration', () => {
     expect(res.data.labels?.find((l) => l.src === labelerDid)?.val).toEqual(
       'misleading',
     )
-    const labelerHeaderDids = res.headers['atproto-content-labelers'].split(',')
-    expect(labelerHeaderDids.sort()).toEqual(
+    const labelerHeaderDids = res.headers['atproto-content-labelers']
+      ?.split(',')
+      .sort()
+
+    expect(labelerHeaderDids).toEqual(
       [alice, `${bob};redact`, labelerDid].sort(),
     )
   })

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

@@ -487,7 +487,7 @@ describe('pds author feed views', () => {
       await sc.post(alice, 'not pinned post')
       const post = await createAndPinPost()
       await sc.post(alice, 'not pinned post')
-
+      await network.processAll()
       const { data } = await agent.api.app.bsky.feed.getAuthorFeed(
         { actor: sc.accounts[alice].handle, includePins: true },
         {

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

@@ -37,6 +37,16 @@ describe('bsky takedown labels', () => {
       sc.getHeaders(sc.dids.carol),
     )
     carolListRef = await sc.createList(sc.dids.carol, 'carol list', 'mod')
+    // alice blocks dan via carol's list, and carol is takendown
+    await sc.addToList(sc.dids.carol, sc.dids.dan, carolListRef)
+    await pdsAgent.app.bsky.graph.listblock.create(
+      { repo: sc.dids.alice },
+      {
+        subject: carolListRef.uriStr,
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(sc.dids.alice),
+    )
     aliceGenRef = await sc.createFeedGen(
       sc.dids.alice,
       'did:web:example.com',
@@ -190,6 +200,25 @@ describe('bsky takedown labels', () => {
     expect(profile.viewer?.blockingByList).toBeUndefined()
   })
 
+  it('author takedown halts application of mod lists', async () => {
+    const { data: profile } = await agent.app.bsky.actor.getProfile(
+      {
+        actor: sc.dids.dan, // blocked via carol's list, and carol is takendown
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          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],