@atproto/ozone 0.1.166 → 0.1.168

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

@@ -19,7 +19,7 @@ Array [
         "lists": 0,
         "starterPacks": 0,
       },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)@jpeg",
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "description": "hi im bob label_me",
       "did": "user(0)",
@@ -76,7 +76,7 @@ Array [
         "lists": 0,
         "starterPacks": 0,
       },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)",
       "createdAt": "1970-01-01T00:00:00.000Z",
       "description": "its me!",
       "did": "user(1)",

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

@@ -18,7 +18,7 @@ Object {
       "lists": 0,
       "starterPacks": 0,
     },
-    "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)@jpeg",
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(0)",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "description": "its me!",
     "did": "user(0)",
@@ -104,7 +104,7 @@ Object {
       "lists": 0,
       "starterPacks": 0,
     },
-    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "description": "hi im bob label_me",
     "did": "user(1)",
@@ -182,7 +182,7 @@ Object {
       "lists": 0,
       "starterPacks": 0,
     },
-    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)@jpeg",
+    "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(0)",
     "createdAt": "1970-01-01T00:00:00.000Z",
     "description": "its me!",
     "did": "user(0)",

package/tests/_util.ts

@@ -64,14 +64,16 @@ export const forSnapshot = (obj: unknown) => {
     if (str.match(/^\d+::bafy/)) {
       return constantKeysetCursor
     }
-    if (str.match(/\/img\/[^/]+\/.+\/did:plc:[^/]+\/[^/]+@[\w]+$/)) {
-      // Match image urls
+    if (str.match(/\/img\/[^/]+\/.+\/did:plc:[^/]+\/[^/@]+(?:@[\w]+)?$/)) {
+      // Match image urls, stripping optional format suffix (e.g. @webp) for stable snapshots
       const match = str.match(
-        /\/img\/[^/]+\/.+\/(did:plc:[^/]+)\/([^/]+)@[\w]+$/,
+        /\/img\/[^/]+\/.+\/(did:plc:[^/]+)\/([^/@]+)(?:@[\w]+)?$/,
       )
       if (!match) return str
       const [, did, cid] = match
-      return str.replace(did, take(users, did)).replace(cid, take(cids, cid))
+      return str
+        .replace(did, take(users, did))
+        .replace(new RegExp(`${cid}(?:@\\w+)?`), take(cids, cid))
     }
     // decent check for 64-byte base64 encoded signatures
     if (str.length === 86 && !str.includes(' ')) {

package/tests/account-strikes.test.ts

@@ -56,7 +56,7 @@ describe('account-strikes', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_account_strikes',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)

package/tests/age-assurance.test.ts

@@ -107,7 +107,7 @@ describe('age assurance events', () => {
         expect(event.event.$type).toBe(
           'tools.ozone.moderation.defs#ageAssuranceEvent',
         )
-        expect((event.event as any).status).toBe('pending')
+        expect(event.event['status']).toBe('pending')
       })
 
       expect(unknownEvents.length).toBeGreaterThan(0)
@@ -115,7 +115,7 @@ describe('age assurance events', () => {
         expect(event.event.$type).toBe(
           'tools.ozone.moderation.defs#ageAssuranceEvent',
         )
-        expect((event.event as any).status).toBe('assured')
+        expect(event.event['status']).toBe('assured')
       })
     } catch (error) {
       console.error('Error querying events:', error)
@@ -132,7 +132,80 @@ describe('age assurance events', () => {
     })
   })
 
-  it('age assurance event fails for record subjects', async () => {
+  it('purge event removes ageAssuranceEvents but keeps overrides, and resets status', async () => {
+    const danSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.dan,
+    }
+
+    await modClient.emitEvent({
+      subject: danSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-dan-1',
+      },
+    })
+    await modClient.emitEvent({
+      subject: danSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+        status: 'assured',
+        comment: 'Admin verified dan',
+      },
+    })
+
+    const { subjectStatuses: beforePurge } = await modClient.queryStatuses({
+      subject: sc.dids.dan,
+    })
+    expect(beforePurge[0].ageAssuranceState).toBe('assured')
+    expect(beforePurge[0].ageAssuranceUpdatedBy).toBe('admin')
+
+    const { events: beforePurgeEvents } = await modClient.queryEvents({
+      subject: sc.dids.dan,
+      types: [
+        'tools.ozone.moderation.defs#ageAssuranceEvent',
+        'tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+      ],
+    })
+    expect(beforePurgeEvents.length).toBe(2)
+
+    // Emit the purge event
+    const purgeEvent = await modClient.emitEvent({
+      subject: danSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssurancePurgeEvent',
+        comment: 'Purging age assurance data per user request',
+      },
+    })
+    expect(purgeEvent.event.$type).toBe(
+      'tools.ozone.moderation.defs#ageAssurancePurgeEvent',
+    )
+
+    // ageAssuranceEvent rows should be deleted
+    const { events: aaEventsAfterPurge } = await modClient.queryEvents({
+      subject: sc.dids.dan,
+      types: ['tools.ozone.moderation.defs#ageAssuranceEvent'],
+    })
+    expect(aaEventsAfterPurge.length).toBe(0)
+
+    // ageAssuranceOverrideEvent rows should be preserved
+    const { events: overrideEventsAfterPurge } = await modClient.queryEvents({
+      subject: sc.dids.dan,
+      types: ['tools.ozone.moderation.defs#ageAssuranceOverrideEvent'],
+    })
+    expect(overrideEventsAfterPurge.length).toBe(1)
+
+    // Status should be reset to unknown and updatedBy set to the purging moderator's DID
+    const { subjectStatuses: afterPurge } = await modClient.queryStatuses({
+      subject: sc.dids.dan,
+    })
+    expect(afterPurge[0].ageAssuranceState).toBe('unknown')
+    expect(afterPurge[0].ageAssuranceUpdatedBy).toBeFalsy()
+  })
+
+  it('purge event fails for record subjects', async () => {
     const postSubject = {
       $type: 'com.atproto.repo.strongRef',
       uri: sc.posts[sc.dids.alice][0].ref.uriStr,
@@ -143,15 +216,69 @@ describe('age assurance events', () => {
       modClient.emitEvent({
         subject: postSubject,
         event: {
-          $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
-          status: 'pending',
-          createdAt: new Date().toISOString(),
-          attemptId: 'attempt-123',
+          $type: 'tools.ozone.moderation.defs#ageAssurancePurgeEvent',
+          comment: 'Should fail',
         },
       }),
     ).rejects.toThrow('Invalid subject type')
   })
 
+  it('purge event only removes ageAssuranceEvents, not overrides or other events', async () => {
+    const carolSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.carol,
+    }
+
+    // Add a non-AA event that should survive the purge
+    const commentEvent = await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#modEventComment',
+        comment: 'A non-AA comment that should survive purge',
+      },
+    })
+
+    // Add an ageAssuranceEvent that should be removed
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceEvent',
+        status: 'pending',
+        createdAt: new Date().toISOString(),
+        attemptId: 'attempt-carol-purge-1',
+      },
+    })
+
+    // Add an ageAssuranceOverrideEvent that should survive the purge
+    const overrideEvent = await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent',
+        status: 'assured',
+        comment: 'Override that should survive purge',
+      },
+    })
+
+    await modClient.emitEvent({
+      subject: carolSubject,
+      event: {
+        $type: 'tools.ozone.moderation.defs#ageAssurancePurgeEvent',
+        comment: 'Purging carol age assurance data',
+      },
+    })
+
+    const { events: afterPurge } = await modClient.queryEvents({
+      subject: sc.dids.carol,
+    })
+
+    const aaEventsAfterPurge = afterPurge.filter(
+      (e) => e.event.$type === 'tools.ozone.moderation.defs#ageAssuranceEvent',
+    )
+    expect(aaEventsAfterPurge.length).toBe(0)
+    expect(afterPurge.some((e) => e.id === overrideEvent.id)).toBe(true)
+    expect(afterPurge.some((e) => e.id === commentEvent.id)).toBe(true)
+  })
+
   it('admin override behavior for age assurance states', async () => {
     const carolSubject = {
       $type: 'com.atproto.admin.defs#repoRef',

package/tests/communication-templates.test.ts

@@ -11,7 +11,7 @@ describe('communication-templates', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_communication_templates',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/expiring-label.test.ts

@@ -18,7 +18,7 @@ describe('expiring label', () => {
       dbPostgresSchema: 'ozone_expiring_label_test',
     })
     sc = network.getSeedClient()
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/get-account-timeline.test.ts

@@ -20,7 +20,7 @@ describe('account timeline', () => {
       dbPostgresSchema: 'ozone_account_timeline_test',
     })
     sc = network.getSeedClient()
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)
 

package/tests/get-config.test.ts

@@ -12,7 +12,7 @@ describe('get-config', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_server_config',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/get-lists.test.ts

@@ -24,8 +24,8 @@ describe('admin get lists', () => {
       dbPostgresSchema: 'ozone_admin_get_lists',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
-    appviewAgent = network.bsky.getClient()
+    agent = ozone.getAgent()
+    appviewAgent = network.bsky.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/get-profiles.test.ts

@@ -54,7 +54,7 @@ describe('get profiles through ozone', () => {
       sc.dids.carol,
     ])
 
-    const appviewAgent = network.bsky.getClient()
+    const appviewAgent = network.bsky.getAgent()
     const {
       data: { profiles: profilesFromAppview },
     } = await appviewAgent.app.bsky.actor.getProfiles({

package/tests/get-record.test.ts

@@ -26,7 +26,7 @@ describe('admin get record view', () => {
       dbPostgresSchema: 'ozone_admin_get_record',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
+    agent = ozone.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/get-records.test.ts

@@ -25,7 +25,7 @@ describe('admin get records view', () => {
       dbPostgresSchema: 'ozone_admin_get_records',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
+    agent = ozone.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/get-repo.test.ts

@@ -26,8 +26,8 @@ describe('admin get repo view', () => {
       dbPostgresSchema: 'ozone_admin_get_repo',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = ozone.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/get-repos.test.ts

@@ -26,8 +26,8 @@ describe('admin get multiple repos', () => {
       dbPostgresSchema: 'ozone_admin_get_repos',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = ozone.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/get-starter-pack.test.ts

@@ -23,7 +23,7 @@ describe('admin get starter pack view', () => {
     })
     ozone = network.ozone
     AtpAgent.configure({ appLabelers: [ozone.ctx.cfg.service.did] })
-    agent = ozone.getClient()
+    agent = ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -59,7 +59,7 @@ describe('admin get starter pack view', () => {
 
     it('gets a starterpack while taken down', async () => {
       // Validate that appview returns starterpacks before takedown
-      const appviewAgent = network.bsky.getClient()
+      const appviewAgent = network.bsky.getAgent()
       const beforeTakedownFromAppview =
         await appviewAgent.api.app.bsky.graph.getStarterPack(
           { starterPack: sp1.uriStr },

package/tests/get-subjects.test.ts

@@ -25,7 +25,7 @@ describe('admin get multiple subjects with all relevant details', () => {
       dbPostgresSchema: 'ozone_admin_get_subjects',
     })
     ozone = network.ozone
-    agent = ozone.getClient()
+    agent = ozone.getAgent()
     sc = network.getSeedClient()
     modClient = ozone.getModClient()
     await basicSeed(sc)

package/tests/moderation.test.ts

@@ -71,9 +71,9 @@ describe('moderation', () => {
       },
     })
     ozone = network.ozone
-    agent = network.ozone.getClient()
-    bskyAgent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.ozone.getAgent()
+    bskyAgent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)

package/tests/query-labels.test.ts

@@ -24,7 +24,7 @@ describe('ozone query labels', () => {
       dbPostgresSchema: 'ozone_query_labels',
     })
 
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
 
     const toCreate = [
       {

package/tests/repo-search.test.ts

@@ -20,7 +20,7 @@ describe('admin repo search view', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_admin_repo_search',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await usersBulkSeed(sc)

package/tests/report-reason.test.ts

@@ -25,7 +25,7 @@ describe('report reason', () => {
     await basicSeed(sc)
 
     // Login with ozone's service account owner and update the service profile definition
-    pdsAgent = network.pds.getClient()
+    pdsAgent = network.pds.getAgent()
     await pdsAgent.login({
       identifier: 'mod-authority.test',
       password: 'hunter2',

package/tests/safelink.test.ts

@@ -20,9 +20,9 @@ describe('safelink management', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_safelink_test',
     })
-    adminAgent = network.ozone.getClient()
-    modAgent = network.ozone.getClient()
-    triageAgent = network.ozone.getClient()
+    adminAgent = network.ozone.getAgent()
+    modAgent = network.ozone.getAgent()
+    triageAgent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/scheduled-action-processor.test.ts

@@ -66,7 +66,7 @@ describe('scheduled action processor', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_scheduled_action_processor_test',
     })
-    adminAgent = network.ozone.getClient()
+    adminAgent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/scheduled-action.test.ts

@@ -48,9 +48,9 @@ describe('scheduled action management', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_scheduled_action_test',
     })
-    adminAgent = network.ozone.getClient()
-    modAgent = network.ozone.getClient()
-    triageAgent = network.ozone.getClient()
+    adminAgent = network.ozone.getAgent()
+    modAgent = network.ozone.getAgent()
+    triageAgent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/sets.test.ts

@@ -90,7 +90,7 @@ describe('ozone-sets', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_sets',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/settings.test.ts

@@ -61,7 +61,7 @@ describe('ozone-settings', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_settings',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/strike-expiry-processor.test.ts

@@ -59,7 +59,7 @@ describe('strike expiry processor', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_strike_expiry_processor',
     })
-    agent = network.ozone.getClient()
+    agent = network.ozone.getAgent()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)

package/tests/takedown.test.ts

@@ -30,8 +30,8 @@ describe('moderation', () => {
     })
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
-    pdsAgent = network.pds.getClient()
-    bskyAgent = network.bsky.getClient()
+    pdsAgent = network.pds.getAgent()
+    bskyAgent = network.bsky.getAgent()
     await basicSeed(sc)
     await network.processAll()
   })

package/tests/team.test.ts

@@ -15,7 +15,7 @@ describe('team management', () => {
         dbTeamProfileRefreshIntervalMs: 100,
       },
     })
-    adminAgent = network.pds.getClient()
+    adminAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -27,7 +27,7 @@ describe('team management', () => {
       identifier: sc.accounts[sc.dids.alice].handle,
       password: sc.accounts[sc.dids.alice].password,
     })
-    triageAgent = network.pds.getClient()
+    triageAgent = network.pds.getAgent()
     await triageAgent.login({
       identifier: sc.accounts[sc.dids.carol].handle,
       password: sc.accounts[sc.dids.carol].password,

package/tests/verification-listener.test.ts

@@ -30,7 +30,7 @@ describe('verification-listener', () => {
     sc = network.getSeedClient()
     await basicSeed(sc)
 
-    adminAgent = network.pds.getClient()
+    adminAgent = network.pds.getAgent()
     await adminAgent.login({
       identifier: sc.accounts[sc.dids.alice].handle,
       password: sc.accounts[sc.dids.alice].password,

package/tests/verification.test.ts

@@ -14,7 +14,7 @@ describe('verification', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_verification_test',
     })
-    adminAgent = network.pds.getClient()
+    adminAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -26,7 +26,7 @@ describe('verification', () => {
       identifier: sc.accounts[sc.dids.alice].handle,
       password: sc.accounts[sc.dids.alice].password,
     })
-    triageAgent = network.pds.getClient()
+    triageAgent = network.pds.getAgent()
     await triageAgent.login({
       identifier: sc.accounts[sc.dids.carol].handle,
       password: sc.accounts[sc.dids.carol].password,