fix tests & better hydration

Author: dholms

packages/bsky/src/hydration/hydrator.ts

@@ -7,7 +7,6 @@ import { ids } from '../lexicon/lexicons'
 import { isMain as isEmbedRecord } from '../lexicon/types/app/bsky/embed/record'
 import { isMain as isEmbedRecordWithMedia } from '../lexicon/types/app/bsky/embed/recordWithMedia'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
-import type { Label } from '../lexicon/types/com/atproto/label/defs'
 import {
   ActorHydrator,
   ProfileAggs,
@@ -762,16 +761,8 @@ const actionTakedownLabels = <T>(
   labels: Labels,
 ) => {
   for (const key of keys) {
-    const subjectLabels = labels.get(key)
-    if (!subjectLabels) continue
-    if (includesTakedownLabel(subjectLabels)) {
+    if (labels.get(key)?.isTakendown) {
       hydrationMap.set(key, null)
     }
   }
 }
-
-const includesTakedownLabel = (labels: Label[]) => {
-  return labels.some((l) => l.val === TAKEDOWN_LABEL)
-}
-
-const TAKEDOWN_LABEL = '!takedown'

packages/bsky/src/hydration/label.ts

@@ -4,7 +4,12 @@ import { HydrationMap, parseJsonBytes } from './util'
 
 export type { Label } from '../lexicon/types/com/atproto/label/defs'
 
-export type Labels = HydrationMap<Label[]>
+export type SubjectLabels = {
+  isTakendown: boolean
+  labels: Label[]
+}
+
+export type Labels = HydrationMap<SubjectLabels>
 
 export class LabelHydrator {
   constructor(
@@ -19,18 +24,27 @@ export class LabelHydrator {
     issuers = ([] as string[])
       .concat(issuers ?? [])
       .concat(this.opts?.labelsFromIssuerDids ?? [])
-    if (!subjects.length || !issuers.length) return new HydrationMap<Label[]>()
+    if (!subjects.length || !issuers.length)
+      return new HydrationMap<SubjectLabels>()
     const res = await this.dataplane.getLabels({ subjects, issuers })
     return res.labels.reduce((acc, cur) => {
       const label = parseJsonBytes(cur) as Label | undefined
       if (!label || label.neg) return acc
-      const entry = acc.get(label.uri)
-      if (entry) {
-        entry.push(label)
-      } else {
-        acc.set(label.uri, [label])
+      let entry = acc.get(label.uri)
+      if (!entry) {
+        entry = {
+          isTakendown: false,
+          labels: [],
+        }
+        acc.set(label.uri, entry)
+      }
+      entry.labels.push(label)
+      if (TAKEDOWN_LABELS.includes(label.val) && !label.neg) {
+        entry.isTakendown = true
       }
       return acc
-    }, new HydrationMap<Label[]>())
+    }, new HydrationMap<SubjectLabels>())
   }
 }
+
+const TAKEDOWN_LABELS = ['!takedown', '!suspend']

packages/bsky/tests/views/takedown-labels.test.ts

@@ -22,7 +22,7 @@ describe('bsky takedown labels', () => {
 
   const addTakedownLabels = async (subjects: string[]) => {
     if (subjects.length === 0) return
-    const src = network.bsky.ctx.cfg.modServiceDid
+    const src = network.ozone.ctx.cfg.service.did
     const cts = new Date().toISOString()
     const labels = subjects.map((uri) => ({
       src,

packages/dev-env/src/network.ts

@@ -60,6 +60,7 @@ export class TestNetwork extends TestNetworkNoAppView {
       dbPostgresUrl,
       redisHost,
       modServiceDid: ozoneDid,
+      labelsFromIssuerDids: [ozoneDid],
       ...params.bsky,
     })