✨ Optionally ack all open subjects from the author with takedown even…

…t and get all mod subjects of a user (bluesky-social#2793) * ✨ Add acknowledgeAllSubjectsOfAccount flag with takedown event * 📝 better documentation of forAccount and subject params * 🧹 Cleanup tests * ✨ Change wording according to review * ✅ Refactor tests * ♻️ Rename acknowledge flag
andypeng2015 · Sep 11, 2024 · 62a8225 · 62a8225
1 parent 98711a1
commit 62a8225
Show file tree

Hide file tree

Showing 17 changed files with 291 additions and 11 deletions.
diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
@@ -210,6 +210,10 @@
         "durationInHours": {
           "type": "integer",
           "description": "Indicates how long the takedown should be in effect before automatically expiring."
+        },
+        "acknowledgeAccountSubjects": {
+          "type": "boolean",
+          "description": "If true, all other reports on content authored by this account will be resolved (acknowledged)."
         }
       }
     },

diff --git a/lexicons/tools/ozone/moderation/queryStatuses.json b/lexicons/tools/ozone/moderation/queryStatuses.json
@@ -8,7 +8,15 @@
       "parameters": {
         "type": "params",
         "properties": {
-          "subject": { "type": "string", "format": "uri" },
+          "includeAllUserRecords": {
+            "type": "boolean",
+            "description": "All subjects belonging to the account specified in the 'subject' param will be returned."
+          },
+          "subject": {
+            "type": "string",
+            "format": "uri",
+            "description": "The subject to get the status for."
+          },
           "comment": {
             "type": "string",
             "description": "Search subjects by keyword from comments"
@@ -47,7 +55,10 @@
           },
           "ignoreSubjects": {
             "type": "array",
-            "items": { "type": "string", "format": "uri" }
+            "items": {
+              "type": "string",
+              "format": "uri"
+            }
           },
           "lastReviewedBy": {
             "type": "string",
@@ -80,13 +91,19 @@
           },
           "tags": {
             "type": "array",
-            "items": { "type": "string" }
+            "items": {
+              "type": "string"
+            }
           },
           "excludeTags": {
             "type": "array",
-            "items": { "type": "string" }
+            "items": {
+              "type": "string"
+            }
           },
-          "cursor": { "type": "string" }
+          "cursor": {
+            "type": "string"
+          }
         }
       },
       "output": {
@@ -95,7 +112,9 @@
           "type": "object",
           "required": ["subjectStatuses"],
           "properties": {
-            "cursor": { "type": "string" },
+            "cursor": {
+              "type": "string"
+            },
             "subjectStatuses": {
               "type": "array",
               "items": {

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -10920,6 +10920,11 @@ export const schemaDict = {
             description:
               'Indicates how long the takedown should be in effect before automatically expiring.',
           },
+          acknowledgeAccountSubjects: {
+            type: 'boolean',
+            description:
+              'If true, all other reports on content authored by this account will be resolved (acknowledged).',
+          },
         },
       },
       modEventReverseTakedown: {
@@ -11731,9 +11736,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            includeAllUserRecords: {
+              type: 'boolean',
+              description:
+                "All subjects belonging to the account specified in the 'subject' param will be returned.",
+            },
             subject: {
               type: 'string',
               format: 'uri',
+              description: 'The subject to get the status for.',
             },
             comment: {
               type: 'string',

diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -162,6 +162,8 @@ export interface ModEventTakedown {
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
+  /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
+  acknowledgeAccountSubjects?: boolean
   [k: string]: unknown
 }
 

diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -9,6 +9,9 @@ import { CID } from 'multiformats/cid'
 import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
+  /** All subjects belonging to the account specified in the 'subject' param will be returned. */
+  includeAllUserRecords?: boolean
+  /** The subject to get the status for. */
   subject?: string
   /** Search subjects by keyword from comments */
   comment?: string

diff --git a/packages/dev-env/src/moderator-client.ts b/packages/dev-env/src/moderator-client.ts
@@ -119,15 +119,17 @@ export class ModeratorClient {
       subject: TakeActionInput['subject']
       subjectBlobCids?: TakeActionInput['subjectBlobCids']
       durationInHours?: number
+      acknowledgeAccountSubjects?: boolean
       reason?: string
     },
     role?: ModLevel,
   ) {
-    const { durationInHours, ...rest } = opts
+    const { durationInHours, acknowledgeAccountSubjects, ...rest } = opts
     return this.emitEvent(
       {
         event: {
           $type: 'tools.ozone.moderation.defs#modEventTakedown',
+          acknowledgeAccountSubjects,
           durationInHours,
         },
         ...rest,

diff --git a/packages/ozone/src/api/moderation/emitEvent.ts b/packages/ozone/src/api/moderation/emitEvent.ts
@@ -162,6 +162,10 @@ const handleModerationEvent = async ({
       }
     }
 
+    if (isTakedownEvent && result.event.meta?.acknowledgeAccountSubjects) {
+      await moderationTxn.resolveSubjectsForAccount(subject.did, createdBy)
+    }
+
     if (isLabelEvent) {
       await moderationTxn.formatAndCreateLabels(
         result.event.subjectUri ?? result.event.subjectDid,

diff --git a/packages/ozone/src/api/moderation/queryStatuses.ts b/packages/ozone/src/api/moderation/queryStatuses.ts
@@ -7,6 +7,7 @@ export default function (server: Server, ctx: AppContext) {
     auth: ctx.authVerifier.modOrAdminToken,
     handler: async ({ params }) => {
       const {
+        includeAllUserRecords,
         subject,
         takendown,
         appealed,
@@ -30,6 +31,7 @@ export default function (server: Server, ctx: AppContext) {
       const modService = ctx.modService(db)
       const results = await modService.getSubjectStatuses({
         reviewState: getReviewState(reviewState),
+        includeAllUserRecords,
         subject,
         takendown,
         appealed,

diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
@@ -10920,6 +10920,11 @@ export const schemaDict = {
             description:
               'Indicates how long the takedown should be in effect before automatically expiring.',
           },
+          acknowledgeAccountSubjects: {
+            type: 'boolean',
+            description:
+              'If true, all other reports on content authored by this account will be resolved (acknowledged).',
+          },
         },
       },
       modEventReverseTakedown: {
@@ -11731,9 +11736,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            includeAllUserRecords: {
+              type: 'boolean',
+              description:
+                "All subjects belonging to the account specified in the 'subject' param will be returned.",
+            },
             subject: {
               type: 'string',
               format: 'uri',
+              description: 'The subject to get the status for.',
             },
             comment: {
               type: 'string',

diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -162,6 +162,8 @@ export interface ModEventTakedown {
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
+  /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
+  acknowledgeAccountSubjects?: boolean
   [k: string]: unknown
 }
 

diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -10,6 +10,9 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
+  /** All subjects belonging to the account specified in the 'subject' param will be returned. */
+  includeAllUserRecords?: boolean
+  /** The subject to get the status for. */
   subject?: string
   /** Search subjects by keyword from comments */
   comment?: string

diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
@@ -3,7 +3,7 @@ import { Insertable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { addHoursToDate } from '@atproto/common'
+import { addHoursToDate, chunkArray } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
 import { AtpAgent } from '@atproto/api'
@@ -18,6 +18,8 @@ import {
   isModEventTakedown,
   isModEventEmail,
   isModEventTag,
+  REVIEWESCALATED,
+  REVIEWOPEN,
 } from '../lexicon/types/tools/ozone/moderation/defs'
 import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
 import {
@@ -279,6 +281,52 @@ export class ModerationService {
     return await builder.execute()
   }
 
+  async resolveSubjectsForAccount(did: string, createdBy: string) {
+    const subjectsToBeResolved = await this.db.db
+      .selectFrom('moderation_subject_status')
+      .where('did', '=', did)
+      .where('recordPath', '!=', '')
+      .where('reviewState', 'in', [REVIEWESCALATED, REVIEWOPEN])
+      .selectAll()
+      .execute()
+
+    if (subjectsToBeResolved.length === 0) {
+      return
+    }
+
+    // Process subjects in chunks of 100 since each of these will trigger multiple db queries
+    for (const subjects of chunkArray(subjectsToBeResolved, 100)) {
+      await Promise.all(
+        subjects.map(async (subject) => {
+          const eventData = {
+            createdBy,
+            subject: subjectFromStatusRow(subject),
+          }
+          // For consistency's sake, when acknowledging appealed subjects, we should first resolve the appeal
+          if (subject.appealed) {
+            await this.logEvent({
+              event: {
+                $type: 'tools.ozone.moderation.defs#modEventResolveAppeal',
+                comment:
+                  '[AUTO_RESOLVE_FOR_TAKENDOWN_ACCOUNT]: Automatically resolving all appealed content for a takendown account',
+              },
+              ...eventData,
+            })
+          }
+
+          await this.logEvent({
+            event: {
+              $type: 'tools.ozone.moderation.defs#modEventAcknowledge',
+              comment:
+                '[AUTO_RESOLVE_FOR_TAKENDOWN_ACCOUNT]: Automatically resolving all reported content for a takendown account',
+            },
+            ...eventData,
+          })
+        }),
+      )
+    }
+  }
+
   async logEvent(info: {
     event: ModEventType
     subject: ModSubject
@@ -320,6 +368,10 @@ export class ModerationService {
       }
     }
 
+    if (isModEventTakedown(event) && event.acknowledgeAccountSubjects) {
+      meta.acknowledgeAccountSubjects = true
+    }
+
     // Keep trace of reports that came in while the reporter was in muted stated
     if (isModEventReport(event)) {
       const isReportingMuted = await this.isReportingMutedForSubject(createdBy)
@@ -677,6 +729,7 @@ export class ModerationService {
   }
 
   async getSubjectStatuses({
+    includeAllUserRecords,
     cursor,
     limit = 50,
     takendown,
@@ -696,6 +749,7 @@ export class ModerationService {
     tags,
     excludeTags,
   }: {
+    includeAllUserRecords?: boolean
     cursor?: string
     limit?: number
     takendown?: boolean
@@ -720,13 +774,19 @@ export class ModerationService {
 
     if (subject) {
       const subjectInfo = getStatusIdentifierFromSubject(subject)
-      builder = builder
-        .where('moderation_subject_status.did', '=', subjectInfo.did)
-        .where((qb) =>
+      builder = builder.where(
+        'moderation_subject_status.did',
+        '=',
+        subjectInfo.did,
+      )
+
+      if (!includeAllUserRecords) {
+        builder = builder.where((qb) =>
           subjectInfo.recordPath
             ? qb.where('recordPath', '=', subjectInfo.recordPath)
             : qb.where('recordPath', '=', ''),
         )
+      }
     }
 
     if (ignoreSubjects?.length) {

diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
@@ -122,6 +122,16 @@ export class ModerationViews {
       }
     }
 
+    if (
+      event.action === 'tools.ozone.moderation.defs#modEventTakedown' &&
+      event.meta?.acknowledgeAccountSubjects
+    ) {
+      eventView.event = {
+        ...eventView.event,
+        acknowledgeAccountSubjects: event.meta?.acknowledgeAccountSubjects,
+      }
+    }
+
     if (event.action === 'tools.ozone.moderation.defs#modEventLabel') {
       eventView.event = {
         ...eventView.event,