@atproto/bsky 0.0.112 → 0.0.114

package/src/data-plane/server/routes/index.ts

@@ -1,6 +1,7 @@
 import { ConnectRouter } from '@connectrpc/connect'
 import { IdResolver } from '@atproto/identity'
 import { Service } from '../../../proto/bsky_connect'
+import { Database } from '../db'
 import blocks from './blocks'
 import feedGens from './feed-gens'
 import feeds from './feeds'
@@ -20,11 +21,10 @@ import records from './records'
 import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
+import starterPacks from './starter-packs'
 import suggestions from './suggestions'
 import sync from './sync'
 import threads from './threads'
-import starterPacks from './starter-packs'
-import { Database } from '../db'
 
 export default (db: Database, idResolver: IdResolver) =>
   (router: ConnectRouter) =>

package/src/data-plane/server/routes/interactions.ts

@@ -1,5 +1,5 @@
-import { DAY, keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { DAY, keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { countAll } from '../db/util'
@@ -17,10 +17,10 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byUri = keyBy(res, 'uri')
     return {
-      likes: uris.map((uri) => byUri[uri]?.likeCount ?? 0),
-      replies: uris.map((uri) => byUri[uri]?.replyCount ?? 0),
-      reposts: uris.map((uri) => byUri[uri]?.repostCount ?? 0),
-      quotes: uris.map((uri) => byUri[uri]?.quoteCount ?? 0),
+      likes: uris.map((uri) => byUri.get(uri)?.likeCount ?? 0),
+      replies: uris.map((uri) => byUri.get(uri)?.replyCount ?? 0),
+      reposts: uris.map((uri) => byUri.get(uri)?.repostCount ?? 0),
+      quotes: uris.map((uri) => byUri.get(uri)?.quoteCount ?? 0),
     }
   },
   async getCountsForUsers(req) {
@@ -52,12 +52,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byDid = keyBy(res, 'did')
     return {
-      followers: req.dids.map((uri) => byDid[uri]?.followersCount ?? 0),
-      following: req.dids.map((uri) => byDid[uri]?.followsCount ?? 0),
-      posts: req.dids.map((uri) => byDid[uri]?.postsCount ?? 0),
-      lists: req.dids.map((uri) => byDid[uri]?.listsCount ?? 0),
-      feeds: req.dids.map((uri) => byDid[uri]?.feedGensCount ?? 0),
-      starterPacks: req.dids.map((uri) => byDid[uri]?.starterPacksCount ?? 0),
+      followers: req.dids.map((uri) => byDid.get(uri)?.followersCount ?? 0),
+      following: req.dids.map((uri) => byDid.get(uri)?.followsCount ?? 0),
+      posts: req.dids.map((uri) => byDid.get(uri)?.postsCount ?? 0),
+      lists: req.dids.map((uri) => byDid.get(uri)?.listsCount ?? 0),
+      feeds: req.dids.map((uri) => byDid.get(uri)?.feedGensCount ?? 0),
+      starterPacks: req.dids.map(
+        (uri) => byDid.get(uri)?.starterPacksCount ?? 0,
+      ),
     }
   },
   async getStarterPackCounts(req) {
@@ -105,7 +107,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const countsByUri = keyBy(countsListItems, 'uri')
     return {
-      listItems: uris.map((uri) => countsByUri[uri]?.count ?? 0),
+      listItems: uris.map((uri) => countsByUri.get(uri)?.count ?? 0),
     }
   },
 })

package/src/data-plane/server/routes/labels.ts

@@ -1,9 +1,9 @@
+import { ServiceImpl } from '@connectrpc/connect'
+import { Selectable } from 'kysely'
 import * as ui8 from 'uint8arrays'
 import { noUndefinedVals } from '@atproto/common'
-import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { Selectable } from 'kysely'
 import { Label } from '../db/tables/label'
 
 type LabelRow = Selectable<Label>

package/src/data-plane/server/routes/likes.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
@@ -58,8 +58,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subject')
-    // @TODO handling undefineds properly, or do we need to turn them into empty strings?
-    const uris = refs.map(({ uri }) => bySubject[uri]?.uri)
+    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')
     return { uris }
   },
 

package/src/data-plane/server/routes/lists.ts

@@ -1,9 +1,9 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { countAll } from '../db/util'
 import { TimeCidKeyset, paginate } from '../db/pagination'
