@atproto/bsky 0.0.15 → 0.0.17

package/tests/admin/__snapshots__/get-record.test.ts.snap

@@ -17,74 +17,23 @@ Object {
     },
   ],
   "moderation": Object {
-    "actions": Array [
-      Object {
-        "action": "com.atproto.admin.defs#takedown",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 2,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
+    "subjectStatus": Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 1,
+      "lastReportedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedBy": "did:example:admin",
+      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "subject": Object {
+        "$type": "com.atproto.repo.strongRef",
+        "cid": "cids(0)",
+        "uri": "record(0)",
       },
-      Object {
-        "action": "com.atproto.admin.defs#acknowledge",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 1,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "reversal": Object {
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "createdBy": "did:example:admin",
-          "reason": "X",
-        },
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
-      },
-    ],
-    "currentAction": Object {
-      "action": "com.atproto.admin.defs#takedown",
-      "id": 2,
+      "subjectBlobCids": Array [],
+      "subjectRepoHandle": "alice.test",
+      "takendown": true,
+      "updatedAt": "1970-01-01T00:00:00.000Z",
     },
-    "reports": Array [
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 2,
-        "reason": "defamation",
-        "reasonType": "com.atproto.moderation.defs#reasonOther",
-        "reportedBy": "user(1)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectRepoHandle": "alice.test",
-      },
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 1,
-        "reasonType": "com.atproto.moderation.defs#reasonSpam",
-        "reportedBy": "user(2)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectRepoHandle": "alice.test",
-      },
-    ],
   },
   "repo": Object {
     "did": "user(0)",
@@ -154,74 +103,23 @@ Object {
     },
   ],
   "moderation": Object {
-    "actions": Array [
-      Object {
-        "action": "com.atproto.admin.defs#takedown",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 2,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
+    "subjectStatus": Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 1,
+      "lastReportedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedBy": "did:example:admin",
+      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "subject": Object {
+        "$type": "com.atproto.repo.strongRef",
+        "cid": "cids(0)",
+        "uri": "record(0)",
       },
-      Object {
-        "action": "com.atproto.admin.defs#acknowledge",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 1,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "reversal": Object {
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "createdBy": "did:example:admin",
-          "reason": "X",
-        },
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
-      },
-    ],
-    "currentAction": Object {
-      "action": "com.atproto.admin.defs#takedown",
-      "id": 2,
+      "subjectBlobCids": Array [],
+      "subjectRepoHandle": "alice.test",
+      "takendown": true,
+      "updatedAt": "1970-01-01T00:00:00.000Z",
     },
-    "reports": Array [
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 2,
-        "reason": "defamation",
-        "reasonType": "com.atproto.moderation.defs#reasonOther",
-        "reportedBy": "user(1)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectRepoHandle": "alice.test",
-      },
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 1,
-        "reasonType": "com.atproto.moderation.defs#reasonSpam",
-        "reportedBy": "user(2)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectRepoHandle": "alice.test",
-      },
-    ],
   },
   "repo": Object {
     "did": "user(0)",

package/tests/admin/__snapshots__/get-repo.test.ts.snap

@@ -10,68 +10,22 @@ Object {
   "invitesDisabled": false,
   "labels": Array [],
   "moderation": Object {
-    "actions": Array [
-      Object {
-        "action": "com.atproto.admin.defs#takedown",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 2,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.admin.defs#repoRef",
-          "did": "user(0)",
-        },
-        "subjectBlobCids": Array [],
-      },
-      Object {
-        "action": "com.atproto.admin.defs#acknowledge",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 1,
-        "reason": "X",
-        "resolvedReportIds": Array [],
-        "reversal": Object {
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "createdBy": "did:example:admin",
-          "reason": "X",
-        },
-        "subject": Object {
-          "$type": "com.atproto.admin.defs#repoRef",
-          "did": "user(0)",
-        },
-        "subjectBlobCids": Array [],
+    "subjectStatus": Object {
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "id": 1,
+      "lastReportedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedBy": "did:example:admin",
+      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "subject": Object {
+        "$type": "com.atproto.admin.defs#repoRef",
+        "did": "user(0)",
       },
-    ],
-    "currentAction": Object {
-      "action": "com.atproto.admin.defs#takedown",
-      "id": 2,
+      "subjectBlobCids": Array [],
+      "subjectRepoHandle": "alice.test",
+      "takendown": true,
+      "updatedAt": "1970-01-01T00:00:00.000Z",
     },
-    "reports": Array [
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 2,
-        "reason": "defamation",
-        "reasonType": "com.atproto.moderation.defs#reasonOther",
-        "reportedBy": "user(1)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.admin.defs#repoRef",
-          "did": "user(0)",
-        },
-      },
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 1,
-        "reasonType": "com.atproto.moderation.defs#reasonSpam",
-        "reportedBy": "user(2)",
-        "resolvedByActionIds": Array [],
-        "subject": Object {
-          "$type": "com.atproto.admin.defs#repoRef",
-          "did": "user(0)",
-        },
-      },
-    ],
   },
   "relatedRecords": Array [
     Object {

package/tests/admin/__snapshots__/moderation-events.test.ts.snap

@@ -0,0 +1,146 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`moderation-events get event gets an event by specific id 1`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "user(2)",
+  "event": Object {
+    "$type": "com.atproto.admin.defs#modEventReport",
+    "comment": "X",
+    "reportType": "com.atproto.moderation.defs#reasonMisleading",
+  },
+  "id": 1,
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoView",
+    "did": "user(0)",
+    "handle": "alice.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "moderation": Object {
+      "subjectStatus": Object {
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "id": 1,
+        "lastReportedAt": "1970-01-01T00:00:00.000Z",
+        "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+        "lastReviewedBy": "user(1)",
+        "reviewState": "com.atproto.admin.defs#reviewEscalated",
+        "subject": Object {
+          "$type": "com.atproto.admin.defs#repoRef",
+          "did": "user(0)",
+        },
+        "subjectBlobCids": Array [],
+        "subjectRepoHandle": "alice.test",
+        "takendown": false,
+        "updatedAt": "1970-01-01T00:00:00.000Z",
+      },
+    },
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
+          },
+          "size": 3976,
+        },
+        "description": "its me!",
+        "displayName": "ali",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label-a",
+            },
+            Object {
+              "val": "self-label-b",
+            },
+          ],
+        },
+      },
+    ],
+  },
+  "subjectBlobCids": Array [],
+  "subjectBlobs": Array [],
+}
+`;
+
+exports[`moderation-events query events returns all events for record or repo 1`] = `
+Array [
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(1)",
+    "creatorHandle": "alice.test",
+    "event": Object {
+      "$type": "com.atproto.admin.defs#modEventReport",
+      "comment": "X",
+      "reportType": "com.atproto.moderation.defs#reasonSpam",
+    },
+    "id": 7,
+    "subject": Object {
+      "$type": "com.atproto.admin.defs#repoRef",
+      "did": "user(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectHandle": "bob.test",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(1)",
+    "creatorHandle": "alice.test",
+    "event": Object {
+      "$type": "com.atproto.admin.defs#modEventReport",
+      "comment": "X",
+      "reportType": "com.atproto.moderation.defs#reasonSpam",
+    },
+    "id": 3,
+    "subject": Object {
+      "$type": "com.atproto.admin.defs#repoRef",
+      "did": "user(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectHandle": "bob.test",
+  },
+]
+`;
+
+exports[`moderation-events query events returns all events for record or repo 2`] = `
+Array [
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(0)",
+    "creatorHandle": "bob.test",
+    "event": Object {
+      "$type": "com.atproto.admin.defs#modEventReport",
+      "comment": "X",
+      "reportType": "com.atproto.moderation.defs#reasonSpam",
+    },
+    "id": 6,
+    "subject": Object {
+      "$type": "com.atproto.repo.strongRef",
+      "cid": "cids(0)",
+      "uri": "record(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectHandle": "alice.test",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(0)",
+    "creatorHandle": "bob.test",
+    "event": Object {
+      "$type": "com.atproto.admin.defs#modEventReport",
+      "comment": "X",
+      "reportType": "com.atproto.moderation.defs#reasonSpam",
+    },
+    "id": 2,
+    "subject": Object {
+      "$type": "com.atproto.repo.strongRef",
+      "cid": "cids(0)",
+      "uri": "record(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectHandle": "alice.test",
+  },
+]
+`;

package/tests/admin/__snapshots__/moderation-statuses.test.ts.snap

@@ -0,0 +1,64 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`moderation-statuses query statuses returns statuses for subjects that received moderation events 1`] = `
+Array [
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "id": 4,
+    "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "subject": Object {
+      "$type": "com.atproto.repo.strongRef",
+      "cid": "cids(0)",
+      "uri": "record(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectRepoHandle": "bob.test",
+    "takendown": false,
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "id": 3,
+    "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "subject": Object {
+      "$type": "com.atproto.admin.defs#repoRef",
+      "did": "user(0)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectRepoHandle": "bob.test",
+    "takendown": false,
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "id": 2,
+    "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "subject": Object {
+      "$type": "com.atproto.repo.strongRef",
+      "cid": "cids(1)",
+      "uri": "record(1)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectRepoHandle": "alice.test",
+    "takendown": false,
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "id": 1,
+    "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "subject": Object {
+      "$type": "com.atproto.admin.defs#repoRef",
+      "did": "user(1)",
+    },
+    "subjectBlobCids": Array [],
+    "subjectRepoHandle": "alice.test",
+    "takendown": false,
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+  },
+]
+`;

package/tests/admin/__snapshots__/moderation.test.ts.snap

@@ -1,130 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`moderation actioning resolves reports on missing repos and records. 1`] = `
-Object {
-  "recordActionDetail": Object {
-    "action": "com.atproto.admin.defs#flag",
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "createdBy": "did:example:admin",
-    "id": 2,
-    "reason": "Y",
-    "resolvedReports": Array [
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 11,
-        "reason": "defamation",
-        "reasonType": "com.atproto.moderation.defs#reasonOther",
-        "reportedBy": "user(0)",
-        "resolvedByActionIds": Array [
-          2,
-        ],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-      },
-      Object {
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "id": 10,
-        "reasonType": "com.atproto.moderation.defs#reasonSpam",
-        "reportedBy": "user(1)",
-        "resolvedByActionIds": Array [
-          2,
-        ],
-        "subject": Object {
-          "$type": "com.atproto.admin.defs#repoRef",
-          "did": "user(2)",
-        },
-      },
-    ],
-    "subject": Object {
-      "$type": "com.atproto.admin.defs#recordViewNotFound",
-      "uri": "record(0)",
-    },
-    "subjectBlobs": Array [],
-  },
-  "reportADetail": Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 10,
-    "reasonType": "com.atproto.moderation.defs#reasonSpam",
-    "reportedBy": "user(1)",
-    "resolvedByActions": Array [
-      Object {
-        "action": "com.atproto.admin.defs#flag",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 2,
-        "reason": "Y",
-        "resolvedReportIds": Array [
-          11,
-          10,
-        ],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
-      },
-    ],
-    "subject": Object {
-      "$type": "com.atproto.admin.defs#repoViewNotFound",
-      "did": "user(2)",
-    },
-  },
-  "reportBDetail": Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "id": 11,
-    "reason": "defamation",
-    "reasonType": "com.atproto.moderation.defs#reasonOther",
-    "reportedBy": "user(0)",
-    "resolvedByActions": Array [
-      Object {
-        "action": "com.atproto.admin.defs#flag",
-        "createdAt": "1970-01-01T00:00:00.000Z",
-        "createdBy": "did:example:admin",
-        "id": 2,
-        "reason": "Y",
-        "resolvedReportIds": Array [
-          11,
-          10,
-        ],
-        "subject": Object {
-          "$type": "com.atproto.repo.strongRef",
-          "cid": "cids(0)",
-          "uri": "record(0)",
-        },
-        "subjectBlobCids": Array [],
-      },
-    ],
-    "subject": Object {
-      "$type": "com.atproto.admin.defs#recordViewNotFound",
-      "uri": "record(0)",
-    },
-  },
-}
-`;
-
-exports[`moderation actioning resolves reports on repos and records. 1`] = `
-Object {
-  "action": "com.atproto.admin.defs#takedown",
-  "createdAt": "1970-01-01T00:00:00.000Z",
-  "createdBy": "did:example:admin",
-  "id": 1,
-  "reason": "Y",
-  "resolvedReportIds": Array [
-    9,
-    8,
-  ],
-  "subject": Object {
-    "$type": "com.atproto.admin.defs#repoRef",
-    "did": "user(0)",
-  },
-  "subjectBlobCids": Array [],
-}
-`;
-
 exports[`moderation reporting creates reports of a record. 1`] = `
 Array [
   Object {

package/tests/admin/get-record.test.ts

@@ -1,10 +1,6 @@
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
-import {
-  ACKNOWLEDGE,
-  TAKEDOWN,
-} from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import {
   REASONOTHER,
   REASONSPAM,
@@ -24,6 +20,7 @@ describe('admin get record view', () => {
     agent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
+    await network.processAll()
   })
 
   afterAll(async () => {
@@ -31,8 +28,8 @@ describe('admin get record view', () => {
   })
 
   beforeAll(async () => {
-    const acknowledge = await sc.takeModerationAction({
-      action: ACKNOWLEDGE,
+    await sc.emitModerationEvent({
+      event: { $type: 'com.atproto.admin.defs#modEventFlag' },
       subject: {
         $type: 'com.atproto.repo.strongRef',
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
@@ -58,9 +55,8 @@ describe('admin get record view', () => {
         cid: sc.posts[sc.dids.alice][0].ref.cidStr,
       },
     })
-    await sc.reverseModerationAction({ id: acknowledge.id })
-    await sc.takeModerationAction({
-      action: TAKEDOWN,
+    await sc.emitModerationEvent({
+      event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
       subject: {
         $type: 'com.atproto.repo.strongRef',
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,