@atproto/ozone 0.1.9 → 0.1.11

package/src/mod-service/status.ts

@@ -57,6 +57,15 @@ const getSubjectStatusForModerationEvent = ({
         suspendUntil: null,
         lastReviewedAt: createdAt,
       }
+    case 'tools.ozone.moderation.defs#modEventUnmuteReporter':
+      return {
+        lastReviewedBy: createdBy,
+        muteReportingUntil: null,
+        // It's not likely to receive an unmute event that does not already have a status row
+        // but if it does happen, default to unnecessary
+        reviewState: defaultReviewState,
+        lastReviewedAt: createdAt,
+      }
     case 'tools.ozone.moderation.defs#modEventUnmute':
       return {
         lastReviewedBy: createdBy,
@@ -76,6 +85,18 @@ const getSubjectStatusForModerationEvent = ({
           ? new Date(Date.now() + durationInHours * HOUR).toISOString()
           : null,
       }
+    case 'tools.ozone.moderation.defs#modEventMuteReporter':
+      return {
+        lastReviewedBy: createdBy,
+        lastReviewedAt: createdAt,
+        // By default, mute for 24hrs
+        muteReportingUntil: new Date(
+          Date.now() + (durationInHours || 24) * HOUR,
+        ).toISOString(),
+        // It's not likely to receive a mute event on a subject that does not already have a status row
+        // but if it does happen, default to unnecessary
+        reviewState: defaultReviewState,
+      }
     case 'tools.ozone.moderation.defs#modEventMute':
       return {
         lastReviewedBy: createdBy,
@@ -140,6 +161,11 @@ export const adjustModerationSubjectStatus = async (
     .selectAll()
     .executeTakeFirst()
 
+  // If reporting is muted for this reporter, we don't want to update the subject status
+  if (meta?.isReporterMuted) {
+    return currentStatus || null
+  }
+
   const isAppealEvent =
     action === 'tools.ozone.moderation.defs#modEventReport' &&
     meta?.reportType === REASONAPPEAL

package/src/mod-service/views.ts

@@ -108,6 +108,7 @@ export class ModerationViews {
 
     if (
       [
+        'tools.ozone.moderation.defs#modEventMuteReporter',
         'tools.ozone.moderation.defs#modEventTakedown',
         'tools.ozone.moderation.defs#modEventMute',
       ].includes(event.action)
@@ -157,6 +158,7 @@ export class ModerationViews {
       eventView.event = {
         ...eventView.event,
         reportType: event.meta?.reportType ?? undefined,
+        isReporterMuted: !!event.meta?.isReporterMuted,
       }
     }
 
@@ -500,6 +502,7 @@ export class ModerationViews {
       lastReportedAt: status.lastReportedAt ?? undefined,
       lastAppealedAt: status.lastAppealedAt ?? undefined,
       muteUntil: status.muteUntil ?? undefined,
+      muteReportingUntil: status.muteReportingUntil ?? undefined,
       suspendUntil: status.suspendUntil ?? undefined,
       takendown: status.takendown ?? undefined,
       appealed: status.appealed ?? undefined,

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

@@ -42,7 +42,7 @@ Object {
       "subjectBlobCids": Array [],
       "subjectRepoHandle": "alice.test",
       "tags": Array [
-        "lang:und",
+        "lang:en",
       ],
       "takendown": true,
       "updatedAt": "1970-01-01T00:00:00.000Z",
@@ -141,7 +141,7 @@ Object {
       "subjectBlobCids": Array [],
       "subjectRepoHandle": "alice.test",
       "tags": Array [
-        "lang:und",
+        "lang:en",
       ],
       "takendown": true,
       "updatedAt": "1970-01-01T00:00:00.000Z",

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

@@ -7,6 +7,7 @@ Object {
   "event": Object {
     "$type": "tools.ozone.moderation.defs#modEventReport",
     "comment": "X",
+    "isReporterMuted": false,
     "reportType": "com.atproto.moderation.defs#reasonMisleading",
   },
   "id": 1,
@@ -77,6 +78,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
     "id": 11,
@@ -113,6 +115,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
     "id": 5,
@@ -135,6 +138,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
     "id": 10,
@@ -152,7 +156,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
-        "lang:und",
+        "lang:en",
       ],
       "remove": Array [],
     },
@@ -172,6 +176,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
     "id": 3,

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

@@ -94,7 +94,7 @@ Array [
     "subjectBlobCids": Array [],
     "subjectRepoHandle": "alice.test",
     "tags": Array [
-      "lang:und",
+      "lang:ha",
     ],
     "takendown": false,
     "updatedAt": "1970-01-01T00:00:00.000Z",

package/tests/lang.test.ts

@@ -0,0 +1,109 @@
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+import AtpAgent from '@atproto/api'
+import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
+
+describe('moderation status language tagging', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_blob_divert_test',
+      ozone: {
+        blobDivertUrl: `https://blob-report.com`,
+        blobDivertAdminPassword: 'test-auth-token',
+      },
+    })
+    agent = network.pds.getClient()
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const getStatus = async (subject: string) => {
+    const { subjectStatuses } = await modClient.queryStatuses({
+      subject,
+    })
+
+    return subjectStatuses[0]
+  }
+
+  it('Adds language tag to post from text', async () => {
+    const createPostAndReport = async (text: string) => {
+      const post = await sc.post(sc.dids.carol, text)
+      await network.processAll()
+      const report = await sc.createReport({
+        reasonType: REASONSPAM,
+        subject: {
+          $type: 'com.atproto.repo.strongRef',
+          uri: post.ref.uriStr,
+          cid: post.ref.cidStr,
+        },
+        reportedBy: sc.dids.alice,
+      })
+
+      return { post, report }
+    }
+    const [japanesePost, greekPost] = await Promise.all([
+      createPostAndReport('Xで有名な人達＋反AIや絵描きによくない'),
+      createPostAndReport(
+        'Λορεμ ιπσθμ δολορ σιτ αμετ, μει θτ vιδιτ νοστρθμ προπριαε',
+      ),
+    ])
+
+    const [japanesePostStatus, greekPostStatus] = await Promise.all([
+      getStatus(japanesePost.post.ref.uriStr),
+      getStatus(greekPost.post.ref.uriStr),
+    ])
+
+    expect(japanesePostStatus.tags).toContain('lang:ja')
+    expect(greekPostStatus.tags).toContain('lang:el')
+  })
+
+  it('Uses name/description text for language tag for list', async () => {
+    const createListAndReport = async (name: string, description?: string) => {
+      const list = await sc.createList(sc.dids.carol, name, 'mod', {
+        description,
+      })
+      await network.processAll()
+      const report = await sc.createReport({
+        reasonType: REASONSPAM,
+        subject: {
+          $type: 'com.atproto.repo.strongRef',
+          uri: list.uriStr,
+          cid: list.cidStr,
+        },
+        reportedBy: sc.dids.alice,
+      })
+      return { list, report }
+    }
+
+    const [listWithDescription, listWithoutDescription] = await Promise.all([
+      createListAndReport(
+        'よくない',
+        'Xで有名な人達＋反AIや絵描きによくない感情を持つ人達＋絵描き詐称',
+      ),
+      createListAndReport('人達＋反AIや絵描きによくない感情'),
+    ])
+
+    const [japaneseListStatus, chineseListStatus] = await Promise.all([
+      getStatus(listWithDescription.list.uriStr),
+      getStatus(listWithoutDescription.list.uriStr),
+    ])
+
+    expect(japaneseListStatus.tags).toContain('lang:ja')
+    expect(chineseListStatus.tags).toContain('lang:ja')
+  })
+})

package/tests/report-muting.test.ts

@@ -0,0 +1,100 @@
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import {
+  ComAtprotoModerationDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
+import {
+  REVIEWNONE,
+  REVIEWOPEN,
+} from '../src/lexicon/types/tools/ozone/moderation/defs'
+
+describe('report-muting', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_report_muting',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const assertSubjectStatus = async (
+    subject: string,
+    status?: string,
+  ): Promise<ToolsOzoneModerationDefs.SubjectStatusView | undefined> => {
+    const res = await modClient.queryStatuses({
+      subject,
+    })
+    expect(res.subjectStatuses[0]?.reviewState).toEqual(status)
+    return res.subjectStatuses[0]
+  }
+
+  it('does not change reviewState when muted reporter reports', async () => {
+    const bobsPostSubject = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][1].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][1].ref.cidStr,
+    }
+    const carolsAccountSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.carol,
+    }
+
+    await modClient.emitEvent({
+      event: {
+        $type: 'tools.ozone.moderation.defs#modEventMuteReporter',
+        durationInHours: 24,
+      },
+      subject: carolsAccountSubject,
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+      reason: 'misleading',
+      subject: bobsPostSubject,
+    })
+
+    // Verify that a subject status was not created for bob's post since the reporter was muted
+    await assertSubjectStatus(bobsPostSubject.uri, undefined)
+    // Verify, however, that the event was logged
+    await modClient.queryEvents({
+      subject: bobsPostSubject.uri,
+    })
+
+    // Verify that reporting mute duration is stored for the reporter
+    const carolsStatus = await assertSubjectStatus(sc.dids.carol, REVIEWNONE)
+    expect(
+      new Date(`${carolsStatus?.muteReportingUntil}`).getTime(),
+    ).toBeGreaterThan(Date.now())
+
+    await modClient.emitEvent({
+      event: {
+        $type: 'tools.ozone.moderation.defs#modEventUnmuteReporter',
+      },
+      subject: carolsAccountSubject,
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+      reason: 'misleading',
+      subject: bobsPostSubject,
+    })
+
+    // Verify that a subject status was created for bob's post since the reporter was no longer muted
+    await assertSubjectStatus(bobsPostSubject.uri, REVIEWOPEN)
+  })
+})