@atproto/ozone 0.1.79 → 0.1.81

package/tests/__snapshots__/team.test.ts.snap

@@ -348,341 +348,3 @@ Array [
   },
 ]
 `;
-
-exports[`team management listMembers allows all members to list all members 3`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;
-
-exports[`team management listMembers allows all members to list all members 4`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;

package/tests/get-reporter-stats.test.ts

@@ -0,0 +1,117 @@
+import {
+  ComAtprotoModerationDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+
+describe('reporter-stats', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_reporter_stats',
+      ozone: {
+        dbMaterializedViewRefreshIntervalMs: 1000,
+      },
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const getReporterStats = async (
+    did: string,
+  ): Promise<ToolsOzoneModerationDefs.ReporterStats | undefined> => {
+    const { stats } = await modClient.getReporterStats([did])
+    return stats[0]
+  }
+
+  it('updates reporter stats based on actions', async () => {
+    const bobsPostSubject = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][1].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][1].ref.cidStr,
+    }
+    const carolsAccountSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.carol,
+    }
+
+    await Promise.all([
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: bobsPostSubject,
+      }),
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONOTHER,
+        reason: 'test',
+        subject: bobsPostSubject,
+      }),
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: carolsAccountSubject,
+      }),
+    ])
+
+    await network.processAll()
+    const statsAfterReport = await getReporterStats(sc.dids.alice)
+    expect(statsAfterReport).toMatchObject({
+      did: sc.dids.alice,
+      accountReportCount: 1,
+      recordReportCount: 2,
+      reportedAccountCount: 1,
+      reportedRecordCount: 1,
+      takendownAccountCount: 0,
+      takendownRecordCount: 0,
+      labeledAccountCount: 0,
+      labeledRecordCount: 0,
+    })
+
+    await Promise.all([
+      modClient.performTakedown({
+        subject: bobsPostSubject,
+        policies: ['trolling'],
+      }),
+      modClient.emitEvent({
+        subject: carolsAccountSubject,
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventLabel',
+          createLabelVals: ['spam'],
+          negateLabelVals: [],
+        },
+      }),
+    ])
+
+    await network.processAll()
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+    const statsAfterAction = await getReporterStats(sc.dids.alice)
+    expect(statsAfterAction).toMatchObject({
+      did: sc.dids.alice,
+      accountReportCount: 1,
+      recordReportCount: 2,
+      reportedAccountCount: 1,
+      reportedRecordCount: 1,
+      takendownAccountCount: 0,
+      takendownRecordCount: 1,
+      labeledAccountCount: 1,
+      labeledRecordCount: 0,
+    })
+  })
+})

package/tests/team.test.ts

@@ -1,4 +1,4 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ToolsOzoneTeamDefs } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
 
@@ -38,8 +38,8 @@ describe('team management', () => {
   describe('listMembers', () => {
     it('allows all members to list all members', async () => {
       const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+        adminAgent.tools.ozone.team.listMembers({}),
+        triageAgent.tools.ozone.team.listMembers({}),
       ])
       expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
       expect(forSnapshot(forTriage.members)).toMatchSnapshot()
@@ -47,20 +47,50 @@ describe('team management', () => {
 
       expect(forAdmin.members.length).toEqual(forTriage.members.length)
     })
-  })
-  describe('listMembers', () => {
-    it('allows all members to list all members', async () => {
-      const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+    it('allows filtering members by role', async () => {
+      const [{ data: onlyAdmins }, { data: onlyTriage }] = await Promise.all([
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLEADMIN],
+        }),
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLETRIAGE],
+        }),
       ])
-      expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
-      expect(forSnapshot(forTriage.members)).toMatchSnapshot()
-      // Validate that the list looks the same to both admin and triage members
 
-      expect(forAdmin.members.length).toEqual(forTriage.members.length)
+      expect(
+        onlyAdmins.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLEADMIN,
+        ),
+      ).toBeUndefined()
+
+      expect(
+        onlyTriage.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLETRIAGE,
+        ),
+      ).toBeUndefined()
+    })
+    it('allows filtering members by disabled status', async () => {
+      const [{ data: onlyDisabled }, { data: onlyEnabled }] = await Promise.all(
+        [
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: true,
+          }),
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: false,
+          }),
+        ],
+      )
+
+      expect(
+        onlyDisabled.members.find(({ disabled }) => !disabled),
+      ).toBeUndefined()
+
+      expect(
+        onlyEnabled.members.find(({ disabled }) => disabled),
+      ).toBeUndefined()
     })
   })
+
   describe('addMember', () => {
     const newMemberData = {
       did: 'did:plc:newMember',
@@ -69,15 +99,15 @@ describe('team management', () => {
     }
     it('only allows admins to add member', async () => {
       await expect(
-        triageAgent.api.tools.ozone.team.addMember(newMemberData),
+        triageAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('Must be an admin to add a member')
       const { data: newMember } =
-        await adminAgent.api.tools.ozone.team.addMember(newMemberData)
+        await adminAgent.tools.ozone.team.addMember(newMemberData)
       expect(forSnapshot(newMember)).toMatchSnapshot()
     })
     it('throws error when trying to add existing member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.addMember(newMemberData),
+        adminAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('member already exists')
     })
   })
@@ -85,19 +115,19 @@ describe('team management', () => {
     it('only allows admins to delete members', async () => {
       const {
         data: { members: initialMembers },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
       await expect(
-        triageAgent.api.tools.ozone.team.deleteMember({
+        triageAgent.tools.ozone.team.deleteMember({
           did: sc.dids.bob,
         }),
       ).rejects.toThrow('Must be an admin to delete a member')
 
-      await adminAgent.api.tools.ozone.team.deleteMember({
+      await adminAgent.tools.ozone.team.deleteMember({
         did: sc.dids.bob,
       })
       const {
         data: { members: membersAfterDelete },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
 
       expect(membersAfterDelete.length).toEqual(initialMembers.length - 1)
       expect(membersAfterDelete.map(({ did }) => did)).not.toContain(
@@ -107,7 +137,7 @@ describe('team management', () => {
 
     it('throws error when trying to remove non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.deleteMember({
+        adminAgent.tools.ozone.team.deleteMember({
           did: 'did:plc:test',
         }),
       ).rejects.toThrow('member not found')
@@ -118,19 +148,19 @@ describe('team management', () => {
       const getCarol = async () => {
         const {
           data: { members },
-        } = await adminAgent.api.tools.ozone.team.listMembers({})
+        } = await adminAgent.tools.ozone.team.listMembers({})
 
         return members.find(({ did }) => did === sc.dids.carol)
       }
       await expect(
-        triageAgent.api.tools.ozone.team.updateMember({
+        triageAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: sc.dids.carol,
           role: 'tools.ozone.team.defs#roleAdmin',
         }),
       ).rejects.toThrow('Must be an admin to update a member')
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         role: 'tools.ozone.team.defs#roleAdmin',
       })
@@ -141,7 +171,7 @@ describe('team management', () => {
       // Verify that params that we didn't send did not get updated
       expect(carolAfterRoleChange?.disabled).toEqual(false)
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         disabled: true,
       })
@@ -152,7 +182,7 @@ describe('team management', () => {
     })
     it('throws error when trying to update non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.updateMember({
+        adminAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: 'did:plc:test',
           role: 'tools.ozone.team.defs#roleAdmin',