@atproto/ozone 0.1.106 → 0.1.108

package/tests/__snapshots__/verification-listener.test.ts.snap

@@ -0,0 +1,146 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`verification-listener indexes new and revoked verifications 1`] = `
+Array [
+  Object {
+    "$type": "tools.ozone.verification.defs#verificationView",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "displayName": "Alice",
+    "handle": "alice.test",
+    "issuer": "user(0)",
+    "issuerProfile": Object {
+      "$type": "app.bsky.actor.defs#profileViewDetailed",
+      "associated": Object {
+        "feedgens": 0,
+        "labeler": false,
+        "lists": 0,
+        "starterPacks": 0,
+      },
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "hi im bob label_me",
+      "did": "user(0)",
+      "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,
+      },
+    },
+    "issuerRepo": Object {
+      "$type": "tools.ozone.moderation.defs#repoViewDetail",
+      "did": "user(0)",
+      "email": "bob@test.com",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "invites": Array [],
+      "invitesDisabled": false,
+      "labels": Array [],
+      "moderation": Object {},
+      "relatedRecords": Array [
+        Object {
+          "$type": "app.bsky.actor.profile",
+          "avatar": Object {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": Object {
+              "$link": "cids(0)",
+            },
+            "size": 3976,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "description": "hi im bob label_me",
+          "displayName": "bobby",
+        },
+      ],
+    },
+    "revokedAt": "1970-01-01T00:00:00.000Z",
+    "revokedBy": "user(0)",
+    "subject": "user(1)",
+    "subjectProfile": Object {
+      "$type": "app.bsky.actor.defs#profileViewDetailed",
+      "associated": Object {
+        "feedgens": 0,
+        "labeler": false,
+        "lists": 0,
+        "starterPacks": 0,
+      },
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(1)",
+      "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(1)",
+          "uri": "record(1)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(1)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(1)",
+          "uri": "record(1)",
+          "val": "self-label-b",
+        },
+      ],
+      "postsCount": 4,
+      "viewer": Object {
+        "blockedBy": false,
+        "muted": false,
+      },
+    },
+    "subjectRepo": Object {
+      "$type": "tools.ozone.moderation.defs#repoViewDetail",
+      "did": "user(1)",
+      "email": "alice@test.com",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "invites": Array [],
+      "invitesDisabled": false,
+      "labels": Array [],
+      "moderation": Object {},
+      "relatedRecords": Array [
+        Object {
+          "$type": "app.bsky.actor.profile",
+          "avatar": Object {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": Object {
+              "$link": "cids(0)",
+            },
+            "size": 3976,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "description": "its me!",
+          "displayName": "ali",
+          "labels": Object {
+            "$type": "com.atproto.label.defs#selfLabels",
+            "values": Array [
+              Object {
+                "val": "self-label-a",
+              },
+              Object {
+                "val": "self-label-b",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+    "uri": "record(0)",
+  },
+]
+`;

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

