Merge remote-tracking branch 'origin/moderation-api-v2' into multi-pd…

…s-auth-moderation-api-v2
bluesky-social · Nov 28, 2023 · 32a65a6 · 32a65a6
2 parents eeaf684 + 0697ffc
commit 32a65a6
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 2 deletions.
diff --git a/lexicons/com/atproto/admin/defs.json b/lexicons/com/atproto/admin/defs.json
@@ -450,6 +450,9 @@
       "type": "object",
       "description": "Take down a subject permanently or temporarily",
       "properties": {
+        "comment": {
+          "type": "string"
+        },
         "durationInHours": {
           "type": "integer",
           "description": "Indicates how long the takedown should be in effect before automatically expiring."
@@ -499,6 +502,9 @@
       "description": "Apply/Negate labels on a subject",
       "required": ["createLabelVals", "negateLabelVals"],
       "properties": {
+        "comment": {
+          "type": "string"
+        },
         "createLabelVals": {
           "type": "array",
           "items": { "type": "string" }

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -697,6 +697,9 @@ export const schemaDict = {
         type: 'object',
         description: 'Take down a subject permanently or temporarily',
         properties: {
+          comment: {
+            type: 'string',
+          },
           durationInHours: {
             type: 'integer',
             description:
@@ -747,6 +750,9 @@ export const schemaDict = {
         description: 'Apply/Negate labels on a subject',
         required: ['createLabelVals', 'negateLabelVals'],
         properties: {
+          comment: {
+            type: 'string',
+          },
           createLabelVals: {
             type: 'array',
             items: {

diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -499,6 +499,7 @@ export const REVIEWCLOSED = 'com.atproto.admin.defs#reviewClosed'
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   [k: string]: unknown
@@ -578,6 +579,7 @@ export function validateModEventReport(v: unknown): ValidationResult {
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   [k: string]: unknown

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -697,6 +697,9 @@ export const schemaDict = {
         type: 'object',
         description: 'Take down a subject permanently or temporarily',
         properties: {
+          comment: {
+            type: 'string',
+          },
           durationInHours: {
             type: 'integer',
             description:
@@ -747,6 +750,9 @@ export const schemaDict = {
         description: 'Apply/Negate labels on a subject',
         required: ['createLabelVals', 'negateLabelVals'],
         properties: {
+          comment: {
+            type: 'string',
+          },
           createLabelVals: {
             type: 'array',
             items: {

diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -499,6 +499,7 @@ export const REVIEWCLOSED = 'com.atproto.admin.defs#reviewClosed'
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   [k: string]: unknown
@@ -578,6 +579,7 @@ export function validateModEventReport(v: unknown): ValidationResult {
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   [k: string]: unknown

diff --git a/packages/bsky/src/services/moderation/index.ts b/packages/bsky/src/services/moderation/index.ts
@@ -341,7 +341,7 @@ export class ModerationService {
         $type: isRevertingTakedown
           ? 'com.atproto.admin.defs#modEventReverseTakedown'
           : 'com.atproto.admin.defs#modEventUnmute',
-        comment,
+        comment: comment ?? undefined,
       },
       createdAt,
       createdBy,
@@ -513,7 +513,7 @@ export class ModerationService {
       event: {
         $type: 'com.atproto.admin.defs#modEventReport',
         reportType: reasonType,
-        comment: reason || null,
+        comment: reason,
       },
       createdBy: reportedBy,
       subject,

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -697,6 +697,9 @@ export const schemaDict = {
         type: 'object',
         description: 'Take down a subject permanently or temporarily',
         properties: {
+          comment: {
+            type: 'string',
+          },
           durationInHours: {
             type: 'integer',
             description:
@@ -747,6 +750,9 @@ export const schemaDict = {
         description: 'Apply/Negate labels on a subject',
         required: ['createLabelVals', 'negateLabelVals'],
         properties: {
+          comment: {
+            type: 'string',
+          },
           createLabelVals: {
             type: 'array',
             items: {

diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
@@ -499,6 +499,7 @@ export const REVIEWCLOSED = 'com.atproto.admin.defs#reviewClosed'
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
   [k: string]: unknown
@@ -578,6 +579,7 @@ export function validateModEventReport(v: unknown): ValidationResult {
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   [k: string]: unknown