From 36b585f245612d870648e7d90e1d351817281492 Mon Sep 17 00:00:00 2001
From: Roscoe Rubin-Rottenberg <roscoe@knotbin.com>
Date: Sun, 31 May 2026 16:56:42 -0400
Subject: [PATCH] fix: label hydration and views

---
 api/so/sprk/sound/getActorAudios.ts    |   2 +-
 api/so/sprk/sound/getAudioPosts.ts     |   2 +-
 api/so/sprk/sound/getAudios.ts         |   2 +-
 api/so/sprk/sound/getTrendingAudios.ts |   2 +-
 hydration/index.ts                     |   5 +-
 tests/labels_test.ts                   | 182 +++++++++++++++++++++++++
 tests/sounds_test.ts                   |  67 ++++++---
 views/index.ts                         |  88 +++++++++++-
 views/types.ts                         |   3 +
 9 files changed, 327 insertions(+), 26 deletions(-)
 create mode 100644 tests/labels_test.ts

diff --git a/api/so/sprk/sound/getActorAudios.ts b/api/so/sprk/sound/getActorAudios.ts
index 1e9cb32..aff2477 100644
--- a/api/so/sprk/sound/getActorAudios.ts
+++ b/api/so/sprk/sound/getActorAudios.ts
@@ -33,7 +33,7 @@ export default function (server: Server, ctx: AppContext) {
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({}),
+        headers: resHeaders({ labelers: hydrateCtx.labelers }),
       };
     },
   });
diff --git a/api/so/sprk/sound/getAudioPosts.ts b/api/so/sprk/sound/getAudioPosts.ts
index 681fae9..217d2ac 100644
--- a/api/so/sprk/sound/getAudioPosts.ts
+++ b/api/so/sprk/sound/getAudioPosts.ts
@@ -37,7 +37,7 @@ export default function (server: Server, ctx: AppContext) {
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({}),
+        headers: resHeaders({ labelers: hydrateCtx.labelers }),
       };
     },
   });
diff --git a/api/so/sprk/sound/getAudios.ts b/api/so/sprk/sound/getAudios.ts
index 1332c55..e0490a6 100644
--- a/api/so/sprk/sound/getAudios.ts
+++ b/api/so/sprk/sound/getAudios.ts
@@ -33,7 +33,7 @@ export default function (server: Server, ctx: AppContext) {
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({}),
+        headers: resHeaders({ labelers: hydrateCtx.labelers }),
       };
     },
   });
diff --git a/api/so/sprk/sound/getTrendingAudios.ts b/api/so/sprk/sound/getTrendingAudios.ts
index 785a846..421953c 100644
--- a/api/so/sprk/sound/getTrendingAudios.ts
+++ b/api/so/sprk/sound/getTrendingAudios.ts
@@ -33,7 +33,7 @@ export default function (server: Server, ctx: AppContext) {
       return {
         encoding: "application/json",
         body: results,
-        headers: resHeaders({}),
+        headers: resHeaders({ labelers: hydrateCtx.labelers }),
       };
     },
   });