@@ -0,0 +1,288 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`verification list returns paginated list of verifications 1`] = `
+Object {
+  "$type": "tools.ozone.verification.defs#verificationView",
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "displayName": "bobby",
+  "handle": "bob.test",
+  "issuer": "user(0)",
+  "issuerProfile": Object {
+    "$type": "app.bsky.actor.defs#profileViewDetailed",
+    "associated": Object {
+      "feedgens": 0,
+      "labeler": false,
+      "lists": 0,
+      "starterPacks": 0,
+    },
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)@jpeg",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "description": "its me!",
+    "did": "user(0)",
+    "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(0)",
+        "uri": "record(1)",
+        "val": "self-label-a",
+      },
+      Object {
+        "cid": "cids(1)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-b",
+      },
+    ],
+    "postsCount": 4,
+    "verification": Object {
+      "trustedVerifierStatus": "valid",
+      "verifications": Array [],
+      "verifiedStatus": "none",
+    },
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
+  "issuerRepo": Object {
+    "$type": "tools.ozone.moderation.defs#repoViewDetail",
+    "did": "user(0)",
+    "email": "alice@test.com",
+    "handle": "alice.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "invites": Array [],
+    "invitesDisabled": false,
+    "labels": Array [],
+    "moderation": Object {},
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
+          },
+          "size": 3976,
+        },
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "description": "its me!",
+        "displayName": "ali",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label-a",
+            },
+            Object {
+              "val": "self-label-b",
+            },
+          ],
+        },
+      },
+    ],
+  },
+  "subject": "user(1)",
+  "subjectProfile": Object {
+    "$type": "app.bsky.actor.defs#profileViewDetailed",
+    "associated": Object {
+      "feedgens": 0,
+      "labeler": false,
+      "lists": 0,
+      "starterPacks": 0,
+    },
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "description": "hi im bob label_me",
+    "did": "user(1)",
+    "displayName": "bobby",
+    "followersCount": 2,
+    "followsCount": 2,
+    "handle": "bob.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "labels": Array [],
+    "postsCount": 3,
+    "verification": Object {
+      "trustedVerifierStatus": "none",
+      "verifications": Array [
+        Object {
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "isValid": true,
+          "issuer": "user(0)",
+          "uri": "record(0)",
+        },
+      ],
+      "verifiedStatus": "valid",
+    },
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
+  "subjectRepo": Object {
+    "$type": "tools.ozone.moderation.defs#repoViewDetail",
+    "did": "user(1)",
+    "email": "bob@test.com",
+    "handle": "bob.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "invites": Array [],
+    "invitesDisabled": false,
+    "labels": Array [],
+    "moderation": Object {},
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
+          },
+          "size": 3976,
+        },
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "description": "hi im bob label_me",
+        "displayName": "bobby",
+      },
+    ],
+  },
+  "updatedAt": "1970-01-01T00:00:00.000Z",
+  "uri": "record(0)",
+}
+`;
+
+exports[`verification list returns paginated list of verifications 2`] = `
+Object {
+  "$type": "tools.ozone.verification.defs#verificationView",
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "displayName": "",
+  "handle": "carol.test",
+  "issuer": "user(0)",
+  "issuerProfile": Object {
+    "$type": "app.bsky.actor.defs#profileViewDetailed",
+    "associated": Object {
+      "feedgens": 0,
+      "labeler": false,
+      "lists": 0,
+      "starterPacks": 0,
+    },
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "description": "its me!",
+    "did": "user(0)",
+    "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(0)",
+        "uri": "record(1)",
+        "val": "self-label-a",
+      },
+      Object {
+        "cid": "cids(1)",
+        "cts": "1970-01-01T00:00:00.000Z",
+        "src": "user(0)",
+        "uri": "record(1)",
+        "val": "self-label-b",
+      },
+    ],
+    "postsCount": 4,
+    "verification": Object {
+      "trustedVerifierStatus": "valid",
+      "verifications": Array [],
+      "verifiedStatus": "none",
+    },
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
+  "issuerRepo": Object {
+    "$type": "tools.ozone.moderation.defs#repoViewDetail",
+    "did": "user(0)",
+    "email": "alice@test.com",
+    "handle": "alice.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "invites": Array [],
+    "invitesDisabled": false,
+    "labels": Array [],
+    "moderation": Object {},
+    "relatedRecords": Array [
+      Object {
+        "$type": "app.bsky.actor.profile",
+        "avatar": Object {
+          "$type": "blob",
+          "mimeType": "image/jpeg",
+          "ref": Object {
+            "$link": "cids(0)",
+          },
+          "size": 3976,
+        },
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "description": "its me!",
+        "displayName": "ali",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label-a",
+            },
+            Object {
+              "val": "self-label-b",
+            },
+          ],
+        },
+      },
+    ],
+  },
+  "revokeReason": "Testing",
+  "revokedAt": "1970-01-01T00:00:00.000Z",
+  "revokedBy": "user(0)",
+  "subject": "user(1)",
+  "subjectProfile": Object {
+    "$type": "app.bsky.actor.defs#profileViewDetailed",
+    "associated": Object {
+      "feedgens": 0,
+      "labeler": false,
+      "lists": 0,
+      "starterPacks": 0,
+    },
+    "did": "user(1)",
+    "followersCount": 2,
+    "followsCount": 1,
+    "handle": "carol.test",
+    "labels": Array [],
+    "postsCount": 2,
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
+  "subjectRepo": Object {
+    "$type": "tools.ozone.moderation.defs#repoViewDetail",
+    "did": "user(1)",
+    "email": "carol@test.com",
+    "handle": "carol.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "invites": Array [],
+    "invitesDisabled": false,
+    "labels": Array [],
+    "moderation": Object {},
+    "relatedRecords": Array [],
+  },
+  "updatedAt": "1970-01-01T00:00:00.000Z",
+  "uri": "record(0)",
+}
+`;

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

