@atproto/ozone 0.1.128 → 0.1.130

package/src/mod-service/views.ts

@@ -29,6 +29,8 @@ import {
   RepoView,
   SubjectStatusView,
   isAccountEvent,
+  isAgeAssuranceEvent,
+  isAgeAssuranceOverrideEvent,
   isIdentityEvent,
   isModEventAcknowledge,
   isModEventComment,
@@ -246,6 +248,20 @@ export class ModerationViews {
       event.timestamp = ifString(meta.timestamp)!
     }
 
+    if (isAgeAssuranceEvent(event)) {
+      event.status = ifString(meta.status)!
+      event.createdAt = ifString(meta.createdAt)!
+      event.attemptId = ifString(meta.attemptId)!
+      event.initIp = ifString(meta.initIp)
+      event.initUa = ifString(meta.initUa)
+      event.completeIp = ifString(meta.completeIp)
+      event.completeUa = ifString(meta.completeUa)
+    }
+
+    if (isAgeAssuranceOverrideEvent(event)) {
+      event.status = ifString(meta.status)!
+    }
+
     return eventView
   }
 
@@ -687,6 +703,8 @@ export class ModerationViews {
       subjectBlobCids: status.blobCids || [],
       tags: status.tags || [],
       priorityScore: status.priorityScore,
+      ageAssuranceState: status.ageAssuranceState ?? undefined,
+      ageAssuranceUpdatedBy: status.ageAssuranceUpdatedBy ?? undefined,
       subject: subjectFromStatusRow(
         status,
       ).lex() as SubjectStatusView['subject'],

package/tests/__snapshots__/age-assurance.test.ts.snap

@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`age assurance events handles age assurance events from user 1`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "user(1)",
+  "event": Object {
+    "$type": "tools.ozone.moderation.defs#ageAssuranceEvent",
+    "attemptId": "attempt-123",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "initIp": "123.456.789.012",
+    "initUa": "Mozilla/5.0",
+    "status": "pending",
+  },
+  "id": 1,
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoRef",
+    "did": "user(0)",
+  },
+  "subjectBlobCids": Array [],
+}
+`;
+
+exports[`age assurance events handles age assurance events from user 2`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "user(1)",
+  "event": Object {
+    "$type": "tools.ozone.moderation.defs#ageAssuranceEvent",
+    "attemptId": "attempt-345",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "initIp": "234.567.890.123",
+    "initUa": "Mozilla/5.0",
+    "status": "pending",
+  },
+  "id": 3,
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoRef",
+    "did": "user(0)",
+  },
+  "subjectBlobCids": Array [],
+}
+`;
+
+exports[`age assurance events handles age assurance events from user 3`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "user(1)",
+  "event": Object {
+    "$type": "tools.ozone.moderation.defs#ageAssuranceEvent",
+    "attemptId": "attempt-345",
+    "completeIp": "345.678.901.234",
+    "completeUa": "Mozilla/5.0",
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "initIp": "234.567.890.123",
+    "initUa": "Mozilla/5.0",
+    "status": "assured",
+  },
+  "id": 5,
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoRef",
+    "did": "user(0)",
+  },
+  "subjectBlobCids": Array [],
+}
+`;

package/tests/__snapshots__/get-record.test.ts.snap

@@ -31,6 +31,7 @@ Object {
       "accountStats": Object {
         "$type": "tools.ozone.moderation.defs#accountStats",
       },
+      "ageAssuranceState": "unknown",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -152,6 +153,7 @@ Object {
       "accountStats": Object {
         "$type": "tools.ozone.moderation.defs#accountStats",
       },
+      "ageAssuranceState": "unknown",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",

package/tests/__snapshots__/get-records.test.ts.snap

@@ -34,6 +34,7 @@ Object {
           "accountStats": Object {
             "$type": "tools.ozone.moderation.defs#accountStats",
           },
+          "ageAssuranceState": "unknown",
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#recordHosting",

package/tests/__snapshots__/get-repo.test.ts.snap

@@ -30,6 +30,7 @@ Object {
         "suspendCount": 0,
         "takedownCount": 1,
       },
+      "ageAssuranceState": "unknown",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#accountHosting",

package/tests/__snapshots__/get-repos.test.ts.snap

@@ -33,6 +33,7 @@ Object {
             "suspendCount": 0,
             "takedownCount": 1,
           },
+          "ageAssuranceState": "unknown",
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#accountHosting",

package/tests/__snapshots__/get-subjects.test.ts.snap

@@ -74,6 +74,7 @@ Array [
             "suspendCount": 0,
             "takedownCount": 1,
           },
+          "ageAssuranceState": "unknown",
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -147,6 +148,7 @@ Array [
         "suspendCount": 0,
         "takedownCount": 1,
       },
+      "ageAssuranceState": "unknown",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -252,6 +254,7 @@ Array [
             "suspendCount": 0,
             "takedownCount": 1,
           },
+          "ageAssuranceState": "unknown",
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -301,6 +304,7 @@ Array [
               "suspendCount": 0,
               "takedownCount": 1,
             },
+            "ageAssuranceState": "unknown",
             "createdAt": "1970-01-01T00:00:00.000Z",
             "hosting": Object {
               "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -409,6 +413,7 @@ Array [
             "suspendCount": 0,
             "takedownCount": 1,
           },
+          "ageAssuranceState": "unknown",
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -482,6 +487,7 @@ Array [
         "suspendCount": 0,
         "takedownCount": 1,
       },
+      "ageAssuranceState": "unknown",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -26,6 +26,7 @@ Object {
           "suspendCount": 0,
           "takedownCount": 0,
         },
+        "ageAssuranceState": "unknown",
         "createdAt": "1970-01-01T00:00:00.000Z",
         "hosting": Object {
           "$type": "tools.ozone.moderation.defs#accountHosting",

package/tests/__snapshots__/moderation-statuses.test.ts.snap

@@ -11,6 +11,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -55,6 +56,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -103,6 +105,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -147,6 +150,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -190,6 +194,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -233,6 +238,7 @@ Array [
       "suspendCount": 0,
       "takedownCount": 0,
     },
+    "ageAssuranceState": "unknown",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",

package/tests/age-assurance.test.ts

@@ -0,0 +1,245 @@
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+import { forSnapshot } from './_util'
+
+describe('age assurance events', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_age_assurance',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('handles age assurance events from user', async () => {
+    const aliceSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.alice,
+    }
+    const bobSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.bob,
+    }
+
+    const alicePendingEvent = await modClient.emitEvent({
+      subject: aliceSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-123',
+        initIp: '123.456.789.012',
+        initUa: 'Mozilla/5.0',
+      },
+    })
+
+    const bobPendingEvent = await modClient.emitEvent({
+      subject: bobSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-345',
+        initIp: '234.567.890.123',
+        initUa: 'Mozilla/5.0',
+      },
+    })
+
+    const bobAssuredEvent = await modClient.emitEvent({
+      subject: bobSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'assured',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-345',
+        initIp: '234.567.890.123',
+        initUa: 'Mozilla/5.0',
+        completeIp: '345.678.901.234',
+        completeUa: 'Mozilla/5.0',
+      },
+    })
+
+    expect(forSnapshot(alicePendingEvent)).toMatchSnapshot()
+    expect(forSnapshot(bobPendingEvent)).toMatchSnapshot()
+    expect(forSnapshot(bobAssuredEvent)).toMatchSnapshot()
+
+    // Verify that age assurance state is correctly set for each subject
+    const [{ subjectStatuses: aliceStatus }, { subjectStatuses: bobStatus }] =
+      await Promise.all([
+        modClient.queryStatuses({
+          subject: sc.dids.alice,
+        }),
+        modClient.queryStatuses({
+          subject: sc.dids.bob,
+        }),
+      ])
+
+    expect(aliceStatus[0].ageAssuranceState).toBe('pending')
+    expect(bobStatus[0].ageAssuranceState).toBe('assured')
+
+    // Verify that queryEvents allow filtering by ageAssuranceState
+    try {
+      const [{ events: pendingEvents }, { events: unknownEvents }] =
+        await Promise.all([
+          modClient.queryEvents({
+            ageAssuranceState: 'pending',
+          }),
+          modClient.queryEvents({
+            ageAssuranceState: 'assured',
+          }),
+        ])
+      expect(pendingEvents.length).toEqual(2)
+      pendingEvents.forEach((event) => {
+        expect(event.event.$type).toBe(
+          'tools.ozone.moderation.defs#ageAssuranceEvent',
+        )
+        expect((event.event as any).status).toBe('pending')
+      })
+
+      expect(unknownEvents.length).toBeGreaterThan(0)
+      unknownEvents.forEach((event) => {
+        expect(event.event.$type).toBe(
+          'tools.ozone.moderation.defs#ageAssuranceEvent',
+        )
+        expect((event.event as any).status).toBe('assured')
+      })
+    } catch (error) {
+      console.error('Error querying events:', error)
+      throw error
+    }
+
+    // Verify that queryStatuses allows filtering by ageAssuranceState
+    const { subjectStatuses: pendingStatuses } = await modClient.queryStatuses({
+      ageAssuranceState: 'pending',
+    })
+    expect(pendingStatuses.length).toEqual(1)
+    pendingStatuses.forEach((status) => {
+      expect(status.ageAssuranceState).toBe('pending')
+    })
+  })
+
+  it('age assurance event fails for record subjects', async () => {
+    const postSubject = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+    }
+
+    await expect(
+      modClient.emitEvent({
+        subject: postSubject,
+        event: {
+          $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+          status: 'pending',
+          createdAt: new Date().toISOString(),
+          attemptId: 'attempt-123',
+        },
+      }),
+    ).rejects.toThrow('Invalid subject type')
+  })
+
+  it('admin override behavior for age assurance states', async () => {
+    const carolSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.carol,
+    }
+
+    // Verify that user emitted state is overridden by admin emitted state
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-carol-1',
+      },
+    })
+
+    const { subjectStatuses } = await modClient.queryStatuses({
+      subject: sc.dids.carol,
+    })
+    expect(subjectStatuses[0].ageAssuranceState).toBe('pending')
+    expect(subjectStatuses[0].ageAssuranceUpdatedBy).toBe('user')
+
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+        status: 'assured',
+        comment: 'Admin verification completed',
+      },
+    })
+
+    const { subjectStatuses: afterAdminAssurance } =
+      await modClient.queryStatuses({
+        subject: sc.dids.carol,
+      })
+    expect(afterAdminAssurance[0].ageAssuranceState).toBe('assured')
+    expect(afterAdminAssurance[0].ageAssuranceUpdatedBy).toBe('admin')
+
+    // Verify that user emitted state can not override admin emitted state
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-carol-2',
+      },
+    })
+
+    const { subjectStatuses: afterCarolsAttempt } =
+      await modClient.queryStatuses({
+        subject: sc.dids.carol,
+      })
+    expect(afterCarolsAttempt[0].ageAssuranceState).toBe('assured')
+    expect(afterCarolsAttempt[0].ageAssuranceUpdatedBy).toBe('admin')
+
+    // Verify that admin can reset state to allow the user to override
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+        status: 'reset',
+        comment: 'Reset to allow user to set state again',
+      },
+    })
+
+    const { subjectStatuses: afterReset } = await modClient.queryStatuses({
+      subject: sc.dids.carol,
+    })
+    expect(afterReset[0].ageAssuranceState).toBe('reset')
+    expect(afterReset[0].ageAssuranceUpdatedBy).toBe('admin')
+
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'assured',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-carol-3',
+      },
+    })
+
+    const { subjectStatuses: afterCarolAssured } =
+      await modClient.queryStatuses({
+        subject: sc.dids.carol,
+      })
+    expect(afterCarolAssured[0].ageAssuranceState).toBe('assured')
+    expect(afterCarolAssured[0].ageAssuranceUpdatedBy).toBe('user')
+  })
+})