@atproto/ozone 0.1.154 → 0.1.156

package/src/jetstream/service.ts

@@ -1,4 +1,4 @@
-import { WebSocketKeepAlive } from '@atproto/xrpc-server'
+import { WebSocketKeepAlive } from '@atproto/ws-client'
 
 type JetstreamRecord = Record<string, unknown>
 type OnCreateCallback<T extends JetstreamRecord> = (

package/src/lexicon/lexicons.ts

@@ -14889,6 +14889,15 @@ export const schemaDict = {
             description:
               "Severity level of the violation (e.g., 'sev-0', 'sev-1', 'sev-2', etc.).",
           },
+          targetServices: {
+            type: 'array',
+            items: {
+              type: 'string',
+              knownValues: ['appview', 'pds'],
+            },
+            description:
+              'List of services where the takedown should be applied. If empty or not provided, takedown is applied on all configured services.',
+          },
           strikeCount: {
             type: 'integer',
             description:
@@ -15197,6 +15206,11 @@ export const schemaDict = {
             description:
               'When the strike should expire. If not provided, the strike never expires.',
           },
+          isDelivered: {
+            type: 'boolean',
+            description:
+              "Indicates whether the email was successfully delivered to the user's inbox.",
+          },
         },
       },
       modEventDivert: {
@@ -16950,6 +16964,31 @@ export const schemaDict = {
             description:
               'Names/Keywords of the policies that drove the decision.',
           },
+          severityLevel: {
+            type: 'string',
+            description:
+              "Severity level of the violation (e.g., 'sev-0', 'sev-1', 'sev-2', etc.).",
+          },
+          strikeCount: {
+            type: 'integer',
+            description:
+              'Number of strikes to assign to the user when takedown is applied.',
+          },
+          strikeExpiresAt: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'When the strike should expire. If not provided, the strike never expires.',
+          },
+          emailContent: {
+            type: 'string',
+            description: 'Email content to be sent to the user upon takedown.',
+          },
+          emailSubject: {
+            type: 'string',
+            description:
+              'Subject of the email to be sent to the user upon takedown.',
+          },
         },
       },
       schedulingConfig: {

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

@@ -308,6 +308,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. */
@@ -634,6 +636,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/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/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

@@ -2,7 +2,8 @@ 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

package/tests/takedown.test.ts

@@ -1,5 +1,9 @@
 import assert from 'node:assert'
-import { ComAtprotoAdminDefs, ToolsOzoneModerationDefs } from '@atproto/api'
+import {
+  AtpAgent,
+  ComAtprotoAdminDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
@@ -12,6 +16,8 @@ describe('moderation', () => {
 
   let sc: SeedClient
   let modClient: ModeratorClient
+  let pdsAgent: AtpAgent
+  let bskyAgent: AtpAgent
 
   const repoSubject = (did: string) => ({
     $type: 'com.atproto.admin.defs#repoRef',
@@ -24,6 +30,8 @@ describe('moderation', () => {
     })
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
+    pdsAgent = network.pds.getClient()
+    bskyAgent = network.bsky.getClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -60,4 +68,38 @@ describe('moderation', () => {
     assert(ComAtprotoAdminDefs.isRepoRef(subject))
     expect(subject.did).toEqual(sc.dids.bob)
   })
+
+  it('applies takedown only to specified service when targetServices is set', async () => {
+    await modClient.emitEvent({
+      event: {
+        $type: 'tools.ozone.moderation.defs#modEventTakedown',
+        targetServices: ['appview'],
+      },
+      subject: repoSubject(sc.dids.carol),
+    })
+
+    await network.processAll()
+
+    const [pdsStatus, appviewStatus, carolsEvents] = await Promise.all([
+      pdsAgent.com.atproto.admin.getSubjectStatus(
+        { did: sc.dids.carol },
+        { headers: network.pds.adminAuthHeaders() },
+      ),
+      bskyAgent.com.atproto.admin.getSubjectStatus(
+        { did: sc.dids.carol },
+        { headers: network.bsky.adminAuthHeaders() },
+      ),
+      modClient.queryEvents({
+        subject: sc.dids.carol,
+        types: ['tools.ozone.moderation.defs#modEventTakedown'],
+      }),
+    ])
+
+    expect(pdsStatus.data.takedown?.applied).toBe(false)
+    expect(appviewStatus.data.takedown?.applied).toBe(true)
+
+    const event = carolsEvents.events[0].event
+    assert(ToolsOzoneModerationDefs.isModEventTakedown(event))
+    expect(event.targetServices).toEqual(['appview'])
+  })
 })