@atproto/ozone 0.1.57 → 0.1.59

package/tests/ack-all-subjects-of-account.test.ts

@@ -19,7 +19,7 @@ import {
 import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
 import { ComAtprotoRepoStrongRef } from '@atproto/api'
 
-describe('moderation', () => {
+describe('acknowledge all subjects of account', () => {
   let network: TestNetwork
   let sc: SeedClient
   let modClient: ModeratorClient
@@ -35,28 +35,28 @@ describe('moderation', () => {
     cid: ref.cidStr,
   })
 
-  beforeAll(async () => {
-    network = await TestNetwork.create({
-      dbPostgresSchema: 'ozone_ack_all_subjects_of_account',
+  const getReviewStateBySubject = (subjects: SubjectStatusView[]) => {
+    const states = new Map<string, SubjectStatusView>()
+
+    subjects.forEach((item) => {
+      if (ComAtprotoRepoStrongRef.isMain(item.subject)) {
+        states.set(item.subject.uri, item)
+      } else if (isRepoRef(item.subject)) {
+        states.set(item.subject.did, item)
+      }
     })
-    sc = network.getSeedClient()
-    modClient = network.ozone.getModClient()
-    await basicSeed(sc)
-    await network.processAll()
-  })
 
-  afterAll(async () => {
-    await network.close()
-  })
+    return states
+  }
 
-  it('acknowledges all open/escalated review subjects.', async () => {
-    const postOne = sc.posts[sc.dids.bob][0].ref
-    const postTwo = sc.posts[sc.dids.bob][1].ref
+  const reportUserAndPost = async (did: string) => {
+    const postOne = sc.posts[did][0].ref
+    const postTwo = sc.posts[did][1].ref
     await Promise.all([
       sc.createReport({
         reasonType: REASONSPAM,
-        subject: repoSubject(sc.dids.bob),
-        reportedBy: sc.dids.alice,
+        subject: repoSubject(did),
+        reportedBy: sc.dids.carol,
       }),
       sc.createReport({
         reasonType: REASONOTHER,
@@ -71,7 +71,6 @@ describe('moderation', () => {
         reportedBy: sc.dids.carol,
       }),
     ])
-
     await modClient.emitEvent({
       event: {
         $type: 'tools.ozone.moderation.defs#modEventReport',
@@ -80,6 +79,26 @@ describe('moderation', () => {
       subject: recordSubject(postTwo),
     })
 
+    return { postOne, postTwo }
+  }
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_ack_all_subjects_of_account',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('acknowledges all open/escalated review subjects with takedown.', async () => {
+    const { postOne, postTwo } = await reportUserAndPost(sc.dids.bob)
+
     const { subjectStatuses: statusesBefore } = await modClient.queryStatuses({
       subject: sc.dids.bob,
       includeAllUserRecords: true,
@@ -95,19 +114,46 @@ describe('moderation', () => {
       includeAllUserRecords: true,
     })
 
-    const getReviewStateBySubject = (subjects: SubjectStatusView[]) => {
-      const states = new Map<string, SubjectStatusView>()
+    const reviewStatesBefore = getReviewStateBySubject(statusesBefore)
+    const reviewStatesAfter = getReviewStateBySubject(statusesAfter)
 
-      subjects.forEach((item) => {
-        if (ComAtprotoRepoStrongRef.isMain(item.subject)) {
-          states.set(item.subject.uri, item)
-        } else if (isRepoRef(item.subject)) {
-          states.set(item.subject.did, item)
-        }
-      })
+    // Check that review states before were different for different subjects
+    expect(reviewStatesBefore.get(postOne.uriStr)?.reviewState).toBe(REVIEWOPEN)
+    expect(reviewStatesBefore.get(postTwo.uriStr)?.reviewState).toBe(
+      REVIEWESCALATED,
+    )
+    expect(reviewStatesBefore.get(sc.dids.bob)?.reviewState).toBe(REVIEWOPEN)
+
+    // Check that review states after are all closed
+    expect(reviewStatesAfter.get(postOne.uriStr)?.reviewState).toBe(
+      REVIEWCLOSED,
+    )
+    expect(reviewStatesAfter.get(postTwo.uriStr)?.reviewState).toBe(
+      REVIEWCLOSED,
+    )
+    expect(reviewStatesAfter.get(sc.dids.bob)?.reviewState).toBe(REVIEWCLOSED)
+  })
 
-      return states
-    }
+  it('acknowledges all open/escalated review subjects with acknowledge.', async () => {
+    const { postOne, postTwo } = await reportUserAndPost(sc.dids.alice)
+
+    const { subjectStatuses: statusesBefore } = await modClient.queryStatuses({
+      subject: sc.dids.alice,
+      includeAllUserRecords: true,
+    })
+
+    await modClient.emitEvent({
+      subject: repoSubject(sc.dids.alice),
+      event: {
+        $type: 'tools.ozone.moderation.defs#modEventAcknowledge',
+        acknowledgeAccountSubjects: true,
+      },
+    })
+
+    const { subjectStatuses: statusesAfter } = await modClient.queryStatuses({
+      subject: sc.dids.alice,
+      includeAllUserRecords: true,
+    })
 
     const reviewStatesBefore = getReviewStateBySubject(statusesBefore)
     const reviewStatesAfter = getReviewStateBySubject(statusesAfter)
@@ -117,7 +163,7 @@ describe('moderation', () => {
     expect(reviewStatesBefore.get(postTwo.uriStr)?.reviewState).toBe(
       REVIEWESCALATED,
     )
-    expect(reviewStatesBefore.get(sc.dids.bob)?.reviewState).toBe(REVIEWOPEN)
+    expect(reviewStatesBefore.get(sc.dids.alice)?.reviewState).toBe(REVIEWOPEN)
 
     // Check that review states after are all closed
     expect(reviewStatesAfter.get(postOne.uriStr)?.reviewState).toBe(
@@ -126,6 +172,6 @@ describe('moderation', () => {
     expect(reviewStatesAfter.get(postTwo.uriStr)?.reviewState).toBe(
       REVIEWCLOSED,
     )
-    expect(reviewStatesAfter.get(sc.dids.bob)?.reviewState).toBe(REVIEWCLOSED)
+    expect(reviewStatesAfter.get(sc.dids.alice)?.reviewState).toBe(REVIEWCLOSED)
   })
 })

package/tests/get-profiles.test.ts

@@ -0,0 +1,71 @@
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import { ids } from '../src/lexicon/lexicons'
+
+describe('get profiles through ozone', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  const repoSubject = (did: string) => ({
+    $type: 'com.atproto.admin.defs#repoRef',
+    did,
+  })
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_get_profiles',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('allows getting profiles by dids for takendown accounts.', async () => {
+    const getProfiles = async (actors: string[]) => {
+      const { data } = await modClient.agent.app.bsky.actor.getProfiles(
+        { actors },
+        {
+          headers: await network.ozone.modHeaders(
+            'app.bsky.actor.getProfiles',
+            'admin',
+          ),
+        },
+      )
+
+      return data.profiles
+    }
+    const profilesBefore = await getProfiles([sc.dids.bob, sc.dids.carol])
+
+    await modClient.performTakedown({
+      subject: repoSubject(sc.dids.bob),
+    })
+
+    const profilesAfterFromOzone = await getProfiles([
+      sc.dids.bob,
+      sc.dids.carol,
+    ])
+
+    const appviewAgent = network.bsky.getClient()
+    const {
+      data: { profiles: profilesFromAppview },
+    } = await appviewAgent.app.bsky.actor.getProfiles({
+      actors: [sc.dids.bob, sc.dids.carol],
+    })
+
+    expect(profilesBefore.length).toEqual(profilesAfterFromOzone.length)
+    expect(
+      profilesAfterFromOzone.find((p) => p.did === sc.dids.bob),
+    ).toBeTruthy()
+    expect(profilesFromAppview.find((p) => p.did === sc.dids.bob)).toBeFalsy()
+  })
+})

package/tests/moderation-events.test.ts

@@ -224,6 +224,46 @@ describe('moderation-events', () => {
       expect(eventsWithComment.events.length).toEqual(10)
     })
 
+    it('returns events matching multiple keywords in comment', async () => {
+      await sc.createReport({
+        reasonType: REASONSPAM,
+        reason: 'november rain',
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.alice,
+        },
+        reportedBy: sc.dids.bob,
+      })
+      await sc.createReport({
+        reasonType: REASONSPAM,
+        reason: 'rainy days feel lazy',
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.alice,
+        },
+        reportedBy: sc.dids.bob,
+      })
+      const [eventsMatchingBothKeywords, unusedTrailingSeparator, extraSpaces] =
+        await Promise.all([
+          modClient.queryEvents({
+            hasComment: true,
+            comment: 'november||lazy',
+          }),
+          modClient.queryEvents({
+            hasComment: true,
+            comment: 'november||lazy||',
+          }),
+          modClient.queryEvents({
+            hasComment: true,
+            comment: '||november||lazy||  ',
+          }),
+        ])
+
+      expect(forSnapshot(eventsMatchingBothKeywords.events)).toMatchSnapshot()
+      expect(forSnapshot(unusedTrailingSeparator.events)).toMatchSnapshot()
+      expect(forSnapshot(extraSpaces.events)).toMatchSnapshot()
+    })
+
     it('returns events matching filter params for labels', async () => {
       const [negatedLabelEvent, createdLabelEvent] = await Promise.all([
         modClient.emitEvent({

package/tests/protected-tags.test.ts

@@ -145,6 +145,22 @@ describe('protected-tags', () => {
           },
         }),
       ).rejects.toThrow(/Can not manage tag vip/gi)
+
+      // Verify that since admins are configured to manage this tag, admin actions go through
+      const removeTag = await modClient.emitEvent(
+        {
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: sc.dids.bob,
+          },
+          event: {
+            $type: 'tools.ozone.moderation.defs#modEventTakedown',
+          },
+        },
+        'admin',
+      )
+
+      expect(removeTag.id).toBeTruthy()
     })
     it('only allows configured moderators to add/remove protected tags', async () => {
       await modClient.upsertSettingOption({

package/tsconfig.tests.tsbuildinfo

@@ -1 +1 @@
-{"root":["./tests/3p-labeler.test.ts","./tests/_util.ts","./tests/ack-all-subjects-of-account.test.ts","./tests/blob-divert.test.ts","./tests/communication-templates.test.ts","./tests/content-tagger.test.ts","./tests/db.test.ts","./tests/get-config.test.ts","./tests/get-lists.test.ts","./tests/get-record.test.ts","./tests/get-records.test.ts","./tests/get-repo.test.ts","./tests/get-repos.test.ts","./tests/get-starter-pack.test.ts","./tests/moderation-appeals.test.ts","./tests/moderation-events.test.ts","./tests/moderation-status-tags.test.ts","./tests/moderation-statuses.test.ts","./tests/moderation.test.ts","./tests/protected-tags.test.ts","./tests/query-labels.test.ts","./tests/record-and-account-events.test.ts","./tests/repo-search.test.ts","./tests/report-muting.test.ts","./tests/sequencer.test.ts","./tests/server.test.ts","./tests/sets.test.ts","./tests/settings.test.ts","./tests/team.test.ts"],"version":"5.6.3"}
+{"root":["./tests/3p-labeler.test.ts","./tests/_util.ts","./tests/ack-all-subjects-of-account.test.ts","./tests/blob-divert.test.ts","./tests/communication-templates.test.ts","./tests/content-tagger.test.ts","./tests/db.test.ts","./tests/get-config.test.ts","./tests/get-lists.test.ts","./tests/get-profiles.test.ts","./tests/get-record.test.ts","./tests/get-records.test.ts","./tests/get-repo.test.ts","./tests/get-repos.test.ts","./tests/get-starter-pack.test.ts","./tests/moderation-appeals.test.ts","./tests/moderation-events.test.ts","./tests/moderation-status-tags.test.ts","./tests/moderation-statuses.test.ts","./tests/moderation.test.ts","./tests/protected-tags.test.ts","./tests/query-labels.test.ts","./tests/record-and-account-events.test.ts","./tests/repo-search.test.ts","./tests/report-muting.test.ts","./tests/sequencer.test.ts","./tests/server.test.ts","./tests/sets.test.ts","./tests/settings.test.ts","./tests/team.test.ts"],"version":"5.6.3"}