@atproto/bsky 0.0.15 → 0.0.17

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,
@@ -101,9 +97,11 @@ describe('admin get repo view', () => {
     expect(beforeEmailVerification.emailConfirmedAt).toBeUndefined()
     const timestampBeforeVerification = Date.now()
     const bobsAccount = sc.accounts[sc.dids.bob]
-    const verificationToken = await network.pds.ctx.services
-      .account(network.pds.ctx.db)
-      .createEmailToken(sc.dids.bob, 'confirm_email')
+    const verificationToken =
+      await network.pds.ctx.accountManager.createEmailToken(
+        sc.dids.bob,
+        'confirm_email',
+      )
     await agent.api.com.atproto.server.confirmEmail(
       { email: bobsAccount.email, token: verificationToken },
       {

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()
+    })
+  })
+})

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

@@ -0,0 +1,145 @@
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
+import AtpAgent, {
+  ComAtprotoAdminDefs,
+  ComAtprotoAdminQueryModerationStatuses,
+} 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-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.bsky.adminAuthHeaders('moderator'),
+    })
+  }
+
+  const queryModerationStatuses = (statusQuery) =>
+    agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
+      headers: network.bsky.adminAuthHeaders('moderator'),
+    })
+
+  const seedEvents = async () => {
+    const bobsAccount = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.bob,
+    }
+    const carlasAccount = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.alice,
+    }
+    const bobsPost = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][1].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][1].ref.cidStr,
+    }
+    const alicesPost = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.alice][1].ref.uriStr,
+      cid: sc.posts[sc.dids.alice][1].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 : carlasAccount,
+        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_statuses',
+    })
+    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 statuses', () => {
+    it('returns statuses for subjects that received moderation events', async () => {
+      const response = await queryModerationStatuses({})
+
+      expect(forSnapshot(response.data.subjectStatuses)).toMatchSnapshot()
+    })
+
+    it('returns paginated statuses', async () => {
+      // We know there will be exactly 4 statuses in db
+      const getPaginatedStatuses = async (
+        params: ComAtprotoAdminQueryModerationStatuses.QueryParams,
+      ) => {
+        let cursor: string | undefined = ''
+        const statuses: ComAtprotoAdminDefs.SubjectStatusView[] = []
+        let count = 0
+        do {
+          const results = await queryModerationStatuses({
+            limit: 1,
+            cursor,
+            ...params,
+          })
+          cursor = results.data.cursor
+          statuses.push(...results.data.subjectStatuses)
+          count++
+          // The count is just a brake-check to prevent infinite loop
+        } while (cursor && count < 10)
+
+        return statuses
+      }
+
+      const list = await getPaginatedStatuses({})
+      expect(list[0].id).toEqual(4)
+      expect(list[list.length - 1].id).toEqual(1)
+
+      await emitModerationEvent({
+        subject: list[1].subject,
+        event: {
+          $type: 'com.atproto.admin.defs#modEventAcknowledge',
+          comment: 'X',
+        },
+        createdBy: sc.dids.bob,
+      })
+
+      const listReviewedFirst = await getPaginatedStatuses({
+        sortDirection: 'desc',
+        sortField: 'lastReviewedAt',
+      })
+
+      // Verify that the item that was recently reviewed comes up first when sorted descendingly
+      // while the result set always contains same number of items regardless of sorting
+      expect(listReviewedFirst[0].id).toEqual(list[1].id)
+      expect(listReviewedFirst.length).toEqual(list.length)
+    })
+  })
+})