@atproto/bsky 0.0.39 → 0.0.40

package/dist/index.js

@@ -159894,13 +159894,13 @@ function getTimeline_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getTimeline({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getTimeline({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers, repoRev })
+        headers: resHeaders({ labelers: hydrateCtx.labelers, repoRev })
       };
     }
   });
@@ -161067,12 +161067,12 @@ function getActorFeeds_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getActorFeeds({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -161122,10 +161122,8 @@ function getSuggestedFeeds_default(server, ctx) {
         cursor: params2.cursor
       });
       const uris = suggestedRes.uris;
-      const hydration29 = await ctx.hydrator.hydrateFeedGens(uris, {
-        labelers,
-        viewer
-      });
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const hydration29 = await ctx.hydrator.hydrateFeedGens(uris, hydrateCtx);
       const feedViews = mapDefined(uris, (uri2) => ctx.views.feedGenerator(uri2, hydration29));
       return {
         encoding: "application/json",
@@ -161133,7 +161131,7 @@ function getSuggestedFeeds_default(server, ctx) {
           feeds: feedViews,
           cursor: parseString(suggestedRes.cursor)
         },
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -161407,13 +161405,43 @@ var GraphHydrator = class {
 };
 
 // src/hydration/label.ts
+var Labels = class extends HydrationMap {
+  static key(label) {
+    return `${label.src}::${label.val}`;
+  }
+  merge(map) {
+    map.forEach((theirs, key) => {
+      if (!theirs)
+        return;
+      const mine = this.get(key);
+      if (mine) {
+        mine.isTakendown = mine.isTakendown || theirs.isTakendown;
+        mine.labels = mine.labels.merge(theirs.labels);
+      } else {
+        this.set(key, theirs);
+      }
+    });
+    return this;
+  }
+  getBySubject(sub) {
+    const it = this.get(sub)?.labels.values();
+    if (!it)
+      return [];
+    const labels = [];
+    for (const label of it) {
+      if (label)
+        labels.push(label);
+    }
+    return labels;
+  }
+};
 var LabelHydrator = class {
   constructor(dataplane) {
     this.dataplane = dataplane;
   }
   async getLabelsForSubjects(subjects, labelers) {
     if (!subjects.length || !labelers.dids.length)
-      return new HydrationMap();
+      return new Labels();
     const res = await this.dataplane.getLabels({
       subjects,
       issuers: labelers.dids
@@ -161427,16 +161455,16 @@ var LabelHydrator = class {
       if (!entry) {
         entry = {
           isTakendown: false,
-          labels: []
+          labels: new HydrationMap()
         };
         acc.set(label.uri, entry);
       }
-      entry.labels.push(label);
+      entry.labels.set(Labels.key(label), label);
       if (TAKEDOWN_LABELS.includes(label.val) && !label.neg && labelers.redact.has(label.src)) {
         entry.isTakendown = true;
       }
       return acc;
-    }, new HydrationMap());
+    }, new Labels());
   }
   async getLabelers(dids, includeTakedowns = false) {
     const res = await this.dataplane.getLabelerRecords({
@@ -161588,13 +161616,25 @@ var FeedHydrator = class {
 };
 
 // src/hydration/hydrator.ts
+var HydrateCtx = class {
+  constructor(vals) {
+    this.vals = vals;
+    this.labelers = this.vals.labelers;
+    this.viewer = this.vals.viewer;
+    this.includeTakedowns = this.vals.includeTakedowns;
+  }
+  copy(vals) {
+    return new HydrateCtx({ ...this.vals, ...vals });
+  }
+};
 var Hydrator = class {
-  constructor(dataplane) {
+  constructor(dataplane, serviceLabelers = []) {
     this.dataplane = dataplane;
     this.actor = new ActorHydrator(dataplane);
     this.feed = new FeedHydrator(dataplane);
     this.graph = new GraphHydrator(dataplane);
     this.label = new LabelHydrator(dataplane);
+    this.serviceLabelers = new Set(serviceLabelers);
   }
   async hydrateProfileViewers(dids, ctx) {
     const viewer = ctx.viewer;
@@ -161877,11 +161917,12 @@ var Hydrator = class {
   }
   async hydrateLabelers(dids, ctx) {
     const [labelers, labelerAggs, labelerViewers, profileState] = await Promise.all([
-      this.label.getLabelers(dids),
+      this.label.getLabelers(dids, ctx.includeTakedowns),
       this.label.getLabelerAggregates(dids),
       ctx.viewer ? this.label.getLabelerViewerStates(dids, ctx.viewer) : void 0,
-      this.hydrateProfiles(dids.map(didFromUri), ctx)
+      this.hydrateProfiles(dids, ctx)
     ]);
+    actionTakedownLabels(dids, labelers, profileState.labels ?? new Labels());
     return mergeStates(profileState, {
       labelers,
       labelerAggs,
@@ -161909,7 +161950,10 @@ var Hydrator = class {
     } else if (collection === ids.AppBskyFeedGenerator) {
       return (await this.feed.getFeedGens([uri2], includeTakedowns)).get(uri2) ?? void 0;
     } else if (collection === ids.AppBskyLabelerService) {
-      return (await this.label.getLabelers([uri2], includeTakedowns)).get(uri2) ?? void 0;
+      if (parsed.rkey !== "self")
+        return;
+      const did2 = parsed.hostname;
+      return (await this.label.getLabelers([did2], includeTakedowns)).get(did2) ?? void 0;
     } else if (collection === ids.AppBskyActorProfile) {
       const did2 = parsed.hostname;
       const actor = (await this.actor.getActors([did2], includeTakedowns)).get(did2);
@@ -161923,6 +161967,21 @@ var Hydrator = class {
       };
     }
   }
+  async createContext(vals) {
+    const labelers = vals.labelers.dids;
+    const nonServiceLabelers = labelers.filter((did2) => !this.serviceLabelers.has(did2));
+    const labelerActors = await this.actor.getActors(nonServiceLabelers, vals.includeTakedowns);
+    const availableDids = labelers.filter((did2) => this.serviceLabelers.has(did2) || !!labelerActors.get(did2));
+    const availableLabelers = {
+      dids: availableDids,
+      redact: vals.labelers.redact
+    };
+    return new HydrateCtx({
+      labelers: availableLabelers,
+      viewer: vals.viewer,
+      includeTakedowns: vals.includeTakedowns
+    });
+  }
 };
 var listUrisFromProfileViewer = (item) => {
   const listUris = [];
@@ -167122,7 +167181,11 @@ function getAuthorFeed_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer, includeTakedowns };
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns
+      });
       const result = await getAuthorFeed({ ...params2, hydrateCtx }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
@@ -167130,7 +167193,7 @@ function getAuthorFeed_default(server, ctx) {
         body: result,
         headers: resHeaders({
           repoRev,
-          labelers
+          labelers: hydrateCtx.labelers
         })
       };
     }
@@ -175686,16 +175749,25 @@ var labels_default = (db) => ({
   async getLabels(req) {
     const { subjects, issuers } = req;
     if (subjects.length === 0 || issuers.length === 0) {
-      return { records: [] };
+      return { labels: [] };
     }
     const res = await db.db.selectFrom("label").where("uri", "in", subjects).where("src", "in", issuers).selectAll().execute();
-    const labels = res.map((l) => {
-      const formatted = noUndefinedVals({
-        ...l,
-        cid: l.cid === "" ? void 0 : l.cid,
-        neg: l.neg === true ? true : void 0
+    const labelsBySubject = /* @__PURE__ */ new Map();
+    res.forEach((l) => {
+      const labels2 = labelsBySubject.get(l.uri) ?? [];
+      labels2.push(l);
+      labelsBySubject.set(l.uri, labels2);
+    });
+    const labels = subjects.flatMap((sub) => {
+      const labelsForSub = labelsBySubject.get(sub) ?? [];
+      return labelsForSub.map((l) => {
+        const formatted = noUndefinedVals({
+          ...l,
+          cid: l.cid === "" ? void 0 : l.cid,
+          neg: l.neg === true ? true : void 0
+        });
+        return fromString2(JSON.stringify(formatted), "utf8");
       });
-      return fromString2(JSON.stringify(formatted), "utf8");
     });
     return { labels };
   }
@@ -180856,7 +180928,7 @@ function getFeed_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const headers = noUndefinedVals({
         authorization: req.headers["authorization"],
         "accept-language": req.headers["accept-language"]
@@ -180872,7 +180944,7 @@ function getFeed_default(server, ctx) {
         body: result,
         headers: {
           ...feedResHeaders ?? {},
-          ...resHeaders({ labelers }),
+          ...resHeaders({ labelers: hydrateCtx.labelers }),
           "server-timing": serverTimingHeader([timerSkele, timerHydr])
         }
       };
@@ -181001,10 +181073,8 @@ function getFeedGenerator_default(server, ctx) {
       const { feed } = params2;
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydration29 = await ctx.hydrator.hydrateFeedGens([feed], {
-        viewer,
-        labelers
-      });
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const hydration29 = await ctx.hydrator.hydrateFeedGens([feed], hydrateCtx);
       const feedInfo = hydration29.feedgens?.get(feed);
       if (!feedInfo) {
         throw new InvalidRequestError("could not find feed");
@@ -181038,7 +181108,7 @@ function getFeedGenerator_default(server, ctx) {
           isOnline: true,
           isValid: true
         },
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181052,12 +181122,12 @@ function getFeedGenerators_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const view = await getFeedGenerators({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: view,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181087,12 +181157,12 @@ function getLikes_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getLikes({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181158,13 +181228,13 @@ function getListFeed_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getListFeed({ ...params2, hydrateCtx }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers, repoRev })
+        headers: resHeaders({ labelers: hydrateCtx.labelers, repoRev })
       };
     }
   });
@@ -181218,7 +181288,7 @@ function getPostThread_default(server, ctx) {
     handler: async ({ params: params2, auth, req, res }) => {
       const { viewer } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       let result;
       try {
         result = await getPostThread({ ...params2, hydrateCtx }, ctx);
@@ -181235,7 +181305,7 @@ function getPostThread_default(server, ctx) {
         body: result,
         headers: resHeaders({
           repoRev,
-          labelers
+          labelers: hydrateCtx.labelers
         })
       };
     }
@@ -181288,12 +181358,12 @@ function getPosts_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const results = await getPosts({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181327,12 +181397,12 @@ function searchPosts_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const results = await searchPosts({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181390,7 +181460,7 @@ function getActorLikes_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getActorLikes({ ...params2, hydrateCtx }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
@@ -181398,7 +181468,7 @@ function getActorLikes_default(server, ctx) {
         body: result,
         headers: resHeaders({
           repoRev,
-          labelers
+          labelers: hydrateCtx.labelers
         })
       };
     }
@@ -181455,7 +181525,11 @@ function getProfile_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer, includeTakedowns };
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns
+      });
       const result = await getProfile({ ...params2, hydrateCtx }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
@@ -181463,7 +181537,7 @@ function getProfile_default(server, ctx) {
         body: result,
         headers: resHeaders({
           repoRev,
-          labelers
+          labelers: hydrateCtx.labelers
         })
       };
     }
@@ -181479,10 +181553,7 @@ var skeleton12 = async (input) => {
 };
 var hydration12 = async (input) => {
   const { ctx, params: params2, skeleton: skeleton29 } = input;
-  return ctx.hydrator.hydrateProfilesDetailed([skeleton29.did], {
-    ...params2.hydrateCtx,
-    includeTakedowns: true
-  });
+  return ctx.hydrator.hydrateProfilesDetailed([skeleton29.did], params2.hydrateCtx.copy({ includeTakedowns: true }));
 };
 var presentation12 = (input) => {
   const { ctx, params: params2, skeleton: skeleton29, hydration: hydration29 } = input;
@@ -181503,7 +181574,7 @@ function getProfiles_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { viewer, labelers };
+      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers });
       const result = await getProfile({ ...params2, hydrateCtx }, ctx);
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer);
       return {
@@ -181511,7 +181582,7 @@ function getProfiles_default(server, ctx) {
         body: result,
         headers: resHeaders({
           repoRev,
-          labelers
+          labelers: hydrateCtx.labelers
         })
       };
     }
@@ -181540,12 +181611,12 @@ function getRepostedBy_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getRepostedBy({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181603,12 +181674,12 @@ function getBlocks_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getBlocks({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getBlocks({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181651,12 +181722,12 @@ function getListBlocks_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getListBlocks({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getListBlocks({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181692,12 +181763,16 @@ function getFollowers_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer, includeTakedowns };
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns
+      });
       const result = await getFollowers({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181772,12 +181847,16 @@ function getFollows_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer, includeTakedowns };
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns
+      });
       const result = await getFollows({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181856,12 +181935,12 @@ function getList_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getList({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181915,12 +181994,12 @@ function getLists_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const result = await getLists({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -181959,12 +182038,12 @@ function getListMutes_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getListMutes({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getListMutes({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182000,12 +182079,12 @@ function getMutes_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getMutes({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getMutes({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182156,12 +182235,12 @@ function getSuggestedFollowsByActor_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await getSuggestedFollowsByActor({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await getSuggestedFollowsByActor({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182206,10 +182285,11 @@ function getServices_default(server, ctx) {
       const { dids, detailed } = params2;
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydration29 = await ctx.hydrator.hydrateLabelers(dids, {
+      const hydrateCtx = await ctx.hydrator.createContext({
         viewer,
         labelers
       });
+      const hydration29 = await ctx.hydrator.hydrateLabelers(dids, hydrateCtx);
       const views = mapDefined(dids, (did2) => {
         if (detailed) {
           const view = ctx.views.labelerDetailed(did2, hydration29);
@@ -182234,7 +182314,7 @@ function getServices_default(server, ctx) {
         body: {
           views
         },
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182246,14 +182326,18 @@ function searchActors_default(server, ctx) {
   server.app.bsky.actor.searchActors({
     auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params: params2, req }) => {
-      const viewer = auth.credentials.iss;
+      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth);
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { viewer, labelers };
+      const hydrateCtx = await ctx.hydrator.createContext({
+        viewer,
+        labelers,
+        includeTakedowns
+      });
       const results = await searchActors({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182308,12 +182392,12 @@ function searchActorsTypeahead_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
       const results = await searchActorsTypeahead({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182366,12 +182450,12 @@ function getSuggestions_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { viewer, labelers };
+      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers });
       const result = await getSuggestions({ ...params2, hydrateCtx }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182455,12 +182539,12 @@ function listNotifications_default(server, ctx) {
     handler: async ({ params: params2, auth, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { labelers, viewer };
-      const result = await listNotifications({ ...params2, hydrateCtx }, ctx);
+      const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer });
+      const result = await listNotifications({ ...params2, hydrateCtx: hydrateCtx.copy({ viewer }) }, ctx);
       return {
         encoding: "application/json",
         body: result,
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -182780,7 +182864,7 @@ function getPopularFeedGenerators_default(server, ctx) {
     handler: async ({ auth, params: params2, req }) => {
       const viewer = auth.credentials.iss;
       const labelers = ctx.reqLabelers(req);
-      const hydrateCtx = { viewer, labelers };
+      const hydrateCtx = await ctx.hydrator.createContext({ viewer, labelers });
       if (clearlyBadCursor(params2.cursor)) {
         return {
           encoding: "application/json",
@@ -182813,7 +182897,7 @@ function getPopularFeedGenerators_default(server, ctx) {
           feeds: feedViews,
           cursor
         },
-        headers: resHeaders({ labelers })
+        headers: resHeaders({ labelers: hydrateCtx.labelers })
       };
     }
   });
@@ -184339,8 +184423,8 @@ var Views = class {
       return;
     const profileUri = AtUri.make(did2, ids.AppBskyActorProfile, "self").toString();
     const labels = [
-      ...state.labels?.get(did2)?.labels ?? [],
-      ...state.labels?.get(profileUri)?.labels ?? [],
+      ...state.labels?.getBySubject(did2) ?? [],
+      ...state.labels?.getBySubject(profileUri) ?? [],
       ...this.selfLabels({
         uri: profileUri,
         cid: actor.profileCid?.toString(),
@@ -184409,7 +184493,7 @@ var Views = class {
       return void 0;
     }
     const listViewer = state.listViewers?.get(uri2);
-    const labels = state.labels?.get(uri2)?.labels ?? [];
+    const labels = state.labels?.getBySubject(uri2) ?? [];
     const creator = new AtUri(uri2).hostname;
     return {
       uri: uri2,
@@ -184448,7 +184532,7 @@ var Views = class {
     const aggs = state.labelerAggs?.get(did2);
     const uri2 = AtUri.make(did2, ids.AppBskyLabelerService, "self").toString();
     const labels = [
-      ...state.labels?.get(uri2)?.labels ?? [],
+      ...state.labels?.getBySubject(uri2) ?? [],
       ...this.selfLabels({
         uri: uri2,
         cid: labeler.cid.toString(),
@@ -184499,7 +184583,7 @@ var Views = class {
       return;
     const viewer = state.feedgenViewers?.get(uri2);
     const aggs = state.feedgenAggs?.get(uri2);
-    const labels = state.labels?.get(uri2)?.labels ?? [];
+    const labels = state.labels?.getBySubject(uri2) ?? [];
     return {
       uri: uri2,
       cid: feedgen.cid,
@@ -184545,7 +184629,7 @@ var Views = class {
     const viewer = state.postViewers?.get(uri2);
     const gateUri = AtUri.make(authorDid, ids.AppBskyFeedThreadgate, parsedUri.rkey).toString();
     const labels = [
-      ...state.labels?.get(uri2)?.labels ?? [],
+      ...state.labels?.getBySubject(uri2) ?? [],
       ...this.selfLabels({
         uri: uri2,
         cid: post.cid,
@@ -184908,7 +184992,7 @@ var Views = class {
     }
     if (!recordInfo)
       return;
-    const labels = state.labels?.get(notif.uri)?.labels ?? [];
+    const labels = state.labels?.getBySubject(notif.uri) ?? [];
     const selfLabels = this.selfLabels({
       uri: notif.uri,
       cid: recordInfo.cid,
@@ -186085,7 +186169,7 @@ var BskyAppView = class {
       httpVersion: config2.dataplaneHttpVersion,
       rejectUnauthorized: !config2.dataplaneIgnoreBadTls
     });
-    const hydrator = new Hydrator(dataplane);
+    const hydrator = new Hydrator(dataplane, config2.labelsFromIssuerDids);
     const views = new Views(imgUriBuilder);
     const bsyncClient = createBsyncClient({
       baseUrl: config2.bsyncUrl,