@atproto/ozone 0.1.155 → 0.1.157

package/src/lexicon/types/app/bsky/ageassurance/defs.ts

@@ -0,0 +1,301 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.ageassurance.defs'
+
+/** The access level granted based on Age Assurance data we've processed. */
+export type Access = 'unknown' | 'none' | 'safe' | 'full' | (string & {})
+/** The status of the Age Assurance process. */
+export type Status =
+  | 'unknown'
+  | 'pending'
+  | 'assured'
+  | 'blocked'
+  | (string & {})
+
+/** The user's computed Age Assurance state. */
+export interface State {
+  $type?: 'app.bsky.ageassurance.defs#state'
+  /** The timestamp when this state was last updated. */
+  lastInitiatedAt?: string
+  status: Status
+  access: Access
+}
+
+const hashState = 'state'
+
+export function isState<V>(v: V) {
+  return is$typed(v, id, hashState)
+}
+
+export function validateState<V>(v: V) {
+  return validate<State & V>(v, id, hashState)
+}
+
+/** Additional metadata needed to compute Age Assurance state client-side. */
+export interface StateMetadata {
+  $type?: 'app.bsky.ageassurance.defs#stateMetadata'
+  /** The account creation timestamp. */
+  accountCreatedAt?: string
+}
+
+const hashStateMetadata = 'stateMetadata'
+
+export function isStateMetadata<V>(v: V) {
+  return is$typed(v, id, hashStateMetadata)
+}
+
+export function validateStateMetadata<V>(v: V) {
+  return validate<StateMetadata & V>(v, id, hashStateMetadata)
+}
+
+export interface Config {
+  $type?: 'app.bsky.ageassurance.defs#config'
+  /** The per-region Age Assurance configuration. */
+  regions: ConfigRegion[]
+}
+
+const hashConfig = 'config'
+
+export function isConfig<V>(v: V) {
+  return is$typed(v, id, hashConfig)
+}
+
+export function validateConfig<V>(v: V) {
+  return validate<Config & V>(v, id, hashConfig)
+}
+
+/** The Age Assurance configuration for a specific region. */
+export interface ConfigRegion {
+  $type?: 'app.bsky.ageassurance.defs#configRegion'
+  /** The ISO 3166-1 alpha-2 country code this configuration applies to. */
+  countryCode: string
+  /** The ISO 3166-2 region code this configuration applies to. If omitted, the configuration applies to the entire country. */
+  regionCode?: string
+  /** The ordered list of Age Assurance rules that apply to this region. Rules should be applied in order, and the first matching rule determines the access level granted. The rules array should always include a default rule as the last item. */
+  rules: (
+    | $Typed<ConfigRegionRuleDefault>
+    | $Typed<ConfigRegionRuleIfDeclaredOverAge>
+    | $Typed<ConfigRegionRuleIfDeclaredUnderAge>
+    | $Typed<ConfigRegionRuleIfAssuredOverAge>
+    | $Typed<ConfigRegionRuleIfAssuredUnderAge>
+    | $Typed<ConfigRegionRuleIfAccountNewerThan>
+    | $Typed<ConfigRegionRuleIfAccountOlderThan>
+    | { $type: string }
+  )[]
+}
+
+const hashConfigRegion = 'configRegion'
+
+export function isConfigRegion<V>(v: V) {
+  return is$typed(v, id, hashConfigRegion)
+}
+
+export function validateConfigRegion<V>(v: V) {
+  return validate<ConfigRegion & V>(v, id, hashConfigRegion)
+}
+
+/** Age Assurance rule that applies by default. */
+export interface ConfigRegionRuleDefault {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleDefault'
+  access: Access
+}
+
+const hashConfigRegionRuleDefault = 'configRegionRuleDefault'
+
+export function isConfigRegionRuleDefault<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleDefault)
+}
+
+export function validateConfigRegionRuleDefault<V>(v: V) {
+  return validate<ConfigRegionRuleDefault & V>(
+    v,
+    id,
+    hashConfigRegionRuleDefault,
+  )
+}
+
+/** Age Assurance rule that applies if the user has declared themselves equal-to or over a certain age. */
+export interface ConfigRegionRuleIfDeclaredOverAge {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfDeclaredOverAge'
+  /** The age threshold as a whole integer. */
+  age: number
+  access: Access
+}
+
+const hashConfigRegionRuleIfDeclaredOverAge =
+  'configRegionRuleIfDeclaredOverAge'
+
+export function isConfigRegionRuleIfDeclaredOverAge<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfDeclaredOverAge)
+}
+
+export function validateConfigRegionRuleIfDeclaredOverAge<V>(v: V) {
+  return validate<ConfigRegionRuleIfDeclaredOverAge & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfDeclaredOverAge,
+  )
+}
+
+/** Age Assurance rule that applies if the user has declared themselves under a certain age. */
+export interface ConfigRegionRuleIfDeclaredUnderAge {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfDeclaredUnderAge'
+  /** The age threshold as a whole integer. */
+  age: number
+  access: Access
+}
+
+const hashConfigRegionRuleIfDeclaredUnderAge =
+  'configRegionRuleIfDeclaredUnderAge'
+
+export function isConfigRegionRuleIfDeclaredUnderAge<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfDeclaredUnderAge)
+}
+
+export function validateConfigRegionRuleIfDeclaredUnderAge<V>(v: V) {
+  return validate<ConfigRegionRuleIfDeclaredUnderAge & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfDeclaredUnderAge,
+  )
+}
+
+/** Age Assurance rule that applies if the user has been assured to be equal-to or over a certain age. */
+export interface ConfigRegionRuleIfAssuredOverAge {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfAssuredOverAge'
+  /** The age threshold as a whole integer. */
+  age: number
+  access: Access
+}
+
+const hashConfigRegionRuleIfAssuredOverAge = 'configRegionRuleIfAssuredOverAge'
+
+export function isConfigRegionRuleIfAssuredOverAge<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfAssuredOverAge)
+}
+
+export function validateConfigRegionRuleIfAssuredOverAge<V>(v: V) {
+  return validate<ConfigRegionRuleIfAssuredOverAge & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfAssuredOverAge,
+  )
+}
+
+/** Age Assurance rule that applies if the user has been assured to be under a certain age. */
+export interface ConfigRegionRuleIfAssuredUnderAge {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfAssuredUnderAge'
+  /** The age threshold as a whole integer. */
+  age: number
+  access: Access
+}
+
+const hashConfigRegionRuleIfAssuredUnderAge =
+  'configRegionRuleIfAssuredUnderAge'
+
+export function isConfigRegionRuleIfAssuredUnderAge<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfAssuredUnderAge)
+}
+
+export function validateConfigRegionRuleIfAssuredUnderAge<V>(v: V) {
+  return validate<ConfigRegionRuleIfAssuredUnderAge & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfAssuredUnderAge,
+  )
+}
+
+/** Age Assurance rule that applies if the account is equal-to or newer than a certain date. */
+export interface ConfigRegionRuleIfAccountNewerThan {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfAccountNewerThan'
+  /** The date threshold as a datetime string. */
+  date: string
+  access: Access
+}
+
+const hashConfigRegionRuleIfAccountNewerThan =
+  'configRegionRuleIfAccountNewerThan'
+
+export function isConfigRegionRuleIfAccountNewerThan<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfAccountNewerThan)
+}
+
+export function validateConfigRegionRuleIfAccountNewerThan<V>(v: V) {
+  return validate<ConfigRegionRuleIfAccountNewerThan & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfAccountNewerThan,
+  )
+}
+
+/** Age Assurance rule that applies if the account is older than a certain date. */
+export interface ConfigRegionRuleIfAccountOlderThan {
+  $type?: 'app.bsky.ageassurance.defs#configRegionRuleIfAccountOlderThan'
+  /** The date threshold as a datetime string. */
+  date: string
+  access: Access
+}
+
+const hashConfigRegionRuleIfAccountOlderThan =
+  'configRegionRuleIfAccountOlderThan'
+
+export function isConfigRegionRuleIfAccountOlderThan<V>(v: V) {
+  return is$typed(v, id, hashConfigRegionRuleIfAccountOlderThan)
+}
+
+export function validateConfigRegionRuleIfAccountOlderThan<V>(v: V) {
+  return validate<ConfigRegionRuleIfAccountOlderThan & V>(
+    v,
+    id,
+    hashConfigRegionRuleIfAccountOlderThan,
+  )
+}
+
+/** Object used to store Age Assurance data in stash. */
+export interface Event {
+  $type?: 'app.bsky.ageassurance.defs#event'
+  /** The date and time of this write operation. */
+  createdAt: string
+  /** The unique identifier for this instance of the Age Assurance flow, in UUID format. */
+  attemptId: string
+  /** The status of the Age Assurance process. */
+  status: 'unknown' | 'pending' | 'assured' | 'blocked' | (string & {})
+  /** The access level granted based on Age Assurance data we've processed. */
+  access: 'unknown' | 'none' | 'safe' | 'full' | (string & {})
+  /** The ISO 3166-1 alpha-2 country code provided when beginning the Age Assurance flow. */
+  countryCode: string
+  /** The ISO 3166-2 region code provided when beginning the Age Assurance flow. */
+  regionCode?: string
+  /** The email used for Age Assurance. */
+  email?: string
+  /** The IP address used when initiating the Age Assurance flow. */
+  initIp?: string
+  /** The user agent used when initiating the Age Assurance flow. */
+  initUa?: string
+  /** The IP address used when completing the Age Assurance flow. */
+  completeIp?: string
+  /** The user agent used when completing the Age Assurance flow. */
+  completeUa?: string
+}
+
+const hashEvent = 'event'
+
+export function isEvent<V>(v: V) {
+  return is$typed(v, id, hashEvent)
+}
+
+export function validateEvent<V>(v: V) {
+  return validate<Event & V>(v, id, hashEvent)
+}