+import { countAll } from '../db/util'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActorLists(req) {
@@ -69,7 +69,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const byListUri = keyBy(res, 'listUri')
-    const listitemUris = listUris.map((uri) => byListUri[uri]?.uri ?? '')
+    const listitemUris = listUris.map((uri) => byListUri.get(uri)?.uri ?? '')
     return {
       listitemUris,
     }

package/src/data-plane/server/routes/mutes.ts

@@ -1,11 +1,11 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../../../lexicon/lexicons'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { CreatedAtDidKeyset, TimeCidKeyset, paginate } from '../db/pagination'
-import { keyBy } from '@atproto/common'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActorMutesActor(req) {
@@ -180,7 +180,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .where('rootUri', 'in', threadRoots)
       .execute()
     const byRootUri = keyBy(res, 'rootUri')
-    const muted = threadRoots.map((uri) => !!byRootUri[uri])
+    const muted = threadRoots.map((uri) => !!byRootUri.get(uri))
     return { muted }
   },
 })

package/src/data-plane/server/routes/notifs.ts

@@ -1,10 +1,10 @@
-import { sql } from 'kysely'
-import { ServiceImpl } from '@connectrpc/connect'
 import { Timestamp } from '@bufbuild/protobuf'
+import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { countAll, notSoftDeletedClause } from '../db/util'
 import { TimeCidKeyset, paginate } from '../db/pagination'
+import { countAll, notSoftDeletedClause } from '../db/util'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getNotifications(req) {

package/src/data-plane/server/routes/posts.ts

@@ -1,6 +1,6 @@
 import { ServiceImpl } from '@connectrpc/connect'
-import { Service } from '../../../proto/bsky_connect'
 import { keyBy } from '@atproto/common'
+import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
@@ -15,7 +15,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .where('uri', 'in', uris)
       .execute()
     const byUri = keyBy(res, 'uri')
-    const counts = uris.map((uri) => byUri[uri]?.replyCount ?? 0)
+    const counts = uris.map((uri) => byUri.get(uri)?.replyCount ?? 0)
     return { counts }
   },
 })

package/src/data-plane/server/routes/profile.ts

@@ -1,10 +1,10 @@
 import { ServiceImpl } from '@connectrpc/connect'
-import { Service } from '../../../proto/bsky_connect'
-import { keyBy } from '@atproto/common'
-import { getRecords } from './records'
-import { Database } from '../db'
 import { sql } from 'kysely'
+import { keyBy } from '@atproto/common'
 import { parseRecordBytes } from '../../../hydration/util'