@@ -39,7 +39,12 @@ describe('reporter-stats', () => {
   }
 
   it('updates reporter stats based on actions', async () => {
-    const bobsPostSubject = {
+    const bobsPostSubject1 = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][0].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][0].ref.cidStr,
+    }
+    const bobsPostSubject2 = {
       $type: 'com.atproto.repo.strongRef',
       uri: sc.posts[sc.dids.bob][1].ref.uriStr,
       cid: sc.posts[sc.dids.bob][1].ref.cidStr,
@@ -54,13 +59,19 @@ describe('reporter-stats', () => {
         reportedBy: sc.dids.alice,
         reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
         reason: 'misleading',
-        subject: bobsPostSubject,
+        subject: bobsPostSubject1,
+      }),
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONOTHER,
+        reason: 'test',
+        subject: bobsPostSubject1,
       }),
       sc.createReport({
         reportedBy: sc.dids.alice,
         reasonType: ComAtprotoModerationDefs.REASONOTHER,
         reason: 'test',
-        subject: bobsPostSubject,
+        subject: bobsPostSubject2,
       }),
       sc.createReport({
         reportedBy: sc.dids.alice,
@@ -75,9 +86,9 @@ describe('reporter-stats', () => {
     expect(statsAfterReport).toMatchObject({
       did: sc.dids.alice,
       accountReportCount: 1,
-      recordReportCount: 2,
+      recordReportCount: 3,
       reportedAccountCount: 1,
-      reportedRecordCount: 1,
+      reportedRecordCount: 2,
       takendownAccountCount: 0,
       takendownRecordCount: 0,
       labeledAccountCount: 0,
@@ -86,7 +97,11 @@ describe('reporter-stats', () => {
 
     await Promise.all([
       modClient.performTakedown({
-        subject: bobsPostSubject,
+        subject: bobsPostSubject1,
+        policies: ['trolling'],
+      }),
+      modClient.performTakedown({
+        subject: bobsPostSubject2,
         policies: ['trolling'],
       }),
       modClient.emitEvent({
@@ -105,11 +120,11 @@ describe('reporter-stats', () => {
     expect(statsAfterAction).toMatchObject({
       did: sc.dids.alice,
       accountReportCount: 1,
-      recordReportCount: 2,
+      recordReportCount: 3,
       reportedAccountCount: 1,
-      reportedRecordCount: 1,
+      reportedRecordCount: 2,
       takendownAccountCount: 0,
-      takendownRecordCount: 1,
+      takendownRecordCount: 2,
       labeledAccountCount: 1,
       labeledRecordCount: 0,
     })

package/tests/verification-listener.test.ts

@@ -0,0 +1,102 @@
+import { Sender, WebSocketServer } from 'ws'
+import { AppBskyGraphVerification, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { forSnapshot } from './_util'
+
+describe('verification-listener', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let adminAgent: AtpAgent
+  let jetstream: WebSocketServer
+  let relay: Sender
+
+  beforeAll(async () => {
+    const jetstreamPort = 2511
+    jetstream = new WebSocketServer({
+      port: jetstreamPort,
+    })
+    jetstream.on('connection', (ws) => {
+      relay = ws
+    })
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_verification_listener_test',
+      ozone: {
+        verifierUrl: 'http://localhost:2583',
+        verifierDid: 'did:example:verifier',
+        verifierPassword: 'test',
+        jetstreamUrl: `ws://localhost:${jetstreamPort}`,
+      },
+    })
+    sc = network.getSeedClient()
+    await basicSeed(sc)
+
+    adminAgent = network.pds.getClient()
+    await adminAgent.login({
+      identifier: sc.accounts[sc.dids.alice].handle,
+      password: sc.accounts[sc.dids.alice].password,
+    })
+    await network.ozone.addAdminDid(sc.dids.alice)
+
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await jetstream.close()
+    await network.close()
+  })
+
+  it('indexes new and revoked verifications', async () => {
+    const { verificationListener } = network.ozone.daemon.ctx
+    const createEvent = {
+      kind: 'commit',
+      did: sc.dids.bob,
+      time_us: 123456789,
+      commit: {
+        rev: 'xyz',
+        operation: 'create',
+        collection: 'app.bsky.graph.verification',
+        rkey: 'abcdefg',
+        cid: 'xyz',
+        record: {
+          $type: 'app.bsky.graph.verification',
+          subject: sc.dids.alice,
+          handle: sc.accounts[sc.dids.alice].handle,
+          displayName: 'Alice',
+          createdAt: new Date().toISOString(),
+        } satisfies AppBskyGraphVerification.Record,
+      },
+    }
+    const deleteEvent = {
+      kind: 'commit',
+      did: sc.dids.bob,
+      time_us: 123456799,
+      commit: {
+        rev: 'yza',
+        operation: 'delete',
+        collection: 'app.bsky.graph.verification',
+        rkey: 'abcdefg',
+      },
+    }
+    relay.send(JSON.stringify(createEvent))
+    relay.send(JSON.stringify(deleteEvent))
+    const verificationService = network.ozone.ctx.verificationService(
+      network.ozone.ctx.db,
+    )
+    // Wait for the listener to process the events
+    let hasCursorUpdated = false
+    let attempt = 0
+    do {
+      const cursor = await verificationService.getFirehoseCursor()
+      hasCursorUpdated = cursor === 123456799
+      attempt++
+    } while (!hasCursorUpdated && attempt < 20)
+    // Give the processor enough time to handle the events
+    const {
+      data: { verifications },
+    } = await adminAgent.tools.ozone.verification.listVerifications({})
+    const cursor = await verificationListener?.getCursor()
+
+    expect(forSnapshot(verifications)).toMatchSnapshot()
+    expect(cursor).toEqual(123456799)
+  })
+})