Evented architecture for moderation system

lexicons/com/atproto/admin/defs.json

@@ -9,10 +9,8 @@
         "action",
         "subject",
         "subjectBlobCids",
-        "reason",
         "createdBy",
-        "createdAt",
-        "resolvedReportIds"
+        "createdAt"
       ],
       "properties": {
         "id": { "type": "integer" },
@@ -28,10 +26,11 @@
         "subjectBlobCids": { "type": "array", "items": { "type": "string" } },
         "createLabelVals": { "type": "array", "items": { "type": "string" } },
         "negateLabelVals": { "type": "array", "items": { "type": "string" } },
-        "reason": { "type": "string" },
+        "comment": { "type": "string" },
         "createdBy": { "type": "string", "format": "did" },
         "createdAt": { "type": "string", "format": "datetime" },
         "reversal": { "type": "ref", "ref": "#actionReversal" },
+        "meta": { "type": "ref", "ref": "#actionMeta" },
         "resolvedReportIds": { "type": "array", "items": { "type": "integer" } }
       }
     },
@@ -42,7 +41,6 @@
         "action",
         "subject",
         "subjectBlobs",
-        "reason",
         "createdBy",
         "createdAt",
         "resolvedReports"
@@ -69,7 +67,7 @@
         },
         "createLabelVals": { "type": "array", "items": { "type": "string" } },
         "negateLabelVals": { "type": "array", "items": { "type": "string" } },
-        "reason": { "type": "string" },
+        "comment": { "type": "string" },
         "createdBy": { "type": "string", "format": "did" },
         "createdAt": { "type": "string", "format": "datetime" },
         "reversal": { "type": "ref", "ref": "#actionReversal" },
@@ -93,16 +91,31 @@
     },
     "actionReversal": {
       "type": "object",
-      "required": ["reason", "createdBy", "createdAt"],
+      "required": ["createdBy", "createdAt"],
       "properties": {
-        "reason": { "type": "string" },
+        "comment": { "type": "string" },
         "createdBy": { "type": "string", "format": "did" },
         "createdAt": { "type": "string", "format": "datetime" }
       }
     },
+    "actionMeta": {
+      "type": "object",
+      "properties": {
+        "resolveReportIds": { "type": "array", "items": { "type": "integer" } }
+      }
+    },
     "actionType": {
       "type": "string",
-      "knownValues": ["#takedown", "#flag", "#acknowledge", "#escalate"]
+      "knownValues": [
+        "#takedown",
+        "#flag",
+        "#acknowledge",
+        "#escalate",
+        "#comment",
+        "#label",
+        "#revert",
+        "#mute"
+      ]
     },
     "takedown": {
       "type": "token",
@@ -120,6 +133,26 @@
       "type": "token",
       "description": "Moderation action type: Escalate. Indicates that the content has been flagged for additional review."
     },
+    "comment": {
+      "type": "token",
+      "description": "Moderation action type: Comment. Indicates that no change is being made to the subject or associated reports, just a comment is being added by a human or automated moderator"
+    },
+    "label": {
+      "type": "token",
+      "description": "Moderation action type: Label. Indicates that labels associated with the subject are being changed."
+    },
+    "revert": {
+      "type": "token",
+      "description": "Moderation action type: Revert. Indicates that a previously taken action is being reversed."
+    },
+    "mute": {
+      "type": "token",
+      "description": "Moderation action type: Mute. Indicates that reports/other events on a subject can be muted for a period of time."
+    },
+    "report": {
+      "type": "token",
+      "description": "Moderation action type: Report. Indicates that a new report was received for the subject."
+    },
     "reportView": {
       "type": "object",
       "required": [
@@ -136,7 +169,7 @@
           "type": "ref",
           "ref": "com.atproto.moderation.defs#reasonType"
         },
-        "reason": { "type": "string" },
+        "comment": { "type": "string" },
         "subjectRepoHandle": { "type": "string" },
         "subject": {
           "type": "union",
@@ -150,6 +183,22 @@
         }
       }
     },