+import { Service } from '../../../proto/bsky_connect'
+import { Database } from '../db'
+import { getRecords } from './records'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActors(req) {
@@ -39,7 +39,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     ])
     const byDid = keyBy(handlesRes, 'did')
     const actors = dids.map((did, i) => {
-      const row = byDid[did]
+      const row = byDid.get(did)
       const chatDeclaration = parseRecordBytes(
         chatDeclarations.records[i].record,
       )
@@ -74,7 +74,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const byHandle = keyBy(res, 'handle')
-    const dids = handles.map((handle) => byHandle[handle]?.did ?? '')
+    const dids = handles.map((handle) => byHandle.get(handle)?.did ?? '')
     return { dids }
   },
 

package/src/data-plane/server/routes/quotes.ts

@@ -1,7 +1,7 @@
 import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { paginate, TimeCidKeyset } from '../db/pagination'
+import { TimeCidKeyset, paginate } from '../db/pagination'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getQuotesBySubjectSorted(req) {

package/src/data-plane/server/routes/records.ts

@@ -1,8 +1,8 @@
-import { keyBy } from '@atproto/common'
-import { AtUri } from '@atproto/syntax'
 import { Timestamp } from '@bufbuild/protobuf'
 import { ServiceImpl } from '@connectrpc/connect'
 import * as ui8 from 'uint8arrays'
+import { keyBy } from '@atproto/common'
+import { AtUri } from '@atproto/syntax'
 import { ids } from '../../../lexicon/lexicons'
 import { Service } from '../../../proto/bsky_connect'
 import { PostRecordMeta, Record } from '../../../proto/bsky_pb'
@@ -41,7 +41,7 @@ export const getRecords =
       : []
     const byUri = keyBy(res, 'uri')
     const records: Record[] = req.uris.map((uri) => {
-      const row = byUri[uri]
+      const row = byUri.get(uri)
       const json = row ? row.json : JSON.stringify(null)
       const createdAtRaw = new Date(JSON.parse(json)?.['createdAt'])
       const createdAt = !isNaN(createdAtRaw.getTime())
@@ -88,10 +88,10 @@ export const getPostRecords = (db: Database) => {
     const byKey = keyBy(details, 'uri')
     const meta = req.uris.map((uri) => {
       return new PostRecordMeta({
-        violatesThreadGate: !!byKey[uri]?.violatesThreadGate,
-        violatesEmbeddingRules: !!byKey[uri]?.violatesEmbeddingRules,
-        hasThreadGate: !!byKey[uri]?.hasThreadGate,
-        hasPostGate: !!byKey[uri]?.hasPostGate,
+        violatesThreadGate: !!byKey.get(uri)?.violatesThreadGate,
+        violatesEmbeddingRules: !!byKey.get(uri)?.violatesEmbeddingRules,
+        hasThreadGate: !!byKey.get(uri)?.hasThreadGate,
+        hasPostGate: !!byKey.get(uri)?.hasPostGate,
       })
     })
     return { records, meta }

package/src/data-plane/server/routes/relationships.ts

@@ -1,5 +1,5 @@
-import { sql } from 'kysely'
 import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
@@ -72,16 +72,16 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byDid = keyBy(res, 'did')
     const relationships = targetDids.map((did) => {
-      const row = byDid[did] ?? {}
+      const row = byDid.get(did)
       return {
-        muted: row.muted ?? false,
-        mutedByList: row.mutedByList ?? '',
-        blockedBy: row.blockedBy ?? '',
-        blocking: row.blocking ?? '',
-        blockedByList: row.blockedByList ?? '',
-        blockingByList: row.blockingByList ?? '',
-        following: row.following ?? '',
-        followedBy: row.followedBy ?? '',
+        muted: row?.muted ?? false,
+        mutedByList: row?.mutedByList ?? '',
+        blockedBy: row?.blockedBy ?? '',
+        blocking: row?.blocking ?? '',
+        blockedByList: row?.blockedByList ?? '',
+        blockingByList: row?.blockingByList ?? '',
+        following: row?.following ?? '',
+        followedBy: row?.followedBy ?? '',
       }
     })
     return { relationships }
@@ -90,7 +90,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getBlockExistence(req) {
     const { pairs } = req
     if (pairs.length === 0) {
-      return { exists: [] }
+      return { exists: [], blocks: [] }
     }
     const { ref } = db.db.dynamic
     const sourceRef = ref('pair.source')
@@ -101,48 +101,72 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .select([
         sql<string>`${sourceRef}`.as('source'),
         sql<string>`${targetRef}`.as('target'),
+        (eb) =>
+          eb
+            .selectFrom('actor_block')
+            .whereRef('actor_block.creator', '=', sourceRef)
+            .whereRef('actor_block.subjectDid', '=', targetRef)
+            .select('uri')
+            .as('blocking'),
+        (eb) =>
+          eb
+            .selectFrom('actor_block')
+            .whereRef('actor_block.creator', '=', targetRef)
+            .whereRef('actor_block.subjectDid', '=', sourceRef)
+            .select('uri')
+            .as('blockedBy'),
+        (eb) =>
+          eb
+            .selectFrom('list_item')
+            .innerJoin(
+              'list_block',
+              'list_block.subjectUri',
+              'list_item.listUri',
+            )
+            .whereRef('list_block.creator', '=', sourceRef)
+            .whereRef('list_item.subjectDid', '=', targetRef)
+            .select('list_item.listUri')
+            .as('blockingByList'),
+        (eb) =>
+          eb
+            .selectFrom('list_item')
+            .innerJoin(
+              'list_block',
+              'list_block.subjectUri',
+              'list_item.listUri',
+            )
+            .whereRef('list_block.creator', '=', targetRef)
+            .whereRef('list_item.subjectDid', '=', sourceRef)
+            .select('list_item.listUri')
+            .as('blockedByList'),
       ])
-      .whereExists((qb) =>
-        qb
-          .selectFrom('actor_block')
-          .whereRef('actor_block.creator', '=', sourceRef)
-          .whereRef('actor_block.subjectDid', '=', targetRef)
-          .select('uri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('actor_block')
-          .whereRef('actor_block.creator', '=', targetRef)
-          .whereRef('actor_block.subjectDid', '=', sourceRef)
-          .select('uri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('list_item')
-          .innerJoin('list_block', 'list_block.subjectUri', 'list_item.listUri')
-          .whereRef('list_block.creator', '=', sourceRef)
-          .whereRef('list_item.subjectDid', '=', targetRef)
-          .select('list_item.listUri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('list_item')
-          .innerJoin('list_block', 'list_block.subjectUri', 'list_item.listUri')
-          .whereRef('list_block.creator', '=', targetRef)
-          .whereRef('list_item.subjectDid', '=', sourceRef)
-          .select('list_item.listUri'),
-      )
       .execute()
-    const existMap = res.reduce((acc, cur) => {
-      const key = [cur.source, cur.target].sort().join(',')
-      return acc.set(key, true)
-    }, new Map<string, boolean>())
-    const exists = pairs.map((pair) => {
-      const key = [pair.a, pair.b].sort().join(',')
-      return existMap.get(key) === true
-    })
+    const getKey = (a, b) => [a, b].sort().join(',')
+    const lookup = res.reduce((acc, cur) => {
+      const key = getKey(cur.source, cur.target)
+      return acc.set(key, cur)
+    }, new Map<string, (typeof res)[0]>())
     return {
-      exists,
+      exists: pairs.map((pair) => {
+        const item = lookup.get(getKey(pair.a, pair.b))
+        if (!item) return false
+        return !!(
+          item.blocking ||
+          item.blockedBy ||
+          item.blockingByList ||
+          item.blockedByList
+        )
+      }),
+      blocks: pairs.map((pair) => {
+        const item = lookup.get(getKey(pair.a, pair.b))
+        if (!item) return {}
+        return {
+          blockedBy: item.blockedBy || undefined,
+          blocking: item.blocking || undefined,
+          blockedByList: item.blockedByList || undefined,
+          blockingByList: item.blockingByList || undefined,
+        }
+      }),
     }
   },
 })

package/src/data-plane/server/routes/reposts.ts

@@ -1,5 +1,5 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
@@ -45,8 +45,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subject')
-    // @TODO handling undefineds properly, or do we need to turn them into empty strings?
-    const uris = refs.map(({ uri }) => bySubject[uri]?.uri)
+    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')
     return { uris }
   },
 

package/src/data-plane/server/routes/suggestions.ts

@@ -1,5 +1,5 @@
-import { sql } from 'kysely'
 import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 

package/src/data-plane/server/subscription.ts

@@ -1,10 +1,10 @@
-import { Firehose, MemoryRunner } from '@atproto/sync'
 import { IdResolver } from '@atproto/identity'
 import { WriteOpAction } from '@atproto/repo'
+import { Firehose, MemoryRunner } from '@atproto/sync'
 import { subLogger as log } from '../../logger'
-import { IndexingService } from './indexing'
-import { Database } from './db'
 import { BackgroundQueue } from './background'
+import { Database } from './db'
+import { IndexingService } from './indexing'
 
 export class RepoSubscription {
   firehose: Firehose

package/src/data-plane/server/util.ts

@@ -4,9 +4,9 @@ import {
   ReplyRef,
 } from '../../lexicon/types/app/bsky/feed/post'
 import { Record as GateRecord } from '../../lexicon/types/app/bsky/feed/threadgate'
-import DatabaseSchema from './db/database-schema'
-import { valuesList } from './db/util'
 import { parseThreadGate } from '../../views/util'
+import { DatabaseSchema } from './db/database-schema'
+import { valuesList } from './db/util'
 
 export const getDescendentsQb = (
   db: DatabaseSchema,

package/src/error.ts

@@ -1,5 +1,5 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
+import { XRPCError } from '@atproto/xrpc-server'
 import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {

package/src/feature-gates.ts

@@ -1,8 +1,6 @@
 import Statsig, { StatsigUser } from 'statsig-node'
 import { sha256Hex } from '@atproto/crypto'
-
 import { featureGatesLogger } from './logger'
-import type { ServerConfig } from './config'
 
 export type Config = {
   apiKey?: string

package/src/hydration/feed.ts

@@ -1,10 +1,16 @@
+import { dedupeStrs } from '@atproto/common'
 import { DataPlaneClient } from '../data-plane/client'
-import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { Record as FeedGenRecord } from '../lexicon/types/app/bsky/feed/generator'
 import { Record as LikeRecord } from '../lexicon/types/app/bsky/feed/like'
+import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { Record as PostgateRecord } from '../lexicon/types/app/bsky/feed/postgate'
 import { Record as RepostRecord } from '../lexicon/types/app/bsky/feed/repost'
-import { Record as FeedGenRecord } from '../lexicon/types/app/bsky/feed/generator'
 import { Record as ThreadgateRecord } from '../lexicon/types/app/bsky/feed/threadgate'
-import { Record as PostgateRecord } from '../lexicon/types/app/bsky/feed/postgate'
+import {
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
+  uriToDid as didFromUri,
+} from '../util/uris'
 import {
   HydrationMap,
   ItemRef,
@@ -13,12 +19,6 @@ import {
   parseString,
   split,
 } from './util'
-import { dedupeStrs } from '@atproto/common'
-import {
-  postUriToThreadgateUri,
-  postUriToPostgateUri,
-  uriToDid as didFromUri,
-} from '../util/uris'
 
 export type Post = RecordInfo<PostRecord> & {
   violatesThreadGate: boolean

package/src/hydration/graph.ts

@@ -1,11 +1,11 @@
-import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
+import { DataPlaneClient } from '../data-plane/client'
 import { Record as BlockRecord } from '../lexicon/types/app/bsky/graph/block'
-import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
+import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
 import { Record as ListRecord } from '../lexicon/types/app/bsky/graph/list'
 import { Record as ListItemRecord } from '../lexicon/types/app/bsky/graph/listitem'
-import { DataPlaneClient } from '../data-plane/client'
-import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
+import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
 import { FollowInfo } from '../proto/bsky_pb'
+import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
 
 export type List = RecordInfo<ListRecord>
 export type Lists = HydrationMap<List>
@@ -46,50 +46,46 @@ export type ListAggs = HydrationMap<ListAgg>
 export type RelationshipPair = [didA: string, didB: string]
 
 const dedupePairs = (pairs: RelationshipPair[]): RelationshipPair[] => {
-  const mapped = pairs.reduce(
-    (acc, cur) => {
-      const sorted = ([...cur] as RelationshipPair).sort()
-      acc[sorted.join('-')] = sorted
-      return acc
-    },
-    {} as Record<string, RelationshipPair>,
-  )
-  return Object.values(mapped)
+  const deduped = pairs.reduce((acc, pair) => {
+    return acc.set(Blocks.key(...pair), pair)
+  }, new Map<string, RelationshipPair>())
+  return [...deduped.values()]
 }
 
 export class Blocks {
-  _blocks: Map<string, boolean> = new Map()
+  _blocks: Map<string, BlockEntry> = new Map() // did:a,did:b -> block
   constructor() {}
 
   static key(didA: string, didB: string): string {
     return [didA, didB].sort().join(',')
   }
 
-  set(didA: string, didB: string, exists: boolean): Blocks {
+  set(didA: string, didB: string, block: BlockEntry): Blocks {
     const key = Blocks.key(didA, didB)
-    this._blocks.set(key, exists)
+    this._blocks.set(key, block)
     return this
   }
 
-  has(didA: string, didB: string): boolean {
-    const key = Blocks.key(didA, didB)
-    return this._blocks.has(key)
-  }
-
-  isBlocked(didA: string, didB: string): boolean {
-    if (didA === didB) return false // ignore self-blocks
+  get(didA: string, didB: string): BlockEntry | null {
+    if (didA === didB) return null // ignore self-blocks
     const key = Blocks.key(didA, didB)
-    return this._blocks.get(key) ?? false
+    return this._blocks.get(key) ?? null
   }
 
   merge(blocks: Blocks): Blocks {
-    blocks._blocks.forEach((exists, key) => {
-      this._blocks.set(key, exists)
+    blocks._blocks.forEach((block, key) => {
+      this._blocks.set(key, block)
     })
     return this
   }
 }
 
+// No "blocking" vs. "blocked" directionality: only suitable for bidirectional block checks
+export type BlockEntry = {
+  blockUri: string | undefined
+  blockListUri: string | undefined
+}
+
 export class GraphHydrator {
   constructor(public dataplane: DataPlaneClient) {}
 
@@ -162,7 +158,11 @@ export class GraphHydrator {
     const blocks = new Blocks()
     for (let i = 0; i < deduped.length; i++) {
       const pair = deduped[i]
-      blocks.set(pair.a, pair.b, res.exists[i] ?? false)
+      const block = res.blocks[i]
+      blocks.set(pair.a, pair.b, {
+        blockUri: block.blockedBy || block.blocking || undefined,
+        blockListUri: block.blockedByList || block.blockingByList || undefined,
+      })
     }
     return blocks
   }