Allow filtering moderation queue by language (#2161)

* ✨ Store languages on subjects from record data * ✨ Fetch lang from author feed for repo subject * ✨ Regenerate lex * ✨ Add lang to profile subject * ✨ Move lang to flag * ✨ Add comment to flag event * ✅ Update pds test snapshot * 🐛 Fix broken import * ✨ Rename flag to tag * ✅ Update snapshot for event by id * ✅ Bring back skipped test * ✨ Move tags to dedicated columns * ✅ Update test snapshots, use logger * ✨ Change lang:unknown to lang:und * ✅ Update test snapshots * 🧹 Cleanup * ✨ Add filter params for tags on queryModerationEvents endpoint * ✨ Add tags property to subject status model * ✅ Update test code * ✨ Add filter to get subjects that do not have certain tags
bluesky-social · Feb 19, 2024 · d815732 · d815732
1 parent 6e6b94b
commit d815732
Show file tree

Hide file tree

Showing 52 changed files with 1,031 additions and 69 deletions.
diff --git a/lexicons/com/atproto/admin/defs.json b/lexicons/com/atproto/admin/defs.json
@@ -185,6 +185,10 @@
         "suspendUntil": {
           "type": "string",
           "format": "datetime"
+        },
+        "tags": {
+          "type": "array",
+          "items": { "type": "string" }
         }
       }
     },
@@ -587,6 +591,27 @@
         }
       }
     },
+    "modEventTag": {
+      "type": "object",
+      "description": "Add/Remove a tag on a subject",
+      "required": ["add", "remove"],
+      "properties": {
+        "add": {
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "Tags to be added to the subject. If already exists, won't be duplicated."
+        },
+        "remove": {
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated."
+        },
+        "comment": {
+          "type": "string",
+          "description": "Additional comment about added/removed tags."
+        }
+      }
+    },
     "communicationTemplateView": {
       "type": "object",
       "required": [

diff --git a/lexicons/com/atproto/admin/emitModerationEvent.json b/lexicons/com/atproto/admin/emitModerationEvent.json
@@ -23,7 +23,8 @@
                 "com.atproto.admin.defs#modEventMute",
                 "com.atproto.admin.defs#modEventReverseTakedown",
                 "com.atproto.admin.defs#modEventUnmute",
-                "com.atproto.admin.defs#modEventEmail"
+                "com.atproto.admin.defs#modEventEmail",
+                "com.atproto.admin.defs#modEventTag"
               ]
             },
             "subject": {

diff --git a/lexicons/com/atproto/admin/queryModerationEvents.json b/lexicons/com/atproto/admin/queryModerationEvents.json
@@ -63,6 +63,16 @@
             "items": { "type": "string" },
             "description": "If specified, only events where all of these labels were removed are returned"
           },
+          "addedTags": {
+            "type": "array",
+            "items": { "type": "string" },
+            "description": "If specified, only events where all of these tags were added are returned"
+          },
+          "removedTags": {
+            "type": "array",
+            "items": { "type": "string" },
+            "description": "If specified, only events where all of these tags were removed are returned"
+          },
           "reportTypes": {
             "type": "array",
             "items": {

diff --git a/lexicons/com/atproto/admin/queryModerationStatuses.json b/lexicons/com/atproto/admin/queryModerationStatuses.json
@@ -74,6 +74,14 @@
             "maximum": 100,
             "default": 50
           },
+          "tags": {
+            "type": "array",
+            "items": { "type": "string" }
+          },
+          "excludeTags": {
+            "type": "array",
+            "items": { "type": "string" }
+          },
           "cursor": { "type": "string" }
         }
       },

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -303,6 +303,12 @@ export const schemaDict = {
             type: 'string',
             format: 'datetime',
           },
+          tags: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
         },
       },
       reportViewDetail: {
@@ -897,6 +903,33 @@ export const schemaDict = {
           },
         },
       },
