@atproto/ozone 0.1.155 → 0.1.157

package/src/daemon/scheduled-action-processor.ts

@@ -16,6 +16,7 @@ import { RepoSubject } from '../mod-service/subject'
 import { ModEventType } from '../mod-service/types'
 import { ScheduledActionServiceCreator } from '../scheduled-action/service'
 import { SettingService, SettingServiceCreator } from '../setting/service'
+import { retryHttp } from '../util'
 
 export class ScheduledActionProcessor {
   destroyed = false
@@ -75,6 +76,10 @@ export class ScheduledActionProcessor {
         }
 
         let event: ModEventType
+        const email = {
+          subject: '',
+          content: '',
+        }
         let modTool: ModTool | undefined
 
         // Create the appropriate moderation action based on the scheduled action type
@@ -83,6 +88,8 @@ export class ScheduledActionProcessor {
             {
               const eventData = action.eventData as ModEventTakedown & {
                 modTool?: ModTool
+                emailSubject?: string
+                emailContent?: string
               }
               modTool = eventData.modTool
               event = {
@@ -92,6 +99,13 @@ export class ScheduledActionProcessor {
                 acknowledgeAccountSubjects:
                   eventData.acknowledgeAccountSubjects,
                 policies: eventData.policies,
+                severityLevel: eventData.severityLevel,
+                strikeCount: eventData.strikeCount,
+              }
+
+              if (eventData.emailSubject && eventData.emailContent) {
+                email.subject = eventData.emailSubject
+                email.content = eventData.emailContent
               }
             }
             break
@@ -107,6 +121,7 @@ export class ScheduledActionProcessor {
           modTool,
           moderationTxn,
           settingService,
+          email,
         })
 
         // Mark the scheduled action as executed
@@ -142,12 +157,14 @@ export class ScheduledActionProcessor {
   }
 
   async performTakedown({
+    email,
     action,
     event,
     modTool,
     moderationTxn,
     settingService,
   }: {
+    email: { subject: string; content: string }
     action: Selectable<ScheduledAction>
     event: ModEventType
     modTool: ModTool | undefined
@@ -190,7 +207,48 @@ export class ScheduledActionProcessor {
     })
 
     // register the takedown in event pusher
-    await moderationTxn.takedownRepo(subject, moderationEvent.event.id)
+    await moderationTxn.takedownRepo(
+      subject,
+      moderationEvent.event.id,
+      new Set(
+        moderationEvent.event.meta?.targetServices
+          ? `${moderationEvent.event.meta.targetServices}`.split(',')
+          : undefined,
+      ),
+    )
+
+    if (email.content && email.subject) {
+      let isDelivered = false
+      try {
+        await retryHttp(() =>
+          moderationTxn.sendEmail({
+            ...email,
+            recipientDid: action.did,
+          }),
+        )
+        isDelivered = true
+      } catch (err) {
+        dbLogger.error(
+          { err, did: action.did },
+          'failed to send takedown email',
+        )
+      }
+      await moderationTxn.logEvent({
+        event: {
+          content: email.content,
+          subjectLine: email.subject,
+          $type: 'tools.ozone.moderation.defs#modEventEmail',
+          comment: [
+            'Communication attached to scheduled action',
+            isDelivered ? '' : 'Email delivery failed',
+          ].join('.'),
+          isDelivered,
+        },
+        subject,
+        modTool,
+        createdBy: action.createdBy,
+      })
+    }
 
     return moderationEvent
   }

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/index.ts

@@ -17,6 +17,9 @@ import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestio
 import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
 import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
 import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+import * as AppBskyAgeassuranceBegin from './types/app/bsky/ageassurance/begin.js'
+import * as AppBskyAgeassuranceGetConfig from './types/app/bsky/ageassurance/getConfig.js'
+import * as AppBskyAgeassuranceGetState from './types/app/bsky/ageassurance/getState.js'
 import * as AppBskyBookmarkCreateBookmark from './types/app/bsky/bookmark/createBookmark.js'
 import * as AppBskyBookmarkDeleteBookmark from './types/app/bsky/bookmark/deleteBookmark.js'
 import * as AppBskyBookmarkGetBookmarks from './types/app/bsky/bookmark/getBookmarks.js'
@@ -392,6 +395,7 @@ export class AppNS {
 export class AppBskyNS {
   _server: Server
   actor: AppBskyActorNS
+  ageassurance: AppBskyAgeassuranceNS
   bookmark: AppBskyBookmarkNS
   embed: AppBskyEmbedNS
   feed: AppBskyFeedNS
@@ -405,6 +409,7 @@ export class AppBskyNS {
   constructor(server: Server) {
     this._server = server
     this.actor = new AppBskyActorNS(server)
+    this.ageassurance = new AppBskyAgeassuranceNS(server)
     this.bookmark = new AppBskyBookmarkNS(server)
     this.embed = new AppBskyEmbedNS(server)
     this.feed = new AppBskyFeedNS(server)
@@ -509,6 +514,50 @@ export class AppBskyActorNS {
   }
 }
 
+export class AppBskyAgeassuranceNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  begin<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyAgeassuranceBegin.QueryParams,
+      AppBskyAgeassuranceBegin.HandlerInput,
+      AppBskyAgeassuranceBegin.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.ageassurance.begin' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getConfig<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyAgeassuranceGetConfig.QueryParams,
+      AppBskyAgeassuranceGetConfig.HandlerInput,
+      AppBskyAgeassuranceGetConfig.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.ageassurance.getConfig' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getState<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyAgeassuranceGetState.QueryParams,
+      AppBskyAgeassuranceGetState.HandlerInput,
+      AppBskyAgeassuranceGetState.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.ageassurance.getState' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class AppBskyBookmarkNS {
   _server: Server