@atproto/ozone 0.1.73 → 0.1.74

package/src/background.ts

@@ -152,10 +152,8 @@ export class PeriodicBackgroundTask {
     // destroy it here.
 
     this.abortController.abort()
-    console.error('ABOOOORT')
 
     await this.intervalPromise
     this.intervalPromise = undefined
-    console.error('DONE -_-')
   }
 }

package/src/lexicon/lexicons.ts

@@ -11549,6 +11549,11 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long the label will remain on the subject. Only applies on labels that are being added.',
+          },
         },
       },
       modEventAcknowledge: {

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -347,6 +347,8 @@ export interface ModEventLabel {
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
+  /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
+  durationInHours?: number
   [k: string]: unknown
 }
 

package/src/mod-service/index.ts

@@ -1159,13 +1159,19 @@ export class ModerationService {
     uri: string,
     cid: string | null,
     labels: { create?: string[]; negate?: string[] },
+    durationInHours?: number,
   ): Promise<Label[]> {
+    const exp =
+      durationInHours !== undefined
+        ? addHoursToDate(durationInHours).toISOString()
+        : undefined
     const { create = [], negate = [] } = labels
     const toCreate = create.map((val) => ({
       src: this.cfg.service.did,
       uri,
       cid: cid ?? undefined,
       val,
+      exp,
       cts: new Date().toISOString(),
     }))
     const toNegate = negate.map((val) => ({

package/src/mod-service/status.ts

@@ -77,6 +77,8 @@ const getSubjectStatusForModerationEvent = ({
       }
     case 'tools.ozone.moderation.defs#modEventTakedown':
       return {
+        // If we are doing a takedown, safe to move the item out of appealed state
+        ...(currentStatus?.appealed ? { appealed: false } : {}),
         takendown: true,
         lastReviewedBy: createdBy,
         reviewState: REVIEWCLOSED,

package/src/mod-service/views.ts

@@ -113,6 +113,7 @@ export class ModerationViews {
       [
         'tools.ozone.moderation.defs#modEventMuteReporter',
         'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventLabel',
         'tools.ozone.moderation.defs#modEventMute',
       ].includes(event.action)
     ) {
@@ -628,7 +629,7 @@ export class ModerationViews {
 
       recordsStats: {
         // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
-        $type: 'tools.ozone.moderation.defs#recordStats',
+        $type: 'tools.ozone.moderation.defs#recordsStats',
 
         // account_record_events_stats
         totalReports: status.totalReports ?? undefined,

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

@@ -41,7 +41,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
         "escalatedCount": 0,
         "pendingCount": 0,
@@ -161,7 +161,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
         "escalatedCount": 0,
         "pendingCount": 0,

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

@@ -44,7 +44,7 @@ Object {
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
           "recordsStats": Object {
-            "$type": "tools.ozone.moderation.defs#recordStats",
+            "$type": "tools.ozone.moderation.defs#recordsStats",
             "appealedCount": 0,
             "escalatedCount": 0,
             "pendingCount": 0,

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

@@ -40,7 +40,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
       },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {

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

@@ -43,7 +43,7 @@ Object {
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
           "recordsStats": Object {
-            "$type": "tools.ozone.moderation.defs#recordStats",
+            "$type": "tools.ozone.moderation.defs#recordsStats",
           },
           "reviewState": "tools.ozone.moderation.defs#reviewClosed",
           "subject": Object {

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

@@ -36,7 +36,7 @@ Object {
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
         "recordsStats": Object {
-          "$type": "tools.ozone.moderation.defs#recordStats",
+          "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
           "escalatedCount": 0,
           "pendingCount": 2,

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

@@ -19,7 +19,7 @@ Array [
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -62,7 +62,7 @@ Array [
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -109,7 +109,7 @@ Array [
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -152,7 +152,7 @@ Array [
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -194,7 +194,7 @@ Array [
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -236,7 +236,7 @@ Array [
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,

package/tests/moderation.test.ts

@@ -24,6 +24,7 @@ import { EventReverser } from '../src'
 import { ImageInvalidator } from '../src/image-invalidator'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
 import { ids } from '../src/lexicon/lexicons'
+import { HOUR } from '@atproto/common'
 
 describe('moderation', () => {
   let network: TestNetwork
@@ -514,6 +515,24 @@ describe('moderation', () => {
       await expect(getRepoLabels(sc.dids.bob)).resolves.toEqual(['kittens'])
     })
 
+    it('creates expiring label', async () => {
+      await emitLabelEvent({
+        createLabelVals: ['temp'],
+        negateLabelVals: [],
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.bob,
+        },
+        durationInHours: 24,
+      })
+      const repo = await getRepo(sc.dids.bob)
+      // Losely check that the expiry date is set to above 23 hours from now
+      expect(
+        `${repo?.labels?.[0].exp}` >
+          new Date(Date.now() + 23 * HOUR).toISOString(),
+      ).toBeTruthy()
+    })
+
     it('does not allow triage moderators to label.', async () => {
       const attemptLabel = modClient.emitEvent(
         {
@@ -708,14 +727,16 @@ describe('moderation', () => {
         subject: ToolsOzoneModerationEmitEvent.InputSchema['subject']
         createLabelVals: ModEventLabel['createLabelVals']
         negateLabelVals: ModEventLabel['negateLabelVals']
+        durationInHours?: ModEventLabel['durationInHours']
       },
     ) {
-      const { createLabelVals, negateLabelVals } = opts
+      const { createLabelVals, negateLabelVals, durationInHours } = opts
       const result = await modClient.emitEvent({
         event: {
           $type: 'tools.ozone.moderation.defs#modEventLabel',
           createLabelVals,
           negateLabelVals,
+          durationInHours,
         },
         createdBy: 'did:example:admin',
         reason: 'Y',
@@ -740,7 +761,7 @@ describe('moderation', () => {
     }
 
     async function getRecordLabels(uri: string) {
-      const result = await agent.api.tools.ozone.moderation.getRecord(
+      const result = await agent.tools.ozone.moderation.getRecord(
         { uri },
         {
           headers: await network.ozone.modHeaders(
@@ -752,8 +773,8 @@ describe('moderation', () => {
       return labels.map((l) => l.val)
     }
 
-    async function getRepoLabels(did: string) {
-      const result = await agent.api.tools.ozone.moderation.getRepo(
+    async function getRepo(did: string) {
+      const result = await agent.tools.ozone.moderation.getRepo(
         { did },
         {
           headers: await network.ozone.modHeaders(
@@ -761,7 +782,12 @@ describe('moderation', () => {
           ),
         },
       )
-      const labels = result.data.labels ?? []
+      return result.data
+    }
+
+    async function getRepoLabels(did: string) {
+      const result = await getRepo(did)
+      const labels = result.labels ?? []
       return labels.map((l) => l.val)
     }
   })