@atproto/ozone 0.0.16 → 0.0.17-next.0

package/tests/moderation-status-tags.test.ts

@@ -1,32 +1,22 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import AtpAgent from '@atproto/api'
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
 import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
 
 describe('moderation-status-tags', () => {
   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 queryModerationStatuses = (statusQuery) =>
-    agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
-      headers: network.bsky.adminAuthHeaders('moderator'),
-    })
+  let modClient: ModeratorClient
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_moderation_status_tags',
     })
-    agent = network.ozone.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -41,25 +31,21 @@ describe('moderation-status-tags', () => {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids.bob,
       }
-      await emitModerationEvent({
+      await sc.createReport({
+        reasonType: REASONSPAM,
+        reason: 'X',
         subject: bobsAccount,
-        event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
-          comment: 'X',
-          reportType: REASONSPAM,
-        },
-        createdBy: sc.dids.alice,
+        reportedBy: sc.dids.alice,
       })
-      await emitModerationEvent({
+      await modClient.emitModerationEvent({
         subject: bobsAccount,
         event: {
           $type: 'com.atproto.admin.defs#modEventTag',
           add: ['interaction-churn'],
           remove: [],
         },
-        createdBy: sc.dids.alice,
       })
-      const { data: statusAfterInteractionTag } = await queryModerationStatuses(
+      const statusAfterInteractionTag = await modClient.queryModerationStatuses(
         {
           subject: bobsAccount.did,
         },
@@ -68,16 +54,15 @@ describe('moderation-status-tags', () => {
         'interaction-churn',
       )
 
-      await emitModerationEvent({
+      await modClient.emitModerationEvent({
         subject: bobsAccount,
         event: {
           $type: 'com.atproto.admin.defs#modEventTag',
           remove: ['interaction-churn'],
           add: ['follow-churn'],
         },
-        createdBy: sc.dids.alice,
       })
-      const { data: statusAfterFollowTag } = await queryModerationStatuses({
+      const statusAfterFollowTag = await modClient.queryModerationStatuses({
         subject: bobsAccount.did,
       })
 

package/tests/moderation-statuses.test.ts

@@ -1,6 +1,11 @@
 import assert from 'node:assert'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import AtpAgent, {
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import {
   ComAtprotoAdminDefs,
   ComAtprotoAdminQueryModerationStatuses,
 } from '@atproto/api'
@@ -9,24 +14,15 @@ import {
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
+import {
+  REVIEWOPEN,
+  REVIEWNONE,
+} from '../src/lexicon/types/com/atproto/admin/defs'
 
 describe('moderation-statuses', () => {
   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.ozone.adminAuthHeaders('moderator'),
-    })
-  }
-
-  const queryModerationStatuses = (statusQuery) =>
-    agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
-      headers: network.ozone.adminAuthHeaders('moderator'),
-    })
+  let modClient: ModeratorClient
 
   const seedEvents = async () => {
     const bobsAccount = {
@@ -49,25 +45,19 @@ describe('moderation-statuses', () => {
     }
 
     for (let i = 0; i < 4; i++) {
-      await emitModerationEvent({
-        event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
-          reportType: i % 2 ? REASONSPAM : REASONMISLEADING,
-          comment: 'X',
-        },
+      await sc.createReport({
+        reasonType: i % 2 ? REASONSPAM : REASONMISLEADING,
+        reason: 'X',
         //   Report bob's account by alice and vice versa
         subject: i % 2 ? bobsAccount : carlasAccount,
-        createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
+        reportedBy: i % 2 ? sc.dids.alice : sc.dids.bob,
       })
-      await emitModerationEvent({
-        event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
-          reportType: REASONSPAM,
-          comment: 'X',
-        },
+      await sc.createReport({
+        reasonType: REASONSPAM,
+        reason: 'X',
         //   Report bob's post by alice and vice versa
         subject: i % 2 ? bobsPost : alicesPost,
-        createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
+        reportedBy: i % 2 ? sc.dids.alice : sc.dids.bob,
       })
     }
   }
@@ -76,9 +66,8 @@ describe('moderation-statuses', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_moderation_statuses',
     })
-    agent = network.ozone.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()
     await seedEvents()
@@ -90,26 +79,26 @@ describe('moderation-statuses', () => {
 
   describe('query statuses', () => {
     it('returns statuses for subjects that received moderation events', async () => {
-      const response = await queryModerationStatuses({})
+      const response = await modClient.queryModerationStatuses({})
 
-      expect(forSnapshot(response.data.subjectStatuses)).toMatchSnapshot()
+      expect(forSnapshot(response.subjectStatuses)).toMatchSnapshot()
     })
 
     it('returns statuses filtered by subject language', async () => {
-      const klingonQueue = await queryModerationStatuses({
+      const klingonQueue = await modClient.queryModerationStatuses({
         tags: ['lang:i'],
       })
 
-      expect(forSnapshot(klingonQueue.data.subjectStatuses)).toMatchSnapshot()
+      expect(forSnapshot(klingonQueue.subjectStatuses)).toMatchSnapshot()
 
-      const nonKlingonQueue = await queryModerationStatuses({
+      const nonKlingonQueue = await modClient.queryModerationStatuses({
         excludeTags: ['lang:i'],
       })
 
       // Verify that the klingon tagged subject is not returned when excluding klingon
-      expect(
-        nonKlingonQueue.data.subjectStatuses.map((s) => s.id),
-      ).not.toContain(klingonQueue.data.subjectStatuses[0].id)
+      expect(nonKlingonQueue.subjectStatuses.map((s) => s.id)).not.toContain(
+        klingonQueue.subjectStatuses[0].id,
+      )
     })
 
     it('returns paginated statuses', async () => {
@@ -121,13 +110,13 @@ describe('moderation-statuses', () => {
         const statuses: ComAtprotoAdminDefs.SubjectStatusView[] = []
         let count = 0
         do {
-          const results = await queryModerationStatuses({
+          const results = await modClient.queryModerationStatuses({
             limit: 1,
             cursor,
             ...params,
           })
-          cursor = results.data.cursor
-          statuses.push(...results.data.subjectStatuses)
+          cursor = results.cursor
+          statuses.push(...results.subjectStatuses)
           count++
           // The count is just a brake-check to prevent infinite loop
         } while (cursor && count < 10)
@@ -139,13 +128,12 @@ describe('moderation-statuses', () => {
       expect(list[0].id).toEqual(7)
       expect(list[list.length - 1].id).toEqual(1)
 
-      await emitModerationEvent({
+      await modClient.emitModerationEvent({
         subject: list[1].subject,
         event: {
           $type: 'com.atproto.admin.defs#modEventAcknowledge',
           comment: 'X',
         },
-        createdBy: sc.dids.bob,
       })
 
       const listReviewedFirst = await getPaginatedStatuses({
@@ -160,11 +148,95 @@ describe('moderation-statuses', () => {
     })
   })
 
+  describe('reviewState changes', () => {
+    it('only sets state to #reviewNone on first non-impactful event', async () => {
+      const bobsAccount = {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.bob,
+      }
+      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,
+      }
+      const getBobsAccountStatus = async () => {
+        const data = await modClient.queryModerationStatuses({
+          subject: bobsAccount.did,
+        })
+
+        return data.subjectStatuses[0]
+      }
+      // Since bob's account already had a reviewState, it won't be changed by non-impactful events
+      const bobsAccountStatusBeforeTag = await getBobsAccountStatus()
+
+      await Promise.all([
+        modClient.emitModerationEvent({
+          subject: bobsAccount,
+          event: {
+            $type: 'com.atproto.admin.defs#modEventTag',
+            add: ['newTag'],
+            remove: [],
+            comment: 'X',
+          },
+          createdBy: sc.dids.alice,
+        }),
+        modClient.emitModerationEvent({
+          subject: bobsAccount,
+          event: {
+            $type: 'com.atproto.admin.defs#modEventComment',
+            comment: 'X',
+          },
+          createdBy: sc.dids.alice,
+        }),
+      ])
+      const bobsAccountStatusAfterTag = await getBobsAccountStatus()
+
+      expect(bobsAccountStatusBeforeTag.reviewState).toEqual(
+        bobsAccountStatusAfterTag.reviewState,
+      )
+
+      // Since alice's post didn't have a reviewState it is set to reviewNone on first non-impactful event
+      const getAlicesPostStatus = async () => {
+        const data = await modClient.queryModerationStatuses({
+          subject: alicesPost.uri,
+        })
+
+        return data.subjectStatuses[0]
+      }
+
+      const alicesPostStatusBeforeTag = await getAlicesPostStatus()
+      expect(alicesPostStatusBeforeTag).toBeUndefined()
+
+      await modClient.emitModerationEvent({
+        subject: alicesPost,
+        event: {
+          $type: 'com.atproto.admin.defs#modEventComment',
+          comment: 'X',
+        },
+        createdBy: sc.dids.alice,
+      })
+      const alicesPostStatusAfterTag = await getAlicesPostStatus()
+      expect(alicesPostStatusAfterTag.reviewState).toEqual(REVIEWNONE)
+
+      await modClient.emitModerationEvent({
+        subject: alicesPost,
+        event: {
+          $type: 'com.atproto.admin.defs#modEventReport',
+          reportType: REASONMISLEADING,
+          comment: 'X',
+        },
+        createdBy: sc.dids.alice,
+      })
+      const alicesPostStatusAfterReport = await getAlicesPostStatus()
+      expect(alicesPostStatusAfterReport.reviewState).toEqual(REVIEWOPEN)
+    })
+  })
+
   describe('blobs', () => {
     it('are tracked on takendown subject', async () => {
       const post = sc.posts[sc.dids.carol][0]
       assert(post.images.length > 1)
-      await emitModerationEvent({
+      await modClient.emitModerationEvent({
         event: {
           $type: 'com.atproto.admin.defs#modEventTakedown',
         },
@@ -176,11 +248,9 @@ describe('moderation-statuses', () => {
         subjectBlobCids: [post.images[0].image.ref.toString()],
         createdBy: sc.dids.alice,
       })
-      const { data: result } =
-        await pdsAgent.api.com.atproto.admin.queryModerationStatuses(
-          { subject: post.ref.uriStr },
-          { headers: network.ozone.adminAuthHeaders('moderator') },
-        )
+      const result = await modClient.queryModerationStatuses({
+        subject: post.ref.uriStr,
+      })
       expect(result.subjectStatuses.length).toBe(1)
       expect(result.subjectStatuses[0]).toMatchObject({
         takendown: true,
@@ -190,7 +260,7 @@ describe('moderation-statuses', () => {
 
     it('are tracked on reverse-takendown subject based on previous status', async () => {
       const post = sc.posts[sc.dids.carol][0]
-      await emitModerationEvent({
+      await modClient.emitModerationEvent({
         event: {
           $type: 'com.atproto.admin.defs#modEventReverseTakedown',
         },
@@ -199,13 +269,10 @@ describe('moderation-statuses', () => {
           uri: post.ref.uriStr,
           cid: post.ref.cidStr,
         },
-        createdBy: sc.dids.alice,
       })
-      const { data: result } =
-        await pdsAgent.api.com.atproto.admin.queryModerationStatuses(
-          { subject: post.ref.uriStr },
-          { headers: network.ozone.adminAuthHeaders('moderator') },
-        )
+      const result = await modClient.queryModerationStatuses({
+        subject: post.ref.uriStr,
+      })
       expect(result.subjectStatuses.length).toBe(1)
       expect(result.subjectStatuses[0]).toMatchObject({
         takendown: false,