@atproto/ozone 0.1.77 → 0.1.78

package/src/mod-service/types.ts

@@ -1,7 +1,7 @@
 import { type Selectable } from 'kysely'
-import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
+import { ModEventView } from '../lexicon/types/tools/ozone/moderation/defs'
 import { ModSubject } from './subject'
 
 export type ModerationEventRow = Selectable<ModerationEvent>
@@ -42,20 +42,7 @@ export type ModerationSubjectStatusRowWithStats = ModerationSubjectStatusRow & {
 export type ModerationSubjectStatusRowWithHandle =
   ModerationSubjectStatusRowWithStats & { handle: string | null }
 
-export type ModEventType =
-  | ToolsOzoneModerationDefs.ModEventTakedown
-  | ToolsOzoneModerationDefs.ModEventAcknowledge
-  | ToolsOzoneModerationDefs.ModEventEscalate
-  | ToolsOzoneModerationDefs.ModEventComment
-  | ToolsOzoneModerationDefs.ModEventLabel
-  | ToolsOzoneModerationDefs.ModEventReport
-  | ToolsOzoneModerationDefs.ModEventMute
-  | ToolsOzoneModerationDefs.ModEventReverseTakedown
-  | ToolsOzoneModerationDefs.ModEventTag
-  | ToolsOzoneModerationDefs.AccountEvent
-  | ToolsOzoneModerationDefs.IdentityEvent
-  | ToolsOzoneModerationDefs.RecordEvent
-  | ToolsOzoneModerationDefs.ModEventPriorityScore
+export type ModEventType = ModEventView['event']
 
 type AccountHostingView = {
   $type: 'tools.ozone.moderation.defs#accountHosting'

package/src/mod-service/util.ts

@@ -16,7 +16,7 @@ export const formatLabel = (row: LabelRow): Label => {
     cts: row.cts,
     exp: row.exp ?? undefined,
     sig: row.sig ? new Uint8Array(row.sig) : undefined,
-  }) as Label
+  } satisfies Label) as unknown as Label
 }
 
 export const formatLabelRow = (
@@ -50,7 +50,7 @@ export const signLabel = async (
     neg: neg === true ? true : undefined,
     cts,
     exp,
-  }) as Label
+  } satisfies Label) as unknown as Label
 
   const bytes = cborEncode(reformatted)
   const sig = await signingKey.sign(bytes)

package/src/mod-service/views.ts

@@ -1,5 +1,5 @@
 import { sql } from 'kysely'