+      modEventTag: {
+        type: 'object',
+        description: 'Add/Remove a tag on a subject',
+        required: ['add', 'remove'],
+        properties: {
+          add: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            description:
+              "Tags to be added to the subject. If already exists, won't be duplicated.",
+          },
+          remove: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            description:
+              "Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated.",
+          },
+          comment: {
+            type: 'string',
+            description: 'Additional comment about added/removed tags.',
+          },
+        },
+      },
       communicationTemplateView: {
         type: 'object',
         required: [
@@ -1075,6 +1108,7 @@ export const schemaDict = {
                   'lex:com.atproto.admin.defs#modEventReverseTakedown',
                   'lex:com.atproto.admin.defs#modEventUnmute',
                   'lex:com.atproto.admin.defs#modEventEmail',
+                  'lex:com.atproto.admin.defs#modEventTag',
                 ],
               },
               subject: {
@@ -1503,6 +1537,22 @@ export const schemaDict = {
               description:
                 'If specified, only events where all of these labels were removed are returned',
             },
+            addedTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these tags were added are returned',
+            },
+            removedTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these tags were removed are returned',
+            },
             reportTypes: {
               type: 'array',
               items: {
@@ -1620,6 +1670,18 @@ export const schemaDict = {
               maximum: 100,
               default: 50,
             },
+            tags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+            excludeTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             cursor: {
               type: 'string',
             },

diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -156,6 +156,7 @@ export interface SubjectStatusView {
   /** True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators. */
   appealed?: boolean
   suspendUntil?: string
+  tags?: string[]
   [k: string]: unknown
 }
 
@@ -720,6 +721,29 @@ export function validateModEventEmail(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#modEventEmail', v)
 }
 
+/** Add/Remove a tag on a subject */
+export interface ModEventTag {
+  /** Tags to be added to the subject. If already exists, won't be duplicated. */
+  add: string[]
+  /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
+  remove: string[]
+  /** Additional comment about added/removed tags. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventTag(v: unknown): v is ModEventTag {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventTag'
+  )
+}
+
+export function validateModEventTag(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventTag', v)
+}
+
 export interface CommunicationTemplateView {
   id: string
   /** Name of the template. */

diff --git a/packages/api/src/client/types/com/atproto/admin/emitModerationEvent.ts b/packages/api/src/client/types/com/atproto/admin/emitModerationEvent.ts
@@ -23,6 +23,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.ModEventReverseTakedown
     | ComAtprotoAdminDefs.ModEventUnmute
     | ComAtprotoAdminDefs.ModEventEmail
+    | ComAtprotoAdminDefs.ModEventTag
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef

diff --git a/packages/api/src/client/types/com/atproto/admin/queryModerationEvents.ts b/packages/api/src/client/types/com/atproto/admin/queryModerationEvents.ts
@@ -30,6 +30,10 @@ export interface QueryParams {
   addedLabels?: string[]
   /** If specified, only events where all of these labels were removed are returned */
   removedLabels?: string[]
+  /** If specified, only events where all of these tags were added are returned */
+  addedTags?: string[]
+  /** If specified, only events where all of these tags were removed are returned */
+  removedTags?: string[]
   reportTypes?: string[]
   cursor?: string
 }

diff --git a/packages/api/src/client/types/com/atproto/admin/queryModerationStatuses.ts b/packages/api/src/client/types/com/atproto/admin/queryModerationStatuses.ts
@@ -34,6 +34,8 @@ export interface QueryParams {
   /** Get subjects in unresolved appealed status */
   appealed?: boolean
   limit?: number
+  tags?: string[]
+  excludeTags?: string[]
   cursor?: string
 }
 

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -303,6 +303,12 @@ export const schemaDict = {
             type: 'string',
             format: 'datetime',
           },
+          tags: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
         },
       },
       reportViewDetail: {
@@ -897,6 +903,33 @@ export const schemaDict = {
           },
         },
       },
+      modEventTag: {
+        type: 'object',
+        description: 'Add/Remove a tag on a subject',
+        required: ['add', 'remove'],
+        properties: {
+          add: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            description:
+              "Tags to be added to the subject. If already exists, won't be duplicated.",
+          },
+          remove: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            description:
+              "Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated.",
+          },
+          comment: {
+            type: 'string',
+            description: 'Additional comment about added/removed tags.',
+          },
+        },
+      },
       communicationTemplateView: {
         type: 'object',
         required: [
@@ -1075,6 +1108,7 @@ export const schemaDict = {
                   'lex:com.atproto.admin.defs#modEventReverseTakedown',
                   'lex:com.atproto.admin.defs#modEventUnmute',
                   'lex:com.atproto.admin.defs#modEventEmail',
+                  'lex:com.atproto.admin.defs#modEventTag',
                 ],
               },
               subject: {
@@ -1503,6 +1537,22 @@ export const schemaDict = {
               description:
                 'If specified, only events where all of these labels were removed are returned',
             },
+            addedTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these tags were added are returned',
+            },
+            removedTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these tags were removed are returned',
+            },
             reportTypes: {
               type: 'array',
               items: {
@@ -1620,6 +1670,18 @@ export const schemaDict = {
               maximum: 100,
               default: 50,
             },
+            tags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+            excludeTags: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             cursor: {
               type: 'string',
             },

diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -156,6 +156,7 @@ export interface SubjectStatusView {
   /** True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators. */
   appealed?: boolean
   suspendUntil?: string
+  tags?: string[]
   [k: string]: unknown
 }
 
@@ -720,6 +721,29 @@ export function validateModEventEmail(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#modEventEmail', v)
 }
 
+/** Add/Remove a tag on a subject */
+export interface ModEventTag {
+  /** Tags to be added to the subject. If already exists, won't be duplicated. */
+  add: string[]
+  /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
+  remove: string[]
+  /** Additional comment about added/removed tags. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventTag(v: unknown): v is ModEventTag {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventTag'
+  )
+}
+
+export function validateModEventTag(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventTag', v)
+}
+
 export interface CommunicationTemplateView {
   id: string
   /** Name of the template. */

diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/emitModerationEvent.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/emitModerationEvent.ts
@@ -24,6 +24,7 @@ export interface InputSchema {
     | ComAtprotoAdminDefs.ModEventReverseTakedown
     | ComAtprotoAdminDefs.ModEventUnmute
     | ComAtprotoAdminDefs.ModEventEmail
+    | ComAtprotoAdminDefs.ModEventTag
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef

diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/queryModerationEvents.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/queryModerationEvents.ts
@@ -31,6 +31,10 @@ export interface QueryParams {
   addedLabels?: string[]
   /** If specified, only events where all of these labels were removed are returned */
   removedLabels?: string[]
+  /** If specified, only events where all of these tags were added are returned */
+  addedTags?: string[]
+  /** If specified, only events where all of these tags were removed are returned */
+  removedTags?: string[]
   reportTypes?: string[]
   cursor?: string
 }