@atproto/bsky 0.0.15 → 0.0.16

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,

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

@@ -1,9 +1,5 @@
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
-import {
-  ACKNOWLEDGE,
-  TAKEDOWN,
-} from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import {
   REASONOTHER,
   REASONSPAM,
@@ -23,6 +19,7 @@ describe('admin get repo view', () => {
     agent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
+    await network.processAll()
   })
 
   afterAll(async () => {
@@ -30,8 +27,8 @@ describe('admin get repo view', () => {
   })
 
   beforeAll(async () => {
-    const acknowledge = await sc.takeModerationAction({
-      action: ACKNOWLEDGE,
+    await sc.emitModerationEvent({
+      event: { $type: 'com.atproto.admin.defs#modEventAcknowledge' },
       subject: {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids.alice,
@@ -54,9 +51,8 @@ describe('admin get repo view', () => {
         did: sc.dids.alice,
       },
     })
-    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.admin.defs#repoRef',
         did: sc.dids.alice,

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

@@ -0,0 +1,221 @@
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
+import AtpAgent, { ComAtprotoAdminDefs } from '@atproto/api'
+import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
+import {
+  REASONMISLEADING,
+  REASONSPAM,
+} from '../../src/lexicon/types/com/atproto/moderation/defs'
+
+describe('moderation-events', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let pdsAgent: AtpAgent
+  let sc: SeedClient
+
+  const emitModerationEvent = async (eventData) => {
+    return pdsAgent.api.com.atproto.admin.emitModerationEvent(eventData, {
+      encoding: 'application/json',
+      headers: network.bsky.adminAuthHeaders('moderator'),
+    })
+  }
+
+  const queryModerationEvents = (eventQuery) =>
+    agent.api.com.atproto.admin.queryModerationEvents(eventQuery, {
+      headers: network.bsky.adminAuthHeaders('moderator'),
+    })
+
+  const seedEvents = async () => {
+    const bobsAccount = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.bob,
+    }
+    const alicesAccount = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.alice,
+    }
+    const bobsPost = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][0].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][0].ref.cidStr,
+    }
+    const alicesPost = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+    }
+
+    for (let i = 0; i < 4; i++) {
+      await emitModerationEvent({
+        event: {
+          $type: 'com.atproto.admin.defs#modEventReport',
+          reportType: i % 2 ? REASONSPAM : REASONMISLEADING,
+          comment: 'X',
+        },
+        //   Report bob's account by alice and vice versa
+        subject: i % 2 ? bobsAccount : alicesAccount,
+        createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
+      })
+      await emitModerationEvent({
+        event: {
+          $type: 'com.atproto.admin.defs#modEventReport',
+          reportType: REASONSPAM,
+          comment: 'X',
+        },
+        //   Report bob's post by alice and vice versa
+        subject: i % 2 ? bobsPost : alicesPost,
+        createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
+      })
+    }
+  }
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'bsky_moderation_events',
+    })
+    agent = network.bsky.getClient()
+    pdsAgent = network.pds.getClient()
+    sc = network.getSeedClient()
+    await basicSeed(sc)
+    await network.processAll()
+    await seedEvents()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  describe('query events', () => {
+    it('returns all events for record or repo', async () => {
+      const [bobsEvents, alicesPostEvents] = await Promise.all([
+        queryModerationEvents({
+          subject: sc.dids.bob,
+        }),
+        queryModerationEvents({
+          subject: sc.posts[sc.dids.alice][0].ref.uriStr,
+        }),
+      ])
+
+      expect(forSnapshot(bobsEvents.data.events)).toMatchSnapshot()
+      expect(forSnapshot(alicesPostEvents.data.events)).toMatchSnapshot()
+    })
+
+    it('filters events by types', async () => {
+      const alicesAccount = {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      }
+      await Promise.all([
+        emitModerationEvent({
+          event: {
+            $type: 'com.atproto.admin.defs#modEventComment',
+            comment: 'X',
+          },
+          subject: alicesAccount,
+          createdBy: 'did:plc:moderator',
+        }),
+        emitModerationEvent({
+          event: {
+            $type: 'com.atproto.admin.defs#modEventEscalate',
+            comment: 'X',
+          },
+          subject: alicesAccount,
+          createdBy: 'did:plc:moderator',
+        }),
+      ])
+      const [allEvents, reportEvents] = await Promise.all([
+        queryModerationEvents({
+          subject: sc.dids.alice,
+        }),
+        queryModerationEvents({
+          subject: sc.dids.alice,
+          types: ['com.atproto.admin.defs#modEventReport'],
+        }),
+      ])
+
+      expect(allEvents.data.events.length).toBeGreaterThan(
+        reportEvents.data.events.length,
+      )
+      expect(
+        [...new Set(reportEvents.data.events.map((e) => e.event.$type))].length,
+      ).toEqual(1)
+
+      expect(
+        [...new Set(allEvents.data.events.map((e) => e.event.$type))].length,
+      ).toEqual(3)
+    })
+
+    it('returns events for all content by user', async () => {
+      const [forAccount, forPost] = await Promise.all([
+        queryModerationEvents({
+          subject: sc.dids.bob,
+          includeAllUserRecords: true,
+        }),
+        queryModerationEvents({
+          subject: sc.posts[sc.dids.bob][0].ref.uriStr,
+          includeAllUserRecords: true,
+        }),
+      ])
+
+      expect(forAccount.data.events.length).toEqual(forPost.data.events.length)
+      // Save events are returned from both requests
+      expect(forPost.data.events.map(({ id }) => id).sort()).toEqual(
+        forAccount.data.events.map(({ id }) => id).sort(),
+      )
+    })
+
+    it('returns paginated list of events with cursor', async () => {
+      const allEvents = await queryModerationEvents({
+        subject: sc.dids.bob,
+        includeAllUserRecords: true,
+      })
+
+      const getPaginatedEvents = async (
+        sortDirection: 'asc' | 'desc' = 'desc',
+      ) => {
+        let defaultCursor: undefined | string = undefined
+        const events: ComAtprotoAdminDefs.ModEventView[] = []
+        let count = 0
+        do {
+          // get 1 event at a time and check we get all events
+          const { data } = await queryModerationEvents({
+            limit: 1,
+            subject: sc.dids.bob,
+            includeAllUserRecords: true,
+            cursor: defaultCursor,
+            sortDirection,
+          })
+          events.push(...data.events)
+          defaultCursor = data.cursor
+          count++
+          // The count is a circuit breaker to prevent infinite loop in case of failing test
+        } while (defaultCursor && count < 10)
+
+        return events
+      }
+
+      const defaultEvents = await getPaginatedEvents()
+      const reversedEvents = await getPaginatedEvents('asc')
+
+      expect(allEvents.data.events.length).toEqual(4)
+      expect(defaultEvents.length).toEqual(allEvents.data.events.length)
+      expect(reversedEvents.length).toEqual(allEvents.data.events.length)
+      expect(reversedEvents[0].id).toEqual(defaultEvents[3].id)
+    })
+  })
+
+  describe('get event', () => {
+    it('gets an event by specific id', async () => {
+      const { data } = await pdsAgent.api.com.atproto.admin.getModerationEvent(
+        {
+          id: 1,
+        },
+        {
+          headers: network.bsky.adminAuthHeaders('moderator'),
+        },
+      )
+
+      expect(forSnapshot(data)).toMatchSnapshot()
+    })
+  })
+})