+    "subjectStatusView": {
+      "type": "object",
+      "required": ["id", "subject", "updatedAt", "status"],
+      "properties": {
+        "id": { "type": "integer" },
+        "subject": {
+          "type": "union",
+          "refs": ["#repoRef", "com.atproto.repo.strongRef"]
+        },
+        "updatedAt": { "type": "string", "format": "datetime" },
+        "status": {
+          "type": "ref",
+          "ref": "#subjectStatusType"
+        }
+      }
+    },
     "reportViewDetail": {
       "type": "object",
       "required": [
@@ -166,7 +215,7 @@
           "type": "ref",
           "ref": "com.atproto.moderation.defs#reasonType"
         },
-        "reason": { "type": "string" },
+        "comment": { "type": "string" },
         "subject": {
           "type": "union",
           "refs": [
@@ -176,6 +225,10 @@
             "#recordViewNotFound"
           ]
         },
+        "subjectStatusView": {
+          "type": "ref",
+          "ref": "com.atproto.admin.defs#subjectStatusView"
+        },
         "reportedBy": { "type": "string", "format": "did" },
         "createdAt": { "type": "string", "format": "datetime" },
         "resolvedByActions": {
@@ -368,6 +421,40 @@
         "height": { "type": "integer" },
         "length": { "type": "integer" }
       }
+    },
+    "subjectStatusType": {
+      "type": "string",
+      "knownValues": [
+        "#reported",
+        "#resolved",
+        "#takendown",
+        "#acknowledged",
+        "#muted"
+      ]
+    },
+    "reported": {
+      "type": "token",
+      "description": "Moderation status of a subject: reported. Indicates that the subject was reported"
+    },
+    "resolved": {
+      "type": "token",
+      "description": "Moderation status of a subject: resolved. Indicates that the reports on the subject were marked as resolved "
+    },
+    "takendown": {
+      "type": "token",
+      "description": "Moderation status of a subject: takendown. Indicates that the subject was taken down"
+    },
+    "acknowledged": {
+      "type": "token",
+      "description": "Moderation status of a subject: acknowledged. Indicates that the reports on the subject were acknowledged by moderator"
+    },
+    "muted": {
+      "type": "token",
+      "description": "Moderation status of a subject: muted. Indicates that reports were muted by a moderator"
+    },
+    "escalated": {
+      "type": "token",
+      "description": "Moderation status of a subject: escalated. Indicates that reports were escalated by a moderator"
     }
   }
 }

lexicons/com/atproto/admin/getModerationStatuses.json

@@ -0,0 +1,50 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.admin.getModerationStatuses",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "View moderation statuses of subjects (record or repo).",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "subject": { "type": "string" },
+          "status": {
+            "type": "string",
+            "knownValues": [
+              "com.atproto.admin.defs#acknowledged",
+              "com.atproto.admin.defs#muted",
+              "com.atproto.admin.defs#escalated",
+              "com.atproto.admin.defs#reported",
+              "com.atproto.admin.defs#takendown"
+            ]
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": { "type": "string" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["subjectStatuses"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "subjectStatuses": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "com.atproto.admin.defs#subjectStatusView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

lexicons/com/atproto/admin/takeModerationAction.json

@@ -9,14 +9,20 @@
         "encoding": "application/json",
         "schema": {
           "type": "object",
-          "required": ["action", "subject", "reason", "createdBy"],
+          "required": ["action", "subject", "createdBy"],
           "properties": {
             "action": {
               "type": "string",
               "knownValues": [
                 "com.atproto.admin.defs#takedown",
                 "com.atproto.admin.defs#flag",
-                "com.atproto.admin.defs#acknowledge"
+                "com.atproto.admin.defs#acknowledge",
+                "com.atproto.admin.defs#escalate",
+                "com.atproto.admin.defs#comment",
+                "com.atproto.admin.defs#label",
+                "com.atproto.admin.defs#revert",
+                "com.atproto.admin.defs#report",
+                "com.atproto.admin.defs#mute"
               ]
             },
             "subject": {
@@ -38,12 +44,17 @@
               "type": "array",
               "items": { "type": "string" }
             },
-            "reason": { "type": "string" },
+            "comment": { "type": "string" },
             "durationInHours": {
               "type": "integer",
               "description": "Indicates how long this action was meant to be in effect before automatically expiring."
             },
-            "createdBy": { "type": "string", "format": "did" }
+            "createdBy": { "type": "string", "format": "did" },
+            "meta": { "type": "ref", "ref": "#actionMeta" },
+            "refEventId": {
+              "type": "integer",
+              "description": "If the event needs a reference to previous event, for instance, when reverting a previous action, the reference event id should be passed"
+            }
           }
         }
       },
@@ -55,6 +66,12 @@
         }
       },
       "errors": [{ "name": "SubjectHasAction" }]
+    },
+    "actionMeta": {
+      "type": "object",
+      "properties": {
+        "reportType": { "type": "string" }
+      }
     }
   }
 }