@atproto/ozone 0.0.16 → 0.0.17-next.1

package/tests/communication-templates.test.ts

@@ -27,37 +27,34 @@ describe('communication-templates', () => {
   }
 
   const listTemplates = async () => {
-    const { data } =
-      await agent.api.com.atproto.admin.listCommunicationTemplates(
-        {},
-        {
-          headers: network.ozone.adminAuthHeaders('moderator'),
-        },
-      )
+    const { data } = await agent.api.tools.ozone.communication.listTemplates(
+      {},
+      {
+        headers: await network.ozone.modHeaders('moderator'),
+      },
+    )
     return data.communicationTemplates
   }
 
   describe('create templates', () => {
     it('only allows admins to create new templates', async () => {
-      const moderatorReq =
-        agent.api.com.atproto.admin.createCommunicationTemplate(
-          { ...templateOne, createdBy: sc.dids.bob },
-          {
-            encoding: 'application/json',
-            headers: network.ozone.adminAuthHeaders('moderator'),
-          },
-        )
+      const moderatorReq = agent.api.tools.ozone.communication.createTemplate(
+        { ...templateOne, createdBy: sc.dids.bob },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('moderator'),
+        },
+      )
       await expect(moderatorReq).rejects.toThrow(
         'Must be an admin to create a communication template',
       )
-      const modReq =
-        await agent.api.com.atproto.admin.createCommunicationTemplate(
-          { ...templateOne, createdBy: sc.dids.bob },
-          {
-            encoding: 'application/json',
-            headers: network.ozone.adminAuthHeaders('admin'),
-          },
-        )
+      const modReq = await agent.api.tools.ozone.communication.createTemplate(
+        { ...templateOne, createdBy: sc.dids.bob },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('admin'),
+        },
+      )
 
       expect(modReq.data).toMatchObject({
         ...templateOne,
@@ -75,11 +72,11 @@ describe('communication-templates', () => {
         ...templateOne,
         name: 'Test template 2',
       }
-      await agent.api.com.atproto.admin.createCommunicationTemplate(
+      await agent.api.tools.ozone.communication.createTemplate(
         { ...templateTwo, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
-          headers: network.ozone.adminAuthHeaders('admin'),
+          headers: await network.ozone.modHeaders('admin'),
         },
       )
 
@@ -90,14 +87,13 @@ describe('communication-templates', () => {
   })
   describe('update template', () => {
     it('allows moderators to update a template by id', async () => {
-      const { data } =
-        await agent.api.com.atproto.admin.updateCommunicationTemplate(
-          { id: '1', updatedBy: sc.dids.bob, name: '1 Test template' },
-          {
-            encoding: 'application/json',
-            headers: network.ozone.adminAuthHeaders('admin'),
-          },
-        )
+      const { data } = await agent.api.tools.ozone.communication.updateTemplate(
+        { id: '1', updatedBy: sc.dids.bob, name: '1 Test template' },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('admin'),
+        },
+      )
 
       expect(data.name).not.toEqual(templateOne.name)
       expect(data.name).toEqual('1 Test template')
@@ -105,11 +101,11 @@ describe('communication-templates', () => {
   })
   describe('delete template', () => {
     it('allows admins to remove a template by id', async () => {
-      const modReq = agent.api.com.atproto.admin.deleteCommunicationTemplate(
+      const modReq = agent.api.tools.ozone.communication.deleteTemplate(
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: network.ozone.adminAuthHeaders('moderator'),
+          headers: await network.ozone.modHeaders('moderator'),
         },
       )
 
@@ -117,11 +113,11 @@ describe('communication-templates', () => {
         'Must be an admin to delete a communication template',
       )
 
-      await agent.api.com.atproto.admin.deleteCommunicationTemplate(
+      await agent.api.tools.ozone.communication.deleteTemplate(
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: network.ozone.adminAuthHeaders('admin'),
+          headers: await network.ozone.modHeaders('admin'),
         },
       )
       const list = await listTemplates()

package/tests/db.test.ts

@@ -48,7 +48,7 @@ describe('db', () => {
         return await dbTxn.db
           .insertInto('repo_push_event')
           .values({
-            eventType: 'takedown',
+            eventType: 'pds_takedown',
             subjectDid: 'x',
           })
           .returning('subjectDid')
@@ -68,7 +68,7 @@ describe('db', () => {
         .executeTakeFirst()
 
       expect(row).toMatchObject({
-        eventType: 'takedown',
+        eventType: 'pds_takedown',
         subjectDid: 'x',
       })
     })
@@ -78,7 +78,7 @@ describe('db', () => {
         await dbTxn.db
           .insertInto('repo_push_event')
           .values({
-            eventType: 'takedown',
+            eventType: 'pds_takedown',
             subjectDid: 'y',
           })
           .returning('subjectDid')
@@ -124,7 +124,7 @@ describe('db', () => {
         leakedTx = dbTxn
         await dbTxn.db
           .insertInto('repo_push_event')
-          .values({ eventType: 'takedown', subjectDid: 'a' })
+          .values({ eventType: 'pds_takedown', subjectDid: 'a' })
           .execute()
         throw new Error('test tx failed')
       })
@@ -132,7 +132,7 @@ describe('db', () => {
 
       const attempt = leakedTx?.db
         .insertInto('repo_push_event')
-        .values({ eventType: 'takedown', subjectDid: 'b' })
+        .values({ eventType: 'pds_takedown', subjectDid: 'b' })
         .execute()
       await expect(attempt).rejects.toThrow('tx already failed')
 
@@ -156,7 +156,7 @@ describe('db', () => {
             const query = dbTxn.db
               .insertInto('repo_push_event')
               .values({
-                eventType: 'takedown',
+                eventType: 'pds_takedown',
                 subjectDid: name,
               })
               .execute()

package/tests/get-record.test.ts

@@ -1,4 +1,10 @@
-import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import {
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+  TestOzone,
+  ModeratorClient,
+} from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
 import {
@@ -9,15 +15,19 @@ import { forSnapshot } from './_util'
 
 describe('admin get record view', () => {
   let network: TestNetwork
+  let ozone: TestOzone
   let agent: AtpAgent
   let sc: SeedClient
+  let modClient: ModeratorClient
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_admin_get_record',
     })
-    agent = network.pds.getClient()
+    ozone = network.ozone
+    agent = ozone.getClient()
     sc = network.getSeedClient()
+    modClient = ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -46,8 +56,8 @@ describe('admin get record view', () => {
         cid: sc.posts[sc.dids.alice][0].ref.cidStr,
       },
     })
-    await sc.emitModerationEvent({
-      event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventTakedown' },
       subject: {
         $type: 'com.atproto.repo.strongRef',
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
@@ -57,26 +67,26 @@ describe('admin get record view', () => {
   })
 
   it('gets a record by uri, even when taken down.', async () => {
-    const result = await agent.api.com.atproto.admin.getRecord(
+    const result = await agent.api.tools.ozone.moderation.getRecord(
       { uri: sc.posts[sc.dids.alice][0].ref.uriStr },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     expect(forSnapshot(result.data)).toMatchSnapshot()
   })
 
   it('gets a record by uri and cid.', async () => {
-    const result = await agent.api.com.atproto.admin.getRecord(
+    const result = await agent.api.tools.ozone.moderation.getRecord(
       {
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
         cid: sc.posts[sc.dids.alice][0].ref.cidStr,
       },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     expect(forSnapshot(result.data)).toMatchSnapshot()
   })
 
   it('fails when record does not exist.', async () => {
-    const promise = agent.api.com.atproto.admin.getRecord(
+    const promise = agent.api.tools.ozone.moderation.getRecord(
       {
         uri: AtUri.make(
           sc.dids.alice,
@@ -84,18 +94,18 @@ describe('admin get record view', () => {
           'badrkey',
         ).toString(),
       },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     await expect(promise).rejects.toThrow('Record not found')
   })
 
   it('fails when record cid does not exist.', async () => {
-    const promise = agent.api.com.atproto.admin.getRecord(
+    const promise = agent.api.tools.ozone.moderation.getRecord(
       {
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
         cid: sc.posts[sc.dids.alice][1].ref.cidStr, // Mismatching cid
       },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     await expect(promise).rejects.toThrow('Record not found')
   })

package/tests/get-repo.test.ts

@@ -1,4 +1,10 @@
-import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import {
+  SeedClient,
+  TestNetwork,
+  TestOzone,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
 import {
   REASONOTHER,
@@ -8,15 +14,21 @@ import { forSnapshot } from './_util'
 
 describe('admin get repo view', () => {
   let network: TestNetwork
+  let ozone: TestOzone
   let agent: AtpAgent
+  let pdsAgent: AtpAgent
   let sc: SeedClient
+  let modClient: ModeratorClient
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_admin_get_repo',
     })
-    agent = network.pds.getClient()
+    ozone = network.ozone
+    agent = ozone.getClient()
+    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
+    modClient = ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -26,8 +38,8 @@ describe('admin get repo view', () => {
   })
 
   beforeAll(async () => {
-    await sc.emitModerationEvent({
-      event: { $type: 'com.atproto.admin.defs#modEventAcknowledge' },
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventAcknowledge' },
       subject: {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids.alice,
@@ -50,8 +62,8 @@ describe('admin get repo view', () => {
         did: sc.dids.alice,
       },
     })
-    await sc.emitModerationEvent({
-      event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventTakedown' },
       subject: {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids.alice,
@@ -60,25 +72,25 @@ describe('admin get repo view', () => {
   })
 
   it('gets a repo by did, even when taken down.', async () => {
-    const result = await agent.api.com.atproto.admin.getRepo(
+    const result = await agent.api.tools.ozone.moderation.getRepo(
       { did: sc.dids.alice },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     expect(forSnapshot(result.data)).toMatchSnapshot()
   })
 
   it('does not include account emails for triage mods.', async () => {
-    const { data: admin } = await agent.api.com.atproto.admin.getRepo(
+    const { data: admin } = await agent.api.tools.ozone.moderation.getRepo(
       { did: sc.dids.bob },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
-    const { data: moderator } = await agent.api.com.atproto.admin.getRepo(
+    const { data: moderator } = await agent.api.tools.ozone.moderation.getRepo(
       { did: sc.dids.bob },
-      { headers: network.pds.adminAuthHeaders('moderator') },
+      { headers: await ozone.modHeaders('moderator') },
     )
-    const { data: triage } = await agent.api.com.atproto.admin.getRepo(
+    const { data: triage } = await agent.api.tools.ozone.moderation.getRepo(
       { did: sc.dids.bob },
-      { headers: network.pds.adminAuthHeaders('triage') },
+      { headers: await ozone.modHeaders('triage') },
     )
     expect(admin.email).toEqual('bob@test.com')
     expect(moderator.email).toEqual('bob@test.com')
@@ -88,9 +100,9 @@ describe('admin get repo view', () => {
 
   it('includes emailConfirmedAt timestamp', async () => {
     const { data: beforeEmailVerification } =
-      await agent.api.com.atproto.admin.getRepo(
+      await agent.api.tools.ozone.moderation.getRepo(
         { did: sc.dids.bob },
-        { headers: network.pds.adminAuthHeaders() },
+        { headers: await ozone.modHeaders() },
       )
 
     expect(beforeEmailVerification.emailConfirmedAt).toBeUndefined()
@@ -101,7 +113,7 @@ describe('admin get repo view', () => {
         sc.dids.bob,
         'confirm_email',
       )
-    await agent.api.com.atproto.server.confirmEmail(
+    await pdsAgent.api.com.atproto.server.confirmEmail(
       { email: bobsAccount.email, token: verificationToken },
       {
         encoding: 'application/json',
@@ -110,9 +122,9 @@ describe('admin get repo view', () => {
       },
     )
     const { data: afterEmailVerification } =
-      await agent.api.com.atproto.admin.getRepo(
+      await agent.api.tools.ozone.moderation.getRepo(
         { did: sc.dids.bob },
-        { headers: network.pds.adminAuthHeaders() },
+        { headers: await ozone.modHeaders() },
       )
 
     expect(afterEmailVerification.emailConfirmedAt).toBeTruthy()
@@ -122,9 +134,9 @@ describe('admin get repo view', () => {
   })
 
   it('fails when repo does not exist.', async () => {
-    const promise = agent.api.com.atproto.admin.getRepo(
+    const promise = agent.api.tools.ozone.moderation.getRepo(
       { did: 'did:plc:doesnotexist' },
-      { headers: network.pds.adminAuthHeaders() },
+      { headers: await ozone.modHeaders() },
     )
     await expect(promise).rejects.toThrow('Repo not found')
   })

package/tests/moderation-appeals.test.ts

@@ -1,49 +1,32 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import AtpAgent, {
-  ComAtprotoAdminDefs,
-  ComAtprotoAdminEmitModerationEvent,
-  ComAtprotoAdminQueryModerationStatuses,
-} from '@atproto/api'
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import {
   REASONMISLEADING,
   REASONSPAM,
+  REASONAPPEAL,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import {
   REVIEWCLOSED,
   REVIEWOPEN,
-} from '@atproto/api/src/client/types/com/atproto/admin/defs'
-import { REASONAPPEAL } from '@atproto/api/src/client/types/com/atproto/moderation/defs'
-import { REVIEWESCALATED } from '../src/lexicon/types/com/atproto/admin/defs'
+  REVIEWESCALATED,
+} from '@atproto/api/src/client/types/tools/ozone/moderation/defs'
 
 describe('moderation-appeals', () => {
   let network: TestNetwork
-  let agent: AtpAgent
-  let pdsAgent: AtpAgent
   let sc: SeedClient
-
-  const emitModerationEvent = async (
-    eventData: ComAtprotoAdminEmitModerationEvent.InputSchema,
-  ) => {
-    return pdsAgent.api.com.atproto.admin.emitModerationEvent(eventData, {
-      encoding: 'application/json',
-      headers: network.ozone.adminAuthHeaders('moderator'),
-    })
-  }
-
-  const queryModerationStatuses = (
-    statusQuery: ComAtprotoAdminQueryModerationStatuses.QueryParams,
-  ) =>
-    agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
-      headers: network.ozone.adminAuthHeaders('moderator'),
-    })
+  let modClient: ModeratorClient
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_moderation_appeals',
     })
-    agent = network.ozone.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -56,13 +39,13 @@ describe('moderation-appeals', () => {
     subject: string,
     status: string,
     appealed: boolean | undefined,
-  ): Promise<ComAtprotoAdminDefs.SubjectStatusView | undefined> => {
-    const { data } = await queryModerationStatuses({
+  ): Promise<ToolsOzoneModerationDefs.SubjectStatusView | undefined> => {
+    const res = await modClient.queryStatuses({
       subject,
     })
-    expect(data.subjectStatuses[0]?.reviewState).toEqual(status)
-    expect(data.subjectStatuses[0]?.appealed).toEqual(appealed)
-    return data.subjectStatuses[0]
+    expect(res.subjectStatuses[0]?.reviewState).toEqual(status)
+    expect(res.subjectStatuses[0]?.appealed).toEqual(appealed)
+    return res.subjectStatuses[0]
   }
 
   describe('appeals from users', () => {
@@ -83,13 +66,12 @@ describe('moderation-appeals', () => {
 
     it('only changes subject status if original author of the content or a moderator is appealing', async () => {
       // Create a report by alice
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONMISLEADING,
         },
         subject: getBobsPostSubject(),
-        createdBy: sc.dids.alice,
       })
 
       await assertBobsPostStatus(REVIEWOPEN, undefined)
@@ -108,13 +90,12 @@ describe('moderation-appeals', () => {
       await assertBobsPostStatus(REVIEWOPEN, undefined)
 
       // Emit report event as moderator
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONAPPEAL,
         },
         subject: getBobsPostSubject(),
-        createdBy: sc.dids.alice,
       })
 
       // Verify that appeal status changed when appeal report was emitted by moderator
@@ -151,23 +132,21 @@ describe('moderation-appeals', () => {
     })
     it('allows multiple appeals and updates last appealed timestamp', async () => {
       // Resolve appeal with acknowledge
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventResolveAppeal',
+          $type: 'tools.ozone.moderation.defs#modEventResolveAppeal',
         },
         subject: getBobsPostSubject(),
-        createdBy: sc.dids.carol,
       })
 
       const previousStatus = await assertBobsPostStatus(REVIEWESCALATED, false)
 
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONAPPEAL,
         },
         subject: getBobsPostSubject(),
-        createdBy: sc.dids.bob,
       })
 
       // Verify that even after the appeal event by bob for his post, the appeal status is true again with new timestamp
@@ -186,32 +165,29 @@ describe('moderation-appeals', () => {
     })
     it('appeal status is maintained while review state changes based on incoming events', async () => {
       // Bob reports alice's post
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONMISLEADING,
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.bob,
       })
 
       // Moderator acknowledges the report, assume a label was applied too
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventAcknowledge',
+          $type: 'tools.ozone.moderation.defs#modEventAcknowledge',
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.carol,
       })
 
       // Alice appeals the report
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONAPPEAL,
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.alice,
       })
 
       await assertSubjectStatus(
@@ -221,13 +197,12 @@ describe('moderation-appeals', () => {
       )
 
       // Bob reports it again
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONSPAM,
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.bob,
       })
 
       // Assert that the status is still REVIEWESCALATED, as report events are meant to do
@@ -238,12 +213,11 @@ describe('moderation-appeals', () => {
       )
 
       // Emit an escalation event
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventEscalate',
+          $type: 'tools.ozone.moderation.defs#modEventEscalate',
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.carol,
       })
 
       await assertSubjectStatus(
@@ -253,25 +227,23 @@ describe('moderation-appeals', () => {
       )
 
       // Emit an acknowledge event
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventAcknowledge',
+          $type: 'tools.ozone.moderation.defs#modEventAcknowledge',
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.carol,
       })
 
       // Assert that status moved on to reviewClosed while appealed status is still true
       await assertSubjectStatus(getAlicesPostSubject().uri, REVIEWCLOSED, true)
 
       // Emit a resolveAppeal event
-      await emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventResolveAppeal',
+          $type: 'tools.ozone.moderation.defs#modEventResolveAppeal',
           comment: 'lgtm',
         },
         subject: getAlicesPostSubject(),
-        createdBy: sc.dids.carol,
       })
 
       // Assert that status stayed the same while appealed status is still true