-import { AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import { AtpAgent } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { BlobRef } from '@atproto/lexicon'
@@ -7,8 +7,12 @@ import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { Database } from '../db'
 import { LabelRow } from '../db/schema/label'
 import { ids } from '../lexicon/lexicons'
+import { FeedViewPost } from '../lexicon/types/app/bsky/feed/defs'
 import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
-import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import {
+  Label,
+  validateSelfLabels,
+} from '../lexicon/types/com/atproto/label/defs'
 import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
 import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import {
@@ -19,7 +23,22 @@ import {
   RecordViewDetail,
   RepoView,
   SubjectStatusView,
+  isAccountEvent,
+  isIdentityEvent,
+  isModEventAcknowledge,
+  isModEventComment,
+  isModEventEmail,
+  isModEventEscalate,
+  isModEventLabel,
+  isModEventMute,
+  isModEventMuteReporter,
+  isModEventPriorityScore,
+  isModEventReport,
+  isModEventTag,
+  isModEventTakedown,
+  isRecordEvent,
 } from '../lexicon/types/tools/ozone/moderation/defs'
+import { Un$Typed, asPredicate } from '../lexicon/util'
 import { dbLogger, httpLogger } from '../logger'
 import { ParsedLabelers } from '../util'
 import { moderationSubjectStatusQueryBuilder } from './status'
@@ -30,6 +49,15 @@ import {
 } from './types'
 import { formatLabel, signLabel } from './util'
 
+const isValidSelfLabels = asPredicate(validateSelfLabels)
+
+const ifString = (val: unknown): string | undefined =>
+  typeof val === 'string' ? val : undefined
+const ifBoolean = (val: unknown): boolean | undefined =>
+  typeof val === 'boolean' ? val : undefined
+const ifNumber = (val: unknown): number | undefined =>
+  typeof val === 'number' ? val : undefined
+
 export type AuthHeaders = {
   headers: {
     authorization: string
@@ -93,145 +121,116 @@ export class ModerationViews {
     }, new Map<string, RepoView>())
   }
 
-  formatEvent(event: ModerationEventRowWithHandle): ModEventView {
-    const eventView: ModEventView = {
-      id: event.id,
+  formatEvent(row: ModerationEventRowWithHandle): Un$Typed<ModEventView> {
+    const eventView: Un$Typed<ModEventView> = {
+      id: row.id,
       event: {
-        $type: event.action,
-        comment: event.comment ?? undefined,
+        $type: row.action,
+        comment: row.comment ?? undefined,
       },
-      subject: subjectFromEventRow(event).lex(),
-      subjectBlobCids: event.subjectBlobCids ?? [],
-      createdBy: event.createdBy,
-      createdAt: event.createdAt,
-      subjectHandle: event.subjectHandle ?? undefined,
-      creatorHandle: event.creatorHandle ?? undefined,
-    }
-
-    if (
-      [
-        'tools.ozone.moderation.defs#modEventMuteReporter',
-        'tools.ozone.moderation.defs#modEventTakedown',
-        'tools.ozone.moderation.defs#modEventLabel',
-        'tools.ozone.moderation.defs#modEventMute',
-        'tools.ozone.moderation.defs#modEventPriorityScore',
-      ].includes(event.action)
-    ) {
-      eventView.event = {
-        ...eventView.event,
-        durationInHours: event.durationInHours ?? undefined,
-      }
+      subject: subjectFromEventRow(row).lex(),
+      subjectBlobCids: row.subjectBlobCids ?? [],
+      createdBy: row.createdBy,
+      createdAt: row.createdAt,
+      subjectHandle: row.subjectHandle ?? undefined,
+      creatorHandle: row.creatorHandle ?? undefined,
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventPriorityScore') {
-      eventView.event = {
-        ...eventView.event,
-        score: event.meta?.priorityScore ?? 0,
-      }
-    }
+    const { event } = eventView
+    const meta = row.meta || {}
 
     if (
-      (event.action === 'tools.ozone.moderation.defs#modEventTakedown' ||
-        event.action === 'tools.ozone.moderation.defs#modEventAcknowledge') &&
-      event.meta?.acknowledgeAccountSubjects
+      isModEventMuteReporter(event) ||
+      isModEventTakedown(event) ||
+      isModEventLabel(event) ||
+      isModEventMute(event)
     ) {
-      eventView.event = {
-        ...eventView.event,
-        acknowledgeAccountSubjects: event.meta.acknowledgeAccountSubjects,
-      }
+      event.durationInHours = row.durationInHours ?? undefined
     }
 
     if (
-      event.action === 'tools.ozone.moderation.defs#modEventTakedown' &&
-      typeof event.meta?.policies === 'string' &&
-      event.meta.policies.length > 0
+      (isModEventTakedown(event) || isModEventAcknowledge(event)) &&
+      meta.acknowledgeAccountSubjects
     ) {
-      eventView.event = {
-        ...eventView.event,
-        policies: event.meta.policies.split(','),
-      }
+      event.acknowledgeAccountSubjects = ifBoolean(
+        meta.acknowledgeAccountSubjects,
+      )!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventLabel') {
-      eventView.event = {
-        ...eventView.event,
-        createLabelVals: event.createLabelVals?.length
-          ? event.createLabelVals.split(' ')
-          : [],
-        negateLabelVals: event.negateLabelVals?.length
-          ? event.negateLabelVals.split(' ')
-          : [],
-      }
+    if (isModEventPriorityScore(event)) {
+      event.score = ifNumber(meta?.priorityScore) ?? 0
     }
 
-    // This is for legacy data only, for new events, these types of events won't have labels attached
     if (
-      [
-        'tools.ozone.moderation.defs#modEventAcknowledge',
-        'tools.ozone.moderation.defs#modEventTakedown',
-        'tools.ozone.moderation.defs#modEventEscalate',
-      ].includes(event.action)
+      isModEventTakedown(event) &&
+      typeof meta.policies === 'string' &&
+      meta.policies.length > 0
     ) {
-      if (event.createLabelVals?.length) {
-        eventView.event = {
-          ...eventView.event,
-          createLabelVals: event.createLabelVals.split(' '),
-        }
+      event.policies = meta.policies.split(',')
+    }
+
+    if (isModEventLabel(event)) {
+      event.createLabelVals = row.createLabelVals?.length
+        ? row.createLabelVals.split(' ')
+        : []
+      event.negateLabelVals = row.negateLabelVals?.length
+        ? row.negateLabelVals.split(' ')
+        : []
+    } else if (
+      isModEventAcknowledge(event) ||
+      isModEventTakedown(event) ||
+      isModEventEscalate(event)
+    ) {
+      // This is for legacy data only, for new events, these types of events
+      // won't have labels attached:
+
+      if (row.createLabelVals?.length) {
+        // @ts-expect-error legacy
+        event.createLabelVals = row.createLabelVals.split(' ')
       }
 
-      if (event.negateLabelVals?.length) {
-        eventView.event = {
-          ...eventView.event,
-          negateLabelVals: event.negateLabelVals.split(' '),
-        }
+      if (row.negateLabelVals?.length) {
+        // @ts-expect-error legacy
+        event.negateLabelVals = row.negateLabelVals.split(' ')
       }
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventReport') {
-      eventView.event = {
-        ...eventView.event,
-        reportType: event.meta?.reportType ?? undefined,
-        isReporterMuted: !!event.meta?.isReporterMuted,
-      }
+    if (isModEventReport(event)) {
+      event.isReporterMuted = !!meta.isReporterMuted
+      event.reportType = ifString(meta.reportType)!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventEmail') {
-      eventView.event = {
-        ...eventView.event,
-        subjectLine: event.meta?.subjectLine ?? '',
-        content: event.meta?.content,
-      }
+    if (isModEventEmail(event)) {
+      event.content = ifString(meta.content)!
+      event.subjectLine = ifString(meta.subjectLine)!
     }
 
-    if (
-      event.action === 'tools.ozone.moderation.defs#modEventComment' &&
-      event.meta?.sticky
-    ) {
-      eventView.event.sticky = true
+    if (isModEventComment(event) && meta.sticky) {
+      event.sticky = true
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventTag') {
-      eventView.event.add = event.addedTags || []
-      eventView.event.remove = event.removedTags || []
+    if (isModEventTag(event)) {
+      event.add = row.addedTags || []
+      event.remove = row.removedTags || []
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#accountEvent') {
-      eventView.event.active = !!event.meta?.active
-      eventView.event.timestamp = event.meta?.timestamp
-      eventView.event.status = event.meta?.status
+    if (isAccountEvent(event)) {
+      event.active = !!meta.active
+      event.timestamp = ifString(meta.timestamp)!
+      event.status = ifString(meta.status)!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#identityEvent') {
-      eventView.event.timestamp = event.meta?.timestamp
-      eventView.event.handle = event.meta?.handle
-      eventView.event.pdsHost = event.meta?.pdsHost
-      eventView.event.tombstone = !!event.meta?.tombstone
+    if (isIdentityEvent(event)) {
+      event.timestamp = ifString(meta.timestamp)!
+      event.handle = ifString(meta.handle)!
+      event.pdsHost = ifString(meta.pdsHost)!
+      event.tombstone = !!meta.tombstone
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#recordEvent') {
-      eventView.event.op = event.meta?.op
-      eventView.event.cid = event.meta?.cid
-      eventView.event.timestamp = event.meta?.timestamp
+    if (isRecordEvent(event)) {
+      event.op = ifString(meta.op)!
+      event.cid = ifString(meta.cid)!
+      event.timestamp = ifString(meta.timestamp)!
     }
 
     return eventView
@@ -249,7 +248,7 @@ export class ModerationViews {
     }
     const subject = await this.subject(subjectId)
     const eventView = this.formatEvent(result)
-    const allBlobs = findBlobRefs(subject.value)
+    const allBlobs = 'value' in subject ? findBlobRefs(subject.value) : []
     const subjectBlobs = await this.blob(
       allBlobs.filter((blob) =>
         eventView.subjectBlobCids.includes(blob.ref.toString()),
@@ -323,7 +322,7 @@ export class ModerationViews {
     }, new Map<string, RecordInfo>())
   }
 
-  async records(subjects: RecordSubject[]): Promise<Map<string, RecordView>> {
+  async records(subjects: RecordSubject[]) {
     const uris = subjects.map((record) => new AtUri(record.uri))
     const dids = uris.map((u) => u.hostname)
 
@@ -333,13 +332,26 @@ export class ModerationViews {
       this.fetchRecords(subjects),
     ])
 
-    return uris.reduce((acc, uri) => {
+    const map = new Map<
+      string,
+      // Because the result of this function is used to build RecordViewDetail,
+      // we explicitly type the result without the $type field, so can be used
+      // as both RecordView and RecordViewDetail, without having to cast or
+      // override the $type field.
+      RecordView & {
+        $type?: undefined
+        moderation: { $type?: undefined; subjectStatus?: SubjectStatusView }
+      }
+    >()
+
+    for (const uri of uris) {
       const repo = repos.get(uri.hostname)
-      if (!repo) return acc
+      if (!repo) continue
       const record = records.get(uri.toString())
-      if (!record) return acc
+      if (!record) continue
       const subjectStatus = subjectStatuses.get(uri.toString())
-      return acc.set(uri.toString(), {
+
+      map.set(uri.toString(), {
         uri: uri.toString(),
         cid: record.cid,
         value: record.value,
@@ -352,7 +364,9 @@ export class ModerationViews {
             : undefined,
         },
       })
-    }, new Map<string, RecordView>())
+    }
+
+    return map
   }
 
   async recordDetails(
@@ -443,7 +457,7 @@ export class ModerationViews {
         : REASONOTHER,
       reason: report.comment ?? undefined,
       reportedBy: report.createdBy,
-      subject: subjectFromEventRow(report).lex(),
+      subject: subjectFromEventRow(report).lex() as ReportOutput['subject'],
     }
   }
   // Partial view for subjects
@@ -454,12 +468,12 @@ export class ModerationViews {
       const repo = repos.get(subject)
       if (repo) {
         return {
-          $type: 'com.atproto.admin.defs#repoView',
           ...repo,
+          $type: 'tools.ozone.moderation.defs#repoView',
         }
       } else {
         return {
-          $type: 'com.atproto.admin.defs#repoViewNotFound',
+          $type: 'tools.ozone.moderation.defs#repoViewNotFound',
           did: subject,
         }
       }
@@ -468,12 +482,12 @@ export class ModerationViews {
       const record = records.get(subject)
       if (record) {
         return {
-          $type: 'com.atproto.admin.defs#recordView',
           ...record,
+          $type: 'tools.ozone.moderation.defs#recordView',
         }
       } else {
         return {
-          $type: 'com.atproto.admin.defs#recordViewNotFound',
+          $type: 'tools.ozone.moderation.defs#recordViewNotFound',
           uri: subject,
         }
       }
@@ -621,7 +635,9 @@ export class ModerationViews {
       subjectBlobCids: status.blobCids || [],
       tags: status.tags || [],
       priorityScore: status.priorityScore,
-      subject: subjectFromStatusRow(status).lex(),
+      subject: subjectFromStatusRow(
+        status,
+      ).lex() as SubjectStatusView['subject'],
 
       accountStats: {
         // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
@@ -674,9 +690,7 @@ export class ModerationViews {
     return statusView
   }
 
-  async fetchAuthorFeed(
-    actor: string,
-  ): Promise<AppBskyFeedDefs.FeedViewPost[]> {
+  async fetchAuthorFeed(actor: string): Promise<FeedViewPost[]> {
     const auth = await this.appviewAuth(ids.AppBskyFeedGetAuthorFeed)
     if (!auth) return []
     const {
@@ -730,7 +744,7 @@ export function getSelfLabels(details: {
 }): Label[] {
   const { uri, cid, record } = details
   if (!uri || !cid || !record) return []
-  if (!isSelfLabels(record.labels)) return []
+  if (!isValidSelfLabels(record.labels)) return []
   const src = new AtUri(uri).host // record creator
   const cts =
     typeof record.createdAt === 'string'

package/src/tag-service/embed-tagger.ts

@@ -28,12 +28,14 @@ export class EmbedTagger extends ContentTagger {
         return []
       }
       const tags: string[] = []
-      if (AppBskyFeedPost.isRecord(recordValue)) {
+      const result = AppBskyFeedPost.validateRecord(recordValue)
+
+      if (result.success) {
         const embedContent = AppBskyEmbedRecordWithMedia.isMain(
-          recordValue.embed,
+          result.value.embed,
         )
-          ? recordValue.embed.media
-          : recordValue.embed
+          ? result.value.embed.media
+          : result.value.embed
 
         if (AppBskyEmbedImages.isMain(embedContent)) {
           tags.push(`${this.tagPrefix}image`)

package/src/tag-service/language-tagger.ts

@@ -8,6 +8,11 @@ import { langLogger as log } from '../logger'
 import { ContentTagger } from './content-tagger'
 import { code3ToCode2 } from './language-data'
 
+const ifString = (value: unknown): string | undefined =>
+  typeof value === 'string' ? value : undefined
+const isStringProp = (obj: object, prop: string): string | undefined =>
+  prop in obj ? ifString(obj[prop]) : undefined
+
 export class LanguageTagger extends ContentTagger {
   tagPrefix = 'lang:'
 
@@ -27,18 +32,22 @@ export class LanguageTagger extends ContentTagger {
     }
   }
 
-  getTextFromRecord(recordValue?: Record<string, unknown>): string | undefined {
+  getTextFromRecord(recordValue: Record<string, unknown>): string | undefined {
     let text: string | undefined
 
     if (AppBskyGraphList.isRecord(recordValue)) {
-      text = recordValue.description || recordValue.name
+      text =
+        isStringProp(recordValue, 'description') ||
+        isStringProp(recordValue, 'name')
     } else if (
       AppBskyFeedGenerator.isRecord(recordValue) ||
       AppBskyActorProfile.isRecord(recordValue)
     ) {
-      text = recordValue.description || recordValue.displayName
+      text =
+        isStringProp(recordValue, 'description') ||
+        isStringProp(recordValue, 'displayName')
     } else if (AppBskyFeedPost.isRecord(recordValue)) {
-      text = recordValue.text
+      text = isStringProp(recordValue, 'text')
     }
 
     return text?.trim()
@@ -70,7 +79,9 @@ export class LanguageTagger extends ContentTagger {
       ])
       const record = recordByUri.get(this.subject.uri)
       const recordLang = record?.value.langs as string[] | null
-      const recordText = this.getTextFromRecord(record?.value)
+      const recordText = record
+        ? this.getTextFromRecord(record.value)
+        : undefined
       if (recordLang?.length) {
         recordLang
           .map((lang) => lang.split('-')[0])

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -12,7 +12,7 @@ Object {
   },
   "id": 1,
   "subject": Object {
-    "$type": "com.atproto.admin.defs#repoView",
+    "$type": "tools.ozone.moderation.defs#repoView",
     "did": "user(0)",
     "handle": "alice.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",

package/tests/_util.ts

@@ -4,14 +4,22 @@ import { type Express } from 'express'
 import { CID } from 'multiformats/cid'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
+import {
+  isView as isEmbedRecordView,
+  isViewRecord,
+} from '../src/lexicon/types/app/bsky/embed/record'
+import { isView as isEmbedRecordWithMediaView } from '../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import {
   FeedViewPost,
   PostView,
+  ThreadViewPost,
   isPostView,
+  isReasonRepost,
   isThreadViewPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
 
+export const identity = <T>(x: T) => x
+
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
 export const forSnapshot = (obj: unknown) => {
@@ -86,10 +94,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 
@@ -149,34 +157,35 @@ export const paginateAll = async <T extends { cursor?: string }>(
 }
 
 // @NOTE mutates
-export const stripViewer = <T extends { viewer?: Record<string, unknown> }>(
-  val: T,
-): T => {
+export const stripViewer = <T extends { viewer?: unknown }>(val: T): T => {
   delete val.viewer
   return val
 }
 
+const extractRecordEmbed = (embed: PostView['embed']) =>
+  isEmbedRecordView(embed)
+    ? isViewRecord(embed.record)
+      ? embed.record
+      : undefined
+    : isEmbedRecordWithMediaView(embed)
+      ? isViewRecord(embed.record.record)
+        ? embed.record.record
+        : undefined
+      : undefined
+
 // @NOTE mutates
-export const stripViewerFromPost = (postUnknown: unknown): PostView => {
-  if (postUnknown?.['$type'] && !isPostView(postUnknown)) {
+export const stripViewerFromPost = (postUnknown: object): PostView => {
+  if ('$type' in postUnknown && !isPostView(postUnknown)) {
     throw new Error('Expected post view')
   }
   const post = postUnknown as PostView
   post.author = stripViewer(post.author)
-  const recordEmbed =
-    post.embed && isViewRecord(post.embed.record)
-      ? post.embed.record // Record from record embed
-      : post.embed?.['record'] && isViewRecord(post.embed['record']['record'])
-        ? post.embed['record']['record'] // Record from record-with-media embed
-        : undefined
+
+  const recordEmbed = extractRecordEmbed(post.embed)
   if (recordEmbed) {
     recordEmbed.author = stripViewer(recordEmbed.author)
     recordEmbed.embeds?.forEach((deepEmbed) => {
-      const deepRecordEmbed = isViewRecord(deepEmbed.record)
-        ? deepEmbed.record // Record from record embed
-        : deepEmbed['record'] && isViewRecord(deepEmbed['record']['record'])
-          ? deepEmbed['record']['record'] // Record from record-with-media embed
-          : undefined
+      const deepRecordEmbed = extractRecordEmbed(deepEmbed)
       if (deepRecordEmbed) {
         deepRecordEmbed.author = stripViewer(deepRecordEmbed.author)
       }
@@ -186,15 +195,20 @@ export const stripViewerFromPost = (postUnknown: unknown): PostView => {
 }
 
 // @NOTE mutates
-export const stripViewerFromThread = <T>(thread: T): T => {
+export const stripViewerFromThread = <T extends ThreadViewPost>(
+  thread: T,
+): Omit<T, 'viewer'> => {
   if (!isThreadViewPost(thread)) return thread
+  // @ts-expect-error
   delete thread.viewer
   thread.post = stripViewerFromPost(thread.post)
   if (isThreadViewPost(thread.parent)) {
     thread.parent = stripViewerFromThread(thread.parent)
   }
   if (thread.replies) {
-    thread.replies = thread.replies.map(stripViewerFromThread)
+    thread.replies = thread.replies.map((r) =>
+      isThreadViewPost(r) ? stripViewerFromThread(r) : r,
+    )
   }
   return thread
 }

package/tests/blob-divert.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
@@ -6,7 +7,7 @@ import {
   basicSeed,
 } from '@atproto/dev-env'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { forSnapshot } from './_util'
+import { forSnapshot, identity } from './_util'
 
 describe('blob divert', () => {
   let network: TestNetwork
@@ -56,10 +57,11 @@ describe('blob divert', () => {
     modClient.emitEvent(
       {
         subject: getSubject(),
-        event: {
+        // @ts-expect-error "tools.ozone.moderation.defs#modEventDivert" is not part of the event open union
+        event: identity<ToolsOzoneModerationDefs.ModEventDivert>({
           $type: 'tools.ozone.moderation.defs#modEventDivert',
           comment: 'Diverting for test',
-        },
+        }),
         createdBy: sc.dids.alice,
         subjectBlobCids: getImages().map((img) => img.image.ref.toString()),
       },