@atproto/ozone 0.1.73 → 0.1.75

package/tests/moderation-statuses.test.ts

@@ -1,23 +1,23 @@
 import assert from 'node:assert'
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ToolsOzoneModerationDefs,
   ToolsOzoneModerationQueryStatuses,
 } from '@atproto/api'
-import { forSnapshot } from './_util'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import {
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import {
-  REVIEWOPEN,
   REVIEWNONE,
+  REVIEWOPEN,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
+import { forSnapshot } from './_util'
 
 describe('moderation-statuses', () => {
   let network: TestNetwork

package/tests/moderation.test.ts

@@ -1,15 +1,18 @@
+import { AtpAgent, ToolsOzoneModerationEmitEvent } from '@atproto/api'
+import { HOUR } from '@atproto/common'
 import {
-  TestNetwork,
-  TestOzone,
   ImageRef,
+  ModeratorClient,
   RecordRef,
   SeedClient,
+  TestNetwork,
+  TestOzone,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent, ToolsOzoneModerationEmitEvent } from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
-import { forSnapshot } from './_util'
+import { EventReverser } from '../src'
+import { ImageInvalidator } from '../src/image-invalidator'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONMISLEADING,
   REASONOTHER,
@@ -20,10 +23,8 @@ import {
   REVIEWCLOSED,
   REVIEWESCALATED,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
-import { EventReverser } from '../src'
-import { ImageInvalidator } from '../src/image-invalidator'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
-import { ids } from '../src/lexicon/lexicons'
+import { forSnapshot } from './_util'
 
 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)
     }
   })

package/tests/protected-tags.test.ts

@@ -1,14 +1,14 @@
 import {
-  TestNetwork,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { ProtectedTagSettingKey } from '../src/setting/constants'
 import {
   ROLEADMIN,
   ROLEMODERATOR,
 } from '../dist/lexicon/types/tools/ozone/team/defs'
+import { ProtectedTagSettingKey } from '../src/setting/constants'
 
 describe('protected-tags', () => {
   let network: TestNetwork

package/tests/query-labels.test.ts

@@ -1,15 +1,15 @@
 import { AtpAgent } from '@atproto/api'
+import { cborEncode } from '@atproto/common'
+import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
 import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { DisconnectError, Subscription } from '@atproto/xrpc-server'
 import { ids, lexicons } from '../src/lexicon/lexicons'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
-import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
-import { cborEncode } from '@atproto/common'
-import { ModerationService } from '../src/mod-service'
 import {
   OutputSchema as LabelMessage,
   isLabels,
 } from '../src/lexicon/types/com/atproto/label/subscribeLabels'
+import { ModerationService } from '../src/mod-service'
 import { getSigningKeyId } from '../src/util'
 
 describe('ozone query labels', () => {

package/tests/record-and-account-events.test.ts

@@ -1,15 +1,16 @@
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ComAtprotoModerationDefs,
   ToolsOzoneModerationDefs,
+  ToolsOzoneModerationEmitEvent as EmitModerationEvent,
 } from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import { REVIEWOPEN } from '../src/lexicon/types/tools/ozone/moderation/defs'
-import { ToolsOzoneModerationEmitEvent as EmitModerationEvent } from '@atproto/api'
+
 describe('record and account events on moderation subjects', () => {
   let network: TestNetwork
   let sc: SeedClient

package/tests/repo-search.test.ts

@@ -1,12 +1,12 @@
+import { AtpAgent } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
   TestNetwork,
   usersBulkSeed,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
-import { paginateAll } from './_util'
 import { ids } from '../src/lexicon/lexicons'
+import { paginateAll } from './_util'
 
 describe('admin repo search view', () => {
   let network: TestNetwork

package/tests/report-muting.test.ts

@@ -1,13 +1,13 @@
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ComAtprotoModerationDefs,
   ToolsOzoneModerationDefs,
 } from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import {
   REVIEWNONE,
   REVIEWOPEN,

package/tests/sequencer.test.ts

@@ -1,9 +1,9 @@
-import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { readFromGenerator, wait } from '@atproto/common'
-import { LabelsEvt, Sequencer } from '../src/sequencer'
-import Outbox from '../src/sequencer/outbox'
 import { randomStr } from '@atproto/crypto'
+import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
+import { LabelsEvt, Sequencer } from '../src/sequencer'
+import { Outbox } from '../src/sequencer/outbox'
 
 describe('sequencer', () => {
   let network: TestNetwork

package/tests/server.test.ts

@@ -1,5 +1,5 @@
-import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import express from 'express'
+import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { startServer } from './_util'
 

package/tests/sets.test.ts

@@ -1,10 +1,10 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import AtpAgent, {
   ToolsOzoneSetDefs,
   ToolsOzoneSetQuerySets,
 } from '@atproto/api'
-import { forSnapshot } from './_util'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../src/lexicon/lexicons'
+import { forSnapshot } from './_util'
 
 describe('ozone-sets', () => {
   let network: TestNetwork

package/tests/settings.test.ts

@@ -1,10 +1,10 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import AtpAgent, {
   ToolsOzoneSettingListOptions,
   ToolsOzoneSettingUpsertOption,
 } from '@atproto/api'
-import { ids } from '../src/lexicon/lexicons'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { SettingScope } from '../dist/db/schema/setting'
+import { ids } from '../src/lexicon/lexicons'
 import { forSnapshot } from './_util'
 
 describe('ozone-settings', () => {

package/tests/takedown.test.ts

@@ -1,18 +1,13 @@
 import {
-  TestNetwork,
-  TestOzone,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
 
 describe('moderation', () => {
   let network: TestNetwork
-  let ozone: TestOzone
-  let agent: AtpAgent
-  let bskyAgent: AtpAgent
-  let pdsAgent: AtpAgent
+
   let sc: SeedClient
   let modClient: ModeratorClient
 
@@ -25,10 +20,6 @@ describe('moderation', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_takedown',
     })
-    ozone = network.ozone
-    agent = network.ozone.getClient()
-    bskyAgent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)

package/tests/team.test.ts

@@ -1,5 +1,5 @@
-import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
 
 describe('team management', () => {