✨ Move to appealed boolean state column

bluesky-social · Dec 21, 2023 · 3dfc2e8 · 3dfc2e8
1 parent cb29500
commit 3dfc2e8
Show file tree

Hide file tree

Showing 21 changed files with 260 additions and 97 deletions.
diff --git a/lexicons/com/atproto/admin/defs.json b/lexicons/com/atproto/admin/defs.json
@@ -69,7 +69,8 @@
             "#modEventLabel",
             "#modEventAcknowledge",
             "#modEventEscalate",
-            "#modEventMute"
+            "#modEventMute",
+            "#modEventResolveAppeal"
           ]
         },
         "subject": {
@@ -167,14 +168,18 @@
           "type": "string",
           "format": "datetime"
         },
-        "appealedAt": {
+        "lastAppealedAt": {
           "type": "string",
           "format": "datetime",
           "description": "Timestamp referencing when the owner of the subject appealed a moderation action"
         },
         "takendown": {
           "type": "boolean"
         },
+        "appealed": {
+          "type": "boolean",
+          "description": "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."
+        },
         "suspendUntil": {
           "type": "string",
           "format": "datetime"
@@ -437,12 +442,7 @@
     },
     "subjectReviewState": {
       "type": "string",
-      "knownValues": [
-        "#reviewOpen",
-        "#reviewEscalated",
-        "#reviewClosed",
-        "#reviewAppealed"
-      ]
+      "knownValues": ["#reviewOpen", "#reviewEscalated", "#reviewClosed"]
     },
     "reviewOpen": {
       "type": "token",
@@ -456,10 +456,6 @@
       "type": "token",
       "description": "Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator"
     },
-    "reviewAppealed": {
-      "type": "token",
-      "description": "Moderator review status of a subject: Appealed. Indicates that the a previously taken moderator action was appealed agains, by the author of the content"
-    },
     "modEventTakedown": {
       "type": "object",
       "description": "Take down a subject permanently or temporarily",
@@ -483,6 +479,16 @@
         }
       }
     },
+    "modEventResolveAppeal": {
+      "type": "object",
+      "description": "Resolve appeal on a subject",
+      "properties": {
+        "comment": {
+          "type": "string",
+          "description": "Describe resolution."
+        }
+      }
+    },
     "modEventComment": {
       "type": "object",
       "description": "Add a comment to a subject",

diff --git a/lexicons/com/atproto/admin/queryModerationStatuses.json b/lexicons/com/atproto/admin/queryModerationStatuses.json
@@ -64,6 +64,10 @@
             "type": "boolean",
             "description": "Get subjects that were taken down"
           },
