@atproto/ozone 0.1.82 → 0.1.83

package/dist/lexicon/types/tools/ozone/moderation/emitEvent.d.ts

@@ -10,7 +10,7 @@ import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongR
 export interface QueryParams {
 }
 export interface InputSchema {
-    event: $Typed<ToolsOzoneModerationDefs.ModEventTakedown> | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge> | $Typed<ToolsOzoneModerationDefs.ModEventEscalate> | $Typed<ToolsOzoneModerationDefs.ModEventComment> | $Typed<ToolsOzoneModerationDefs.ModEventLabel> | $Typed<ToolsOzoneModerationDefs.ModEventReport> | $Typed<ToolsOzoneModerationDefs.ModEventMute> | $Typed<ToolsOzoneModerationDefs.ModEventUnmute> | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter> | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter> | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown> | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal> | $Typed<ToolsOzoneModerationDefs.ModEventEmail> | $Typed<ToolsOzoneModerationDefs.ModEventTag> | $Typed<ToolsOzoneModerationDefs.AccountEvent> | $Typed<ToolsOzoneModerationDefs.IdentityEvent> | $Typed<ToolsOzoneModerationDefs.RecordEvent> | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore> | {
+    event: $Typed<ToolsOzoneModerationDefs.ModEventTakedown> | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge> | $Typed<ToolsOzoneModerationDefs.ModEventEscalate> | $Typed<ToolsOzoneModerationDefs.ModEventComment> | $Typed<ToolsOzoneModerationDefs.ModEventLabel> | $Typed<ToolsOzoneModerationDefs.ModEventReport> | $Typed<ToolsOzoneModerationDefs.ModEventMute> | $Typed<ToolsOzoneModerationDefs.ModEventUnmute> | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter> | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter> | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown> | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal> | $Typed<ToolsOzoneModerationDefs.ModEventEmail> | $Typed<ToolsOzoneModerationDefs.ModEventDivert> | $Typed<ToolsOzoneModerationDefs.ModEventTag> | $Typed<ToolsOzoneModerationDefs.AccountEvent> | $Typed<ToolsOzoneModerationDefs.IdentityEvent> | $Typed<ToolsOzoneModerationDefs.RecordEvent> | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore> | {
         $type: string;
     };
     subject: $Typed<ComAtprotoAdminDefs.RepoRef> | $Typed<ComAtprotoRepoStrongRef.Main> | {

package/dist/lexicon/types/tools/ozone/moderation/emitEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emitEvent.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/tools/ozone/moderation/emitEvent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emitEvent.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/tools/ozone/moderation/emitEvent.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.82",
+  "version": "0.1.83",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -35,7 +35,7 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "undici": "^6.14.1",
-    "@atproto/api": "^0.14.3",
+    "@atproto/api": "^0.14.4",
     "@atproto/common": "^0.4.8",
     "@atproto/crypto": "^0.4.4",
     "@atproto/identity": "^0.4.6",
@@ -55,7 +55,7 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "@atproto/lex-cli": "^0.6.1",
-    "@atproto/pds": "^0.4.99"
+    "@atproto/pds": "^0.4.100"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/moderation/emitEvent.ts

@@ -1,3 +1,4 @@
+import { isModEventDivert } from '@atproto/api/dist/client/types/tools/ozone/moderation/defs'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
 import { AppContext } from '../../context'
@@ -13,10 +14,8 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
-  validateModEventDivert,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
-import { asPredicate } from '../../lexicon/util'
 import { subjectFromInput } from '../../mod-service/subject'
 import { ProtectedTagSettingKey } from '../../setting/constants'
 import { SettingService } from '../../setting/service'
@@ -25,8 +24,6 @@ import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
 import { retryHttp } from '../../util'
 
-const isValidModEventDivert = asPredicate(validateModEventDivert)
-
 const handleModerationEvent = async ({
   ctx,
   input,
@@ -130,7 +127,7 @@ const handleModerationEvent = async ({
     )
   }
 
-  if (isValidModEventDivert(event) && subject.isRecord()) {
+  if (isModEventDivert(event) && subject.isRecord()) {
     if (!ctx.blobDiverter) {
       throw new InvalidRequestError(
         'BlobDiverter not configured for this service',
@@ -165,6 +162,7 @@ const handleModerationEvent = async ({
       ctx.cfg.service.did,
       moderationTxn,
     )
+
     const initialTags = isModEventReport(event)
       ? [getTagForReport(event.reportType)]
       : undefined
@@ -231,7 +229,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       // On divert events, we need to automatically take down the blobs
-      if (isValidModEventDivert(input.body.event)) {
+      if (isModEventDivert(input.body.event)) {
         await handleModerationEvent({
           auth,
           ctx,

package/src/lexicon/lexicons.ts

@@ -12528,6 +12528,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
+                  'lex:tools.ozone.moderation.defs#modEventDivert',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',

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

@@ -32,6 +32,7 @@ export interface InputSchema {
     | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
     | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
     | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventDivert>
     | $Typed<ToolsOzoneModerationDefs.ModEventTag>
     | $Typed<ToolsOzoneModerationDefs.AccountEvent>
     | $Typed<ToolsOzoneModerationDefs.IdentityEvent>