merge main

bluesky-social · Mar 12, 2024 · 86b3ff7 · 86b3ff7
2 parents 115c0eb + 2802880
commit 86b3ff7
Show file tree

Hide file tree

Showing 21 changed files with 640 additions and 174 deletions.
diff --git a/.github/workflows/build-and-push-ozone-aws.yaml b/.github/workflows/build-and-push-ozone-aws.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - divert-blobs
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
@@ -26,7 +26,8 @@
             "#modEventEscalate",
             "#modEventMute",
             "#modEventEmail",
-            "#modEventResolveAppeal"
+            "#modEventResolveAppeal",
+            "#modEventDivert"
           ]
         },
         "subject": {
@@ -67,7 +68,8 @@
             "#modEventEscalate",
             "#modEventMute",
             "#modEventEmail",
-            "#modEventResolveAppeal"
+            "#modEventResolveAppeal",
+            "#modEventDivert"
           ]
         },
         "subject": {
@@ -317,6 +319,13 @@
         }
       }
     },
+    "modEventDivert": {
+      "type": "object",
+      "description": "Divert a record's blobs to a 3rd party service for further scanning/tagging",
+      "properties": {
+        "comment": { "type": "string" }
+      }
+    },
     "modEventTag": {
       "type": "object",
       "description": "Add/Remove a tag on a subject",

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -7976,6 +7976,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventMute',
               'lex:tools.ozone.moderation.defs#modEventEmail',
               'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
+              'lex:tools.ozone.moderation.defs#modEventDivert',
             ],
           },
           subject: {
@@ -8034,6 +8035,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventMute',
               'lex:tools.ozone.moderation.defs#modEventEmail',
               'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
+              'lex:tools.ozone.moderation.defs#modEventDivert',
             ],
           },
           subject: {
@@ -8320,6 +8322,16 @@ export const schemaDict = {
           },
         },
       },
+      modEventDivert: {
+        type: 'object',
+        description:
+          "Divert a record's blobs to a 3rd party service for further scanning/tagging",
+        properties: {
+          comment: {
+            type: 'string',
+          },
+        },
+      },
       modEventTag: {
         type: 'object',
         description: 'Add/Remove a tag on a subject',

diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -24,6 +24,7 @@ export interface ModEventView {
     | ModEventMute
     | ModEventEmail
     | ModEventResolveAppeal
+    | ModEventDivert
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
@@ -62,6 +63,7 @@ export interface ModEventViewDetail {
     | ModEventMute
     | ModEventEmail
     | ModEventResolveAppeal
+    | ModEventDivert
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -367,6 +369,24 @@ export function validateModEventEmail(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
 }
 
+/** Divert a record's blobs to a 3rd party service for further scanning/tagging */
+export interface ModEventDivert {
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventDivert(v: unknown): v is ModEventDivert {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
+  )
+}
+
+export function validateModEventDivert(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+}
+
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
   /** Tags to be added to the subject. If already exists, won't be duplicated. */