+          "appealed": {
+            "type": "boolean",
+            "description": "Get subjects in unresolved appealed status"
+          },
           "limit": {
             "type": "integer",
             "minimum": 1,

diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
@@ -289,7 +289,6 @@ export const COM_ATPROTO_ADMIN = {
   DefsReviewOpen: 'com.atproto.admin.defs#reviewOpen',
   DefsReviewEscalated: 'com.atproto.admin.defs#reviewEscalated',
   DefsReviewClosed: 'com.atproto.admin.defs#reviewClosed',
-  DefsReviewAppealed: 'com.atproto.admin.defs#reviewAppealed',
 }
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -102,6 +102,7 @@ export const schemaDict = {
               'lex:com.atproto.admin.defs#modEventAcknowledge',
               'lex:com.atproto.admin.defs#modEventEscalate',
               'lex:com.atproto.admin.defs#modEventMute',
+              'lex:com.atproto.admin.defs#modEventResolveAppeal',
             ],
           },
           subject: {
@@ -237,7 +238,7 @@ export const schemaDict = {
             type: 'string',
             format: 'datetime',
           },
-          appealedAt: {
+          lastAppealedAt: {
             type: 'string',
             format: 'datetime',
             description:
@@ -246,6 +247,11 @@ export const schemaDict = {
           takendown: {
             type: 'boolean',
           },
+          appealed: {
+            type: 'boolean',
+            description:
+              '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. Null indicates no prior appeal on the subject.',
+          },
           suspendUntil: {
             type: 'string',
             format: 'datetime',
@@ -682,7 +688,6 @@ export const schemaDict = {
           'lex:com.atproto.admin.defs#reviewOpen',
           'lex:com.atproto.admin.defs#reviewEscalated',
           'lex:com.atproto.admin.defs#reviewClosed',
-          'lex:com.atproto.admin.defs#reviewAppealed',
         ],
       },
       reviewOpen: {
@@ -700,11 +705,6 @@ export const schemaDict = {
         description:
           'Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator',
       },
-      reviewAppealed: {
-        type: 'token',
-        description:
-          'Moderator review status of a subject: Appealed. Indicates that the a previously taken moderator action was appealed agains, by the author of the content',
-      },
       modEventTakedown: {
         type: 'object',
         description: 'Take down a subject permanently or temporarily',
@@ -729,6 +729,16 @@ export const schemaDict = {
           },
         },
       },
+      modEventResolveAppeal: {
+        type: 'object',
+        description: 'Resolve appeal on a subject',
+        properties: {
+          comment: {
+            type: 'string',
+            description: 'Describe resolution.',
+          },
+        },
+      },
       modEventComment: {
         type: 'object',
         description: 'Add a comment to a subject',
@@ -1369,6 +1379,10 @@ export const schemaDict = {
               type: 'boolean',
               description: 'Get subjects that were taken down',
             },
+            appealed: {
+              type: 'boolean',
+              description: 'Get subjects in unresolved appealed status',
+            },
             limit: {
               type: 'integer',
               minimum: 1,

diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -76,6 +76,7 @@ export interface ModEventViewDetail {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -148,8 +149,10 @@ export interface SubjectStatusView {
   lastReviewedAt?: string
   lastReportedAt?: string
   /** Timestamp referencing when the owner of the subject appealed a moderation action */
-  appealedAt?: string
+  lastAppealedAt?: string
   takendown?: boolean
+  /** 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. Null indicates no prior appeal on the subject. */
+  appealed?: boolean
   suspendUntil?: string
   [k: string]: unknown
 }
@@ -490,7 +493,6 @@ export type SubjectReviewState =
   | 'lex:com.atproto.admin.defs#reviewOpen'
   | 'lex:com.atproto.admin.defs#reviewEscalated'
   | 'lex:com.atproto.admin.defs#reviewClosed'
-  | 'lex:com.atproto.admin.defs#reviewAppealed'
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
@@ -499,8 +501,6 @@ export const REVIEWOPEN = 'com.atproto.admin.defs#reviewOpen'
 export const REVIEWESCALATED = 'com.atproto.admin.defs#reviewEscalated'
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
 export const REVIEWCLOSED = 'com.atproto.admin.defs#reviewClosed'
-/** Moderator review status of a subject: Appealed. Indicates that the a previously taken moderator action was appealed agains, by the author of the content */
-export const REVIEWAPPEALED = 'com.atproto.admin.defs#reviewAppealed'
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
@@ -543,6 +543,27 @@ export function validateModEventReverseTakedown(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#modEventReverseTakedown', v)
 }
 
+/** Resolve appeal on a subject */
+export interface ModEventResolveAppeal {
+  /** Describe resolution. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventResolveAppeal(
+  v: unknown,
+): v is ModEventResolveAppeal {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventResolveAppeal'
+  )
+}
+
+export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventResolveAppeal', v)
+}
+
 /** Add a comment to a subject */
 export interface ModEventComment {
   comment: 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
@@ -31,6 +31,8 @@ export interface QueryParams {
   sortDirection?: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
+  /** Get subjects in unresolved appealed status */
+  appealed?: boolean
   limit?: number
   cursor?: string
 }

diff --git a/packages/bsky/src/api/com/atproto/admin/queryModerationStatuses.ts b/packages/bsky/src/api/com/atproto/admin/queryModerationStatuses.ts
@@ -9,6 +9,7 @@ export default function (server: Server, ctx: AppContext) {
       const {
         subject,
         takendown,
+        appealed,
         reviewState,
         reviewedAfter,
         reviewedBefore,
@@ -28,6 +29,7 @@ export default function (server: Server, ctx: AppContext) {
         reviewState: getReviewState(reviewState),
         subject,
         takendown,
+        appealed,
         reviewedAfter,
         reviewedBefore,
         reportedAfter,

diff --git a/packages/bsky/src/db/migrations/20231213T181744386Z-moderation-subject-appeal.ts b/packages/bsky/src/db/migrations/20231213T181744386Z-moderation-subject-appeal.ts
@@ -3,13 +3,21 @@ import { Kysely } from 'kysely'
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema
     .alterTable('moderation_subject_status')
-    .addColumn('appealedAt', 'varchar')
+    .addColumn('lastAppealedAt', 'varchar')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('appealed', 'boolean')
     .execute()
 }
 
 export async function down(db: Kysely<unknown>): Promise<void> {
   await db.schema
     .alterTable('moderation_subject_status')
-    .dropColumn('appealedAt')
+    .dropColumn('lastAppealedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('appealed')
     .execute()
 }
diff --git a/packages/bsky/src/db/tables/moderation.ts b/packages/bsky/src/db/tables/moderation.ts
@@ -3,7 +3,6 @@ import {
   REVIEWCLOSED,
   REVIEWOPEN,
   REVIEWESCALATED,
-  REVIEWAPPEALED,
 } from '../../lexicon/types/com/atproto/admin/defs'
 
 export const eventTableName = 'moderation_event'
@@ -21,6 +20,7 @@ export interface ModerationEvent {
     | 'com.atproto.admin.defs#modEventMute'
     | 'com.atproto.admin.defs#modEventReverseTakedown'
     | 'com.atproto.admin.defs#modEventEmail'
+    | 'com.atproto.admin.defs#modEventResolveAppeal'
   subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'
   subjectDid: string
   subjectUri: string | null
@@ -42,20 +42,17 @@ export interface ModerationSubjectStatus {
   recordPath: string
   recordCid: string | null
   blobCids: string[] | null
-  reviewState:
-    | typeof REVIEWCLOSED
-    | typeof REVIEWOPEN
-    | typeof REVIEWESCALATED
-    | typeof REVIEWAPPEALED
+  reviewState: typeof REVIEWCLOSED | typeof REVIEWOPEN | typeof REVIEWESCALATED
   createdAt: string
   updatedAt: string
   lastReviewedBy: string | null
   lastReviewedAt: string | null
   lastReportedAt: string | null
-  appealedAt: string | null
+  lastAppealedAt: string | null
   muteUntil: string | null
   suspendUntil: string | null
   takendown: boolean
+  appealed: boolean | null
   comment: string | null
 }
 

diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
@@ -127,7 +127,6 @@ export const COM_ATPROTO_ADMIN = {
   DefsReviewOpen: 'com.atproto.admin.defs#reviewOpen',
   DefsReviewEscalated: 'com.atproto.admin.defs#reviewEscalated',
   DefsReviewClosed: 'com.atproto.admin.defs#reviewClosed',
-  DefsReviewAppealed: 'com.atproto.admin.defs#reviewAppealed',
 }
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',
@@ -1599,11 +1598,13 @@ type RouteRateLimitOpts<T> = {
   calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
+type HandlerOpts = { blobLimit?: number }
 type HandlerRateLimitOpts<T> = SharedRateLimitOpts<T> | RouteRateLimitOpts<T>
 type ConfigOf<Auth, Handler, ReqCtx> =
   | Handler
   | {
       auth?: Auth
+      opts?: HandlerOpts
       rateLimit?: HandlerRateLimitOpts<ReqCtx> | HandlerRateLimitOpts<ReqCtx>[]
       handler: Handler
     }