package/src/lexicon/types/app/bsky/ageassurance/getConfig.ts

@@ -0,0 +1,34 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import type * as AppBskyAgeassuranceDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.ageassurance.getConfig'
+
+export type QueryParams = {}
+export type InputSchema = undefined
+export type OutputSchema = AppBskyAgeassuranceDefs.Config
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/ageassurance/getState.ts

@@ -0,0 +1,42 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import type * as AppBskyAgeassuranceDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.ageassurance.getState'
+
+export type QueryParams = {
+  countryCode: string
+  regionCode?: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  state: AppBskyAgeassuranceDefs.State
+  metadata: AppBskyAgeassuranceDefs.StateMetadata
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -13,6 +13,7 @@ import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
 import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
 import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs.js'
 import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
+import type * as AppBskyAgeassuranceDefs from '../../../app/bsky/ageassurance/defs.js'
 import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
 
@@ -308,6 +309,8 @@ export interface ModEventTakedown {
   policies?: string[]
   /** Severity level of the violation (e.g., 'sev-0', 'sev-1', 'sev-2', etc.). */
   severityLevel?: string
+  /** List of services where the takedown should be applied. If empty or not provided, takedown is applied on all configured services. */
+  targetServices?: ('appview' | 'pds' | (string & {}))[]
   /** Number of strikes to assign to the user for this violation. */
   strikeCount?: number
   /** When the strike should expire. If not provided, the strike never expires. */
@@ -447,10 +450,15 @@ export interface AgeAssuranceEvent {
   $type?: 'tools.ozone.moderation.defs#ageAssuranceEvent'
   /** The date and time of this write operation. */
   createdAt: string
-  /** The status of the age assurance process. */
-  status: 'unknown' | 'pending' | 'assured' | (string & {})
   /** The unique identifier for this instance of the age assurance flow, in UUID format. */
   attemptId: string
+  /** The status of the Age Assurance process. */
+  status: 'unknown' | 'pending' | 'assured' | (string & {})
+  access?: AppBskyAgeassuranceDefs.Access
+  /** The ISO 3166-1 alpha-2 country code provided when beginning the Age Assurance flow. */
+  countryCode?: string
+  /** The ISO 3166-2 region code provided when beginning the Age Assurance flow. */
+  regionCode?: string
   /** The IP address used when initiating the AA flow. */
   initIp?: string
   /** The user agent used when initiating the AA flow. */
@@ -476,6 +484,7 @@ export interface AgeAssuranceOverrideEvent {
   $type?: 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent'
   /** The status to be set for the user decided by a moderator, overriding whatever value the user had previously. Use reset to default to original state. */
   status: 'assured' | 'reset' | 'blocked' | (string & {})
+  access?: AppBskyAgeassuranceDefs.Access
   /** Comment describing the reason for the override. */
   comment: string
 }
@@ -634,6 +643,8 @@ export interface ModEventEmail {
   strikeCount?: number
   /** When the strike should expire. If not provided, the strike never expires. */
   strikeExpiresAt?: string
+  /** Indicates whether the email was successfully delivered to the user's inbox. */
+  isDelivered?: boolean
 }
 
 const hashModEventEmail = 'modEventEmail'

package/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts

@@ -51,7 +51,12 @@ export type QueryParams = {
   /** When set to true, only muted subjects and reporters will be returned. */
   onlyMuted?: boolean
   /** Specify when fetching subjects in a certain state */
-  reviewState?: string
+  reviewState?:
+    | 'tools.ozone.moderation.defs#reviewOpen'
+    | 'tools.ozone.moderation.defs#reviewClosed'
+    | 'tools.ozone.moderation.defs#reviewEscalated'
+    | 'tools.ozone.moderation.defs#reviewNone'
+    | (string & {})
   ignoreSubjects?: string[]
   /** Get all subject statuses that were reviewed by a specific moderator */
   lastReviewedBy?: string

package/src/lexicon/types/tools/ozone/moderation/scheduleAction.ts

@@ -56,6 +56,16 @@ export interface Takedown {
   acknowledgeAccountSubjects?: boolean
   /** Names/Keywords of the policies that drove the decision. */
   policies?: string[]
+  /** Severity level of the violation (e.g., 'sev-0', 'sev-1', 'sev-2', etc.). */
+  severityLevel?: string
+  /** Number of strikes to assign to the user when takedown is applied. */
+  strikeCount?: number
+  /** When the strike should expire. If not provided, the strike never expires. */
+  strikeExpiresAt?: string
+  /** Email content to be sent to the user upon takedown. */
+  emailContent?: string
+  /** Subject of the email to be sent to the user upon takedown. */
+  emailSubject?: string
 }
 
 const hashTakedown = 'takedown'

package/src/mod-service/index.ts

@@ -494,6 +494,7 @@ export class ModerationService {
 
     if (isModEventEmail(event)) {
       meta.subjectLine = event.subjectLine
+      meta.isDelivered = !!event.isDelivered
       if (event.content) {
         meta.content = event.content
       }
@@ -572,6 +573,10 @@ export class ModerationService {
       meta.policies = event.policies.join(',')
     }
 
+    if (isModEventTakedown(event) && event.targetServices?.length) {
+      meta.targetServices = event.targetServices.join(',')
+    }
+
     // Keep trace of reports that came in while the reporter was in muted stated
     if (isModEventReport(event)) {
       const isReportingMuted = await this.isReportingMutedForSubject(createdBy)
@@ -773,17 +778,20 @@ export class ModerationService {
   async takedownRepo(
     subject: RepoSubject,
     takedownId: number,
+    targetServices: Set<string>,
     isSuspend = false,
   ) {
     const takedownRef = `BSKY-${
       isSuspend ? 'SUSPEND' : 'TAKEDOWN'
     }-${takedownId}`
 
-    const values = this.eventPusher.takedowns.map((eventType) => ({
-      eventType,
-      subjectDid: subject.did,
-      takedownRef,
-    }))
+    const values = this.eventPusher
+      .getTakedownServices(targetServices)
+      .map((eventType) => ({
+        eventType,
+        subjectDid: subject.did,
+        takedownRef,
+      }))
 
     const repoEvts = await this.db.db
       .insertInto('repo_push_event')
@@ -849,7 +857,11 @@ export class ModerationService {
     })
   }
 
-  async takedownRecord(subject: RecordSubject, takedownId: number) {
+  async takedownRecord(
+    subject: RecordSubject,
+    takedownId: number,
+    targetServices: Set<string>,
+  ) {
     this.db.assertTransaction()
     await this.formatAndCreateLabels(subject.uri, subject.cid, {
       create: [TAKEDOWN_LABEL],
@@ -859,7 +871,9 @@ export class ModerationService {
     const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobValues: Insertable<BlobPushEvent>[] = []
-      for (const eventType of this.eventPusher.takedowns) {
+      for (const eventType of this.eventPusher.getTakedownServices(
+        targetServices,
+      )) {
         for (const cid of blobCids) {
           blobValues.push({
             eventType,

package/src/mod-service/util.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/no-deprecated */
+
 import net from 'node:net'
 import { sql } from 'kysely'
 import AtpAgent from '@atproto/api'

package/src/mod-service/views.ts

@@ -195,6 +195,15 @@ export class ModerationViews {
       }
     }
 
+    if (isModEventTakedown(event)) {
+      if (
+        typeof meta.targetServices === 'string' &&
+        meta.targetServices.length > 0
+      ) {
+        event.targetServices = meta.targetServices.split(',')
+      }
+    }
+
     if (isModEventLabel(event)) {
       event.createLabelVals = row.createLabelVals?.length
         ? row.createLabelVals.split(' ')
@@ -229,6 +238,7 @@ export class ModerationViews {
     if (isModEventEmail(event)) {
       event.content = ifString(meta.content)!
       event.subjectLine = ifString(meta.subjectLine)!
+      event.isDelivered = !!meta.isDelivered
     }
 
     if (isModEventComment(event) && meta.sticky) {

package/src/setting/validators.ts

@@ -198,6 +198,21 @@ export const settingValidators = new Map<
                 hasDefault = true
               }
             }
+
+            if (severityVal['targetServices'] !== undefined) {
+              if (!Array.isArray(severityVal['targetServices'])) {
+                throw new InvalidRequestError(
+                  `targetServices must be an array for severity level ${severityKey} in policy ${key}`,
+                )
+              }
+              for (const service of severityVal['targetServices']) {
+                if (typeof service !== 'string') {
+                  throw new InvalidRequestError(
+                    `Each target service must be a string for severity level ${severityKey} in policy ${key}`,
+                  )
+                }
+              }
+            }
           }
         }
       }

package/tests/query-labels.test.ts

@@ -1,8 +1,11 @@
+/* eslint-disable import/no-deprecated */
+
 import { AtpAgent } from '@atproto/api'
 import { cborEncode } from '@atproto/common'
 import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
 import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
-import { DisconnectError, Subscription } from '@atproto/xrpc-server'
+import { DisconnectError } from '@atproto/ws-client'
+import { Subscription } from '@atproto/xrpc-server'
 import { ids, lexicons } from '../src/lexicon/lexicons'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
 import {

package/tests/scheduled-action-processor.test.ts

@@ -19,13 +19,20 @@ describe('scheduled action processor', () => {
     }
   }
 
-  const scheduleTestAction = async (subject: string, scheduling: any) => {
+  const scheduleTestAction = async (
+    subject: string,
+    scheduling: any,
+    emailData?: { emailSubject?: string; emailContent?: string },
+  ) => {
     return await adminAgent.tools.ozone.moderation.scheduleAction(
       {
         action: {
           $type: 'tools.ozone.moderation.scheduleAction#takedown',
           comment: 'Test scheduled takedown',
           policies: ['spam'],
+          severityLevel: 'sev-1',
+          strikeCount: 1,
+          ...emailData,
         },
         subjects: [subject],
         createdBy: 'did:plc:moderator',
@@ -74,7 +81,14 @@ describe('scheduled action processor', () => {
       const testSubject = sc.dids.alice
 
       const pastTime = new Date(Date.now() - 1000).toISOString()
-      await scheduleTestAction(testSubject, { executeAt: pastTime })
+      await scheduleTestAction(
+        testSubject,
+        { executeAt: pastTime },
+        {
+          emailSubject: 'Test Email Subject',
+          emailContent: 'Test Email Content',
+        },
+      )
 
       const pendingActions = await getScheduledActions(
         ['pending'],
@@ -94,12 +108,20 @@ describe('scheduled action processor', () => {
 
       const modEvents = await getModerationEvents(testSubject, [
         'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventEmail',
       ])
-      expect(modEvents.length).toBe(1)
-
-      expect(modEvents[0].event['comment']).toContain(
-        '[SCHEDULED_ACTION] Test scheduled takedown',
+      expect(modEvents.length).toBe(2)
+      const takedownEvent = modEvents.find(
+        (e) => e.event.$type === 'tools.ozone.moderation.defs#modEventTakedown',
+      )
+      const emailEvent = modEvents.find(
+        (e) => e.event.$type === 'tools.ozone.moderation.defs#modEventEmail',
       )
+
+      expect(takedownEvent?.event['comment']).toBeDefined()
+
+      expect(emailEvent?.event['subjectLine']).toBe('Test Email Subject')
+      expect(emailEvent?.event['content']).toBe('Test Email Content')
     })
 
     it('skips actions scheduled for future execution', async () => {
@@ -202,7 +224,9 @@ describe('scheduled action processor', () => {
       // Verify the moderation event has all properties
       const modEvents = await getModerationEvents(testSubject, [
         'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventEmail',
       ])
+      // No email was sent
       expect(modEvents.length).toBe(1)
 
       const takedownEvent = modEvents[0].event as ModEventTakedown