diff --git a/hydration/index.ts b/hydration/index.ts
index 19f8d36..0180162 100644
--- a/hydration/index.ts
+++ b/hydration/index.ts
@@ -852,12 +852,13 @@ export class Hydrator {
     uris: string[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
-    const [sounds, soundAggs, profileState] = await Promise.all([
+    const [sounds, soundAggs, labels, profileState] = await Promise.all([
       this.feed.getSounds(uris, ctx.includeTakedowns),
       this.feed.getSoundAggregates(uris.map((uri) => ({ uri }))),
+      this.label.getLabelsForSubjects(uris, ctx.labelers),
       this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
     ]);
-    return mergeStates(profileState, { sounds, soundAggs, ctx });
+    return mergeStates(profileState, { sounds, soundAggs, labels, ctx });
   }
 
   // provides partial hydration state within getFollows / getFollowers, mainly for applying rules
diff --git a/tests/labels_test.ts b/tests/labels_test.ts
new file mode 100644
index 0000000..7c91d2f
--- /dev/null
+++ b/tests/labels_test.ts
@@ -0,0 +1,182 @@
+import { assertEquals } from "@std/assert";
+import type {
+  AtUriString,
+  BlobRef,
+  CidString,
+  DatetimeString,
+  DidString,
+  UriString,
+} from "@atp/lex";
+import { parseCid } from "@atp/lex/data";
+
+import { HydrationState } from "../hydration/index.ts";
+import { Label, Labels } from "../hydration/label.ts";
+import { Actor } from "../hydration/actor.ts";
+import { FeedGen, Post, Reply, Sound } from "../hydration/feed.ts";
+import { HydrationMap, RecordInfo } from "../hydration/util.ts";
+import * as com from "../lex/com.ts";
+import * as so from "../lex/so.ts";
+import { Views } from "../views/index.ts";
+
+interface SelfLabels extends com.atproto.label.defs.SelfLabels {
+  $type: "com.atproto.label.defs#selfLabels";
+}
+
+const NOW = new Date("2026-01-01T00:00:00.000Z");
+const NOW_ISO = NOW.toISOString() as DatetimeString;
+const LABELER_DID = "did:plc:labeler" as DidString;
+const AUTHOR_DID = "did:plc:author" as DidString;
+const CID =
+  "bafyreihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku" as CidString;
+
+const blob = {
+  $type: "blob",
+  ref: parseCid(CID),
+  mimeType: "image/jpeg",
+  size: 1,
+} as unknown as BlobRef;
+
+const audioBlob = {
+  ...blob,
+  mimeType: "audio/mpeg",
+} as unknown as BlobRef;
+
+const selfLabels = (val: string): SelfLabels => ({
+  $type: "com.atproto.label.defs#selfLabels",
+  values: [{ val }],
+});
+
+const recordInfo = <T extends { $type: string }>(
+  record: T,
+): RecordInfo<T> => ({
+  record,
+  cid: CID,
+  sortedAt: NOW,
+  indexedAt: NOW,
+  takedownRef: undefined,
+});
+
+const addLabel = (labels: Labels, subject: string, val: string) => {
+  const label: Label = {
+    src: LABELER_DID,
+    uri: subject as UriString,
+    cid: CID,
+    val,
+    cts: NOW_ISO,
+  };
+  const existing = labels.get(subject);
+  const entry = existing ?? {
+    isImpersonation: false,
+    isTakendown: false,
+    needsReview: false,
+    labels: new HydrationMap<Label>(),
+  };
+  entry.labels.set(Labels.key(label), label);
+  labels.set(subject, entry);
+};
+
+Deno.test("view builders return hydrated and self labels", () => {
+  const views = new Views({});
+  const labels = new Labels();
+  const profileUri =
+    `at://${AUTHOR_DID}/so.sprk.actor.profile/self` as AtUriString;
+  const postUri = `at://${AUTHOR_DID}/so.sprk.feed.post/post` as AtUriString;
+  const replyUri = `at://${AUTHOR_DID}/so.sprk.feed.reply/reply` as AtUriString;
+  const soundUri =
+    `at://${AUTHOR_DID}/so.sprk.sound.audio/sound` as AtUriString;
+  const generatorUri =
+    `at://${AUTHOR_DID}/so.sprk.feed.generator/feed` as AtUriString;
+
+  addLabel(labels, AUTHOR_DID, "account-label");
+  addLabel(labels, profileUri, "profile-label");
+  addLabel(labels, postUri, "post-label");
+  addLabel(labels, replyUri, "reply-label");
+  addLabel(labels, soundUri, "sound-label");
+  addLabel(labels, generatorUri, "generator-label");
+
+  const profile: so.sprk.actor.profile.Main = {
+    $type: so.sprk.actor.profile.$type,
+    displayName: "Author",
+    labels: selfLabels("self-profile"),
+    createdAt: NOW_ISO,
+  };
+  const post: so.sprk.feed.post.Main = {
+    $type: so.sprk.feed.post.$type,
+    media: {
+      $type: "so.sprk.media.images",
+      images: [{ image: blob, alt: "alt" }],
+    },
+    labels: selfLabels("self-post"),
+    createdAt: NOW_ISO,
+  };
+  const reply: so.sprk.feed.reply.Main = {
+    $type: so.sprk.feed.reply.$type,
+    text: "reply",
+    reply: {
+      root: { uri: postUri, cid: CID },
+      parent: { uri: postUri, cid: CID },
+    },
+    labels: selfLabels("self-reply"),
+    createdAt: NOW_ISO,
+  };
+  const sound: so.sprk.sound.audio.Main = {
+    $type: so.sprk.sound.audio.$type,
+    sound: audioBlob,
+    title: "sound",
+    labels: selfLabels("self-sound"),
+    createdAt: NOW_ISO,
+  };
+  const generator: so.sprk.feed.generator.Main = {
+    $type: so.sprk.feed.generator.$type,
+    did: "did:web:feed.example" as DidString,
+    displayName: "Feed",
+    labels: selfLabels("self-generator"),
+    createdAt: NOW_ISO,
+  };
+
+  const state: HydrationState = {
+    actors: new HydrationMap<Actor>().set(AUTHOR_DID, {
+      did: AUTHOR_DID,
+      handle: "author.test",
+      profile,
+      profileCid: CID,
+      sortedAt: NOW,
+      indexedAt: NOW,
+      createdAt: NOW,
+      upstreamStatus: "active",
+    }),
+    posts: new HydrationMap<Post>().set(postUri, recordInfo(post)),
+    replies: new HydrationMap<Reply>().set(replyUri, recordInfo(reply)),
+    sounds: new HydrationMap<Sound>().set(soundUri, recordInfo(sound)),
+    feedgens: new HydrationMap<FeedGen>().set(
+      generatorUri,
+      recordInfo(generator),
+    ),
+    labels,
+  };
+
+  assertEquals(
+    views.profileBasic(AUTHOR_DID, state)?.labels?.map((label) => label.val),
+    ["account-label", "profile-label", "self-profile"],
+  );
+  assertEquals(
+    views.post(postUri, state)?.labels?.map((label) => label.val),
+    ["post-label", "self-post"],
+  );
+  assertEquals(
+    views.reply(replyUri, state)?.labels?.map((label) => label.val),
+    ["reply-label", "self-reply"],
+  );
+  assertEquals(
+    views.sound(soundUri, state)?.labels?.map((label) => label.val),
+    ["sound-label", "self-sound"],
+  );
+  assertEquals(
+    views.feedGenerator(generatorUri, state)?.labels?.map((label) => label.val),
+    ["generator-label", "self-generator"],
+  );
+  assertEquals(
+    views.generator(generatorUri, state)?.labels?.map((label) => label.val),
+    ["generator-label", "self-generator"],
+  );
+});
diff --git a/tests/sounds_test.ts b/tests/sounds_test.ts
index be6ef19..98bb3e0 100644
--- a/tests/sounds_test.ts
+++ b/tests/sounds_test.ts
@@ -7,31 +7,37 @@ import { IndexingService } from "../data-plane/indexing/index.ts";
 import { createTestApp, TEST_USERS } from "./util.ts";
 import { $OutputBody as SearchAudiosOutput } from "../lex/so/sprk/sound/searchAudios.ts";
 import { $OutputBody as GetAudiosOutput } from "../lex/so/sprk/sound/getAudios.ts";
+import { ATPROTO_CONTENT_LABELERS } from "../api/util.ts";
 
 const VALID_BLOB_CID =
   "bafyreihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku";
+const TEST_LABELER_DID = "did:plc:testlabeler";
+const TEST_LABELER_HEADER = `${TEST_LABELER_DID};redact`;
 
 Deno.test({
   name: "Sound search",
   sanitizeOps: false,
   sanitizeResources: false,
   fn: async (t) => {
-    const { app, ctx, cleanup } = await createTestApp({
-      actors: false,
-      profiles: false,
-      posts: false,
-      replies: false,
-      stories: false,
-      likes: false,
-      reposts: false,
-      follows: false,
-      blocks: false,
-      audio: false,
-      generators: false,
-      preferences: false,
-      records: false,
-      actorSync: false,
-    });
+    const { app, ctx, cleanup } = await createTestApp(
+      {
+        actors: false,
+        profiles: false,
+        posts: false,
+        replies: false,
+        stories: false,
+        likes: false,
+        reposts: false,
+        follows: false,
+        blocks: false,
+        audio: false,
+        generators: false,
+        preferences: false,
+        records: false,
+        actorSync: false,
+      },
+      { labelsFromIssuerDids: [TEST_LABELER_DID] },
+    );
 
     try {
       await ctx.db.models.Audio.init();
@@ -196,6 +202,35 @@ Deno.test({
         assertEquals(body.audios, []);
       });
 
+      await t.step("returns labeler headers for sound views", async () => {
+        const audioParams = new URLSearchParams();
+        audioParams.append("uris", chillUri);
+        const responses = await Promise.all([
+          app.request(
+            `/xrpc/so.sprk.sound.getAudios?${audioParams.toString()}`,
+          ),
+          app.request(
+            `/xrpc/so.sprk.sound.getActorAudios?actor=${
+              encodeURIComponent(authorDid)
+            }`,
+          ),
+          app.request(
+            `/xrpc/so.sprk.sound.getAudioPosts?uri=${
+              encodeURIComponent(chillUri)
+            }`,
+          ),
+          app.request("/xrpc/so.sprk.sound.getTrendingAudios?limit=2"),
+        ]);
+
+        for (const res of responses) {
+          assertEquals(res.status, 200);
+          assertEquals(
+            res.headers.get(ATPROTO_CONTENT_LABELERS),
+            TEST_LABELER_HEADER,
+          );
+        }
+      });
+
       await t.step("preserves Spark audio use counts on reindex", async () => {
         const indexingService = new IndexingService(
           ctx.db,
diff --git a/views/index.ts b/views/index.ts
index 079cd5f..e0cec5f 100644
--- a/views/index.ts
+++ b/views/index.ts
@@ -20,8 +20,10 @@ import { RecordInfo } from "../hydration/util.ts";
 import { Notification } from "../data-plane/routes/notifs.ts";
 import {
   $Typed,
+  AudioRecord,
   AudioView,
   BlockedPost,
+  FeedGenRecord,
   FeedViewPost,
   FollowRecord,
   GeneratorView,
@@ -30,6 +32,8 @@ import {
   ImagesMedia,
   ImagesMediaView,
   ImageView,
+  isAudioRecord,
+  isFeedGenRecord,
   isImageMedia,
   isImagesMedia,
   isLabelerRecord,
@@ -120,9 +124,12 @@ export class Views {
     cid?: string;
     record?:
       | PostRecord
+      | ReplyRecord
       | LikeRecord
       | RepostRecord
       | FollowRecord
+      | FeedGenRecord
+      | AudioRecord
       | ProfileRecord
       | LabelerRecord;
   }): Label[] {
@@ -131,6 +138,9 @@ export class Views {
     // Only these have a "labels" property:
     if (
       !isPostRecord(record) &&
+      !isReplyRecord(record) &&
+      !isFeedGenRecord(record) &&
+      !isAudioRecord(record) &&
       !isProfileRecord(record) &&
       !isLabelerRecord(record)
     ) {
@@ -159,6 +169,29 @@ export class Views {
     });
   }
 
+  labels({
+    uri,
+    cid,
+    record,
+    state,
+  }: {
+    uri: string;
+    cid?: string;
+    record?:
+      | PostRecord
+      | ReplyRecord
+      | FeedGenRecord
+      | AudioRecord
+      | ProfileRecord
+      | LabelerRecord;
+    state: HydrationState;
+  }): Label[] {
+    return [
+      ...(state.labels?.getBySubject(uri) ?? []),
+      ...this.selfLabels({ uri, cid, record }),
+    ];
+  }
+
   labeler(
     did: string,
     state: HydrationState,
@@ -363,6 +396,12 @@ export class Views {
     const soundRecord = "sound" in recordInfo.record
       ? recordInfo.record.sound as StrongRef
       : undefined;
+    const labels = this.labels({
+      uri,
+      cid: recordInfo.cid,
+      record: recordInfo.record,
+      state,
+    });
 
     return {
       $type: "so.sprk.feed.defs#postView",
@@ -385,6 +424,7 @@ export class Views {
           knownInteractions: this.knownInteractions(uri, state),
         }
         : undefined,
+      labels,
     };
   }
 
@@ -402,6 +442,12 @@ export class Views {
 
     const aggs = state.replyAggs?.get(uri);
     const viewer = state.postViewers?.get(uri);
+    const labels = this.labels({
+      uri,
+      cid: replyInfo.cid,
+      record: replyInfo.record,
+      state,
+    });
 
     return {
       $type: "so.sprk.feed.defs#replyView",
@@ -422,6 +468,7 @@ export class Views {
           like: viewer.like ? asAtUri(viewer.like) : undefined,
         }
         : undefined,
+      labels,
     };
   }
 
@@ -711,6 +758,12 @@ export class Views {
     if (!creator) return;
     const viewer = state.feedgenViewers?.get(uri);
     const aggs = state.feedgenAggs?.get(uri);
+    const labels = this.labels({
+      uri,
+      cid: feedgen.cid,
+      record: feedgen.record,
+      state,
+    });
 
     return {
       uri: asAtUri(uri),
@@ -729,6 +782,7 @@ export class Views {
         : undefined,
       likeCount: aggs?.likes ?? 0,
       acceptsInteractions: feedgen.record.acceptsInteractions,
+      labels,
       viewer: viewer
         ? {
           like: viewer.like ? asAtUri(viewer.like) : undefined,
@@ -801,6 +855,20 @@ export class Views {
   ): ProfileViewBasic | undefined {
     const actor = state.actors?.get(did);
     if (!actor) return;
+    const profileUri = AtUri.make(
+      did,
+      so.sprk.actor.profile.$type,
+      "self",
+    ).toString();
+    const labels = [
+      ...(state.labels?.getBySubject(did) ?? []),
+      ...this.labels({
+        uri: profileUri,
+        cid: actor.profileCid,
+        record: actor.profile,
+        state,
+      }),
+    ];
     return {
       did: asDid(did),
       handle: asHandle(actor.handle ?? INVALID_HANDLE),
@@ -813,6 +881,7 @@ export class Views {
         )
         : undefined,
       viewer: this.profileViewer(did, state),
+      labels,
       createdAt: actor.createdAt
         ? asDatetime(actor.createdAt.toISOString())
         : undefined,
@@ -1018,9 +1087,7 @@ export class Views {
     const record = soundInfo.record;
     const isPlyrTrack = fm.plyr.track.$matches(record);
     const plyrRecord = isPlyrTrack ? record as fm.plyr.track.Main : undefined;
-    const sparkRecord = !isPlyrTrack
-      ? record as so.sprk.sound.audio.Main
-      : undefined;
+    const sparkRecord = !isPlyrTrack ? record as AudioRecord : undefined;
 
     let coverArtUrl: UriString;
     const coverArt = sparkRecord
@@ -1074,6 +1141,12 @@ export class Views {
     const indexedAt = asDatetime(
       this.indexedAt(soundInfo)?.toISOString() ?? new Date().toISOString(),
     );
+    const labels = this.labels({
+      uri,
+      cid: soundInfo.cid,
+      record: sparkRecord,
+      state,
+    });
 
     const audioView = {
       uri: asAtUri(uri),
@@ -1086,7 +1159,7 @@ export class Views {
       details,
       indexedAt,
       audio: audioUrl,
-      labels: undefined,
+      labels,
     };
 
     return audioView;
@@ -1106,6 +1179,12 @@ export class Views {
 
     const generatorAgg = state.feedgenAggs?.get(uri);
     const viewer = state.feedgenViewers?.get(uri);
+    const labels = this.labels({
+      uri,
+      cid: generatorInfo.cid,
+      record: generatorInfo.record,
+      state,
+    });
 
     const avatar = generatorInfo.record.avatar
       ? asUri(
@@ -1126,6 +1205,7 @@ export class Views {
       avatar,
       likeCount: generatorAgg?.likes ?? 0,
       acceptsInteractions: generatorInfo.record.acceptsInteractions,
+      labels,
       viewer: viewer?.like ? { like: asAtUri(viewer.like) } : undefined,
       indexedAt: asDatetime(
         this.indexedAt(generatorInfo)?.toISOString() ??
diff --git a/views/types.ts b/views/types.ts
index 7601264..d68ac86 100644
--- a/views/types.ts
+++ b/views/types.ts
@@ -35,6 +35,7 @@ export const isReplyView = so.sprk.feed.defs.replyView.$isTypeOf.bind(
 );
 
 export type FeedGenRecord = so.sprk.feed.generator.Main;
+export const isFeedGenRecord = so.sprk.feed.generator.$matches;
 export type LikeRecord = so.sprk.feed.like.Main;
 export type PostRecord = so.sprk.feed.post.Main;
 export const isPostRecord = so.sprk.feed.post.$matches;
@@ -67,6 +68,8 @@ export type VideoMediaMainType = so.sprk.media.video.Main;
 export type NotificationView =
   so.sprk.notification.listNotifications.Notification;
 
+export type AudioRecord = so.sprk.sound.audio.Main;
+export const isAudioRecord = so.sprk.sound.audio.$matches;
 export type AudioView = so.sprk.sound.defs.AudioView;
 
 export type StoriesByAuthor = so.sprk.story.defs.StoriesByAuthor;
-- 
2.51.2