@atproto/bsky 0.0.21 → 0.0.22

package/dist/lexicon/index.d.ts

@@ -124,6 +124,7 @@ export declare const COM_ATPROTO_MODERATION: {
     DefsReasonSexual: string;
     DefsReasonRude: string;
     DefsReasonOther: string;
+    DefsReasonAppeal: string;
 };
 export declare const APP_BSKY_GRAPH: {
     DefsModlist: string;

package/dist/lexicon/lexicons.d.ts

@@ -177,9 +177,18 @@ export declare const schemaDict: {
                         type: string;
                         format: string;
                     };
+                    lastAppealedAt: {
+                        type: string;
+                        format: string;
+                        description: string;
+                    };
                     takendown: {
                         type: string;
                     };
+                    appealed: {
+                        type: string;
+                        description: string;
+                    };
                     suspendUntil: {
                         type: string;
                         format: string;
@@ -606,6 +615,16 @@ export declare const schemaDict: {
                     };
                 };
             };
+            modEventResolveAppeal: {
+                type: string;
+                description: string;
+                properties: {
+                    comment: {
+                        type: string;
+                        description: string;
+                    };
+                };
+            };
             modEventComment: {
                 type: string;
                 description: string;
@@ -705,6 +724,10 @@ export declare const schemaDict: {
                         type: string;
                         description: string;
                     };
+                    comment: {
+                        type: string;
+                        description: string;
+                    };
                 };
             };
         };
@@ -1214,6 +1237,10 @@ export declare const schemaDict: {
                             type: string;
                             description: string;
                         };
+                        appealed: {
+                            type: string;
+                            description: string;
+                        };
                         limit: {
                             type: string;
                             minimum: number;
@@ -1324,6 +1351,10 @@ export declare const schemaDict: {
                                 type: string;
                                 format: string;
                             };
+                            comment: {
+                                type: string;
+                                description: string;
+                            };
                         };
                     };
                 };
@@ -1777,6 +1808,10 @@ export declare const schemaDict: {
                 type: string;
                 description: string;
             };
+            reasonAppeal: {
+                type: string;
+                description: string;
+            };
         };
     };
     ComAtprotoRepoApplyWrites: {

package/dist/lexicon/types/com/atproto/admin/defs.d.ts

@@ -31,7 +31,7 @@ export declare function isModEventView(v: unknown): v is ModEventView;
 export declare function validateModEventView(v: unknown): ValidationResult;
 export interface ModEventViewDetail {
     id: number;
-    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | {
+    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventResolveAppeal | {
         $type: string;
         [k: string]: unknown;
     };
@@ -78,7 +78,9 @@ export interface SubjectStatusView {
     lastReviewedBy?: string;
     lastReviewedAt?: string;
     lastReportedAt?: string;
+    lastAppealedAt?: string;
     takendown?: boolean;
+    appealed?: boolean;
     suspendUntil?: string;
     [k: string]: unknown;
 }
@@ -254,6 +256,12 @@ export interface ModEventReverseTakedown {
 }
 export declare function isModEventReverseTakedown(v: unknown): v is ModEventReverseTakedown;
 export declare function validateModEventReverseTakedown(v: unknown): ValidationResult;
+export interface ModEventResolveAppeal {
+    comment?: string;
+    [k: string]: unknown;
+}
+export declare function isModEventResolveAppeal(v: unknown): v is ModEventResolveAppeal;
+export declare function validateModEventResolveAppeal(v: unknown): ValidationResult;
 export interface ModEventComment {
     comment: string;
     sticky?: boolean;
@@ -303,6 +311,7 @@ export declare function isModEventUnmute(v: unknown): v is ModEventUnmute;
 export declare function validateModEventUnmute(v: unknown): ValidationResult;
 export interface ModEventEmail {
     subjectLine: string;
+    comment?: string;
     [k: string]: unknown;
 }
 export declare function isModEventEmail(v: unknown): v is ModEventEmail;

package/dist/lexicon/types/com/atproto/admin/queryModerationStatuses.d.ts

@@ -15,6 +15,7 @@ export interface QueryParams {
     sortField: 'lastReviewedAt' | 'lastReportedAt';
     sortDirection: 'asc' | 'desc';
     takendown?: boolean;
+    appealed?: boolean;
     limit: number;
     cursor?: string;
 }

package/dist/lexicon/types/com/atproto/admin/sendEmail.d.ts

@@ -7,6 +7,7 @@ export interface InputSchema {
     content: string;
     subject?: string;
     senderDid: string;
+    comment?: string;
     [k: string]: unknown;
 }
 export interface OutputSchema {

package/dist/lexicon/types/com/atproto/moderation/defs.d.ts

@@ -1,7 +1,8 @@
-export declare type ReasonType = 'com.atproto.moderation.defs#reasonSpam' | 'com.atproto.moderation.defs#reasonViolation' | 'com.atproto.moderation.defs#reasonMisleading' | 'com.atproto.moderation.defs#reasonSexual' | 'com.atproto.moderation.defs#reasonRude' | 'com.atproto.moderation.defs#reasonOther' | (string & {});
+export declare type ReasonType = 'com.atproto.moderation.defs#reasonSpam' | 'com.atproto.moderation.defs#reasonViolation' | 'com.atproto.moderation.defs#reasonMisleading' | 'com.atproto.moderation.defs#reasonSexual' | 'com.atproto.moderation.defs#reasonRude' | 'com.atproto.moderation.defs#reasonOther' | 'com.atproto.moderation.defs#reasonAppeal' | (string & {});
 export declare const REASONSPAM = "com.atproto.moderation.defs#reasonSpam";
 export declare const REASONVIOLATION = "com.atproto.moderation.defs#reasonViolation";
 export declare const REASONMISLEADING = "com.atproto.moderation.defs#reasonMisleading";
 export declare const REASONSEXUAL = "com.atproto.moderation.defs#reasonSexual";
 export declare const REASONRUDE = "com.atproto.moderation.defs#reasonRude";
 export declare const REASONOTHER = "com.atproto.moderation.defs#reasonOther";
+export declare const REASONAPPEAL = "com.atproto.moderation.defs#reasonAppeal";

package/dist/services/feed/views.d.ts

@@ -27,7 +27,7 @@ export declare class FeedViews {
     }): FeedViewPost[];
     formatPostView(uri: string, actors: ActorInfoMap, posts: PostInfoMap, threadgates: ThreadgateInfoMap, embeds: PostEmbedViews, labels: Labels, lists: ListInfoMap, viewer: string | null): PostView | undefined;
     userReplyDisabled(uri: string, actors: ActorInfoMap, posts: PostInfoMap, threadgates: ThreadgateInfoMap, lists: ListInfoMap, viewer: string | null): boolean | undefined;
-    formatMaybePostView(uri: string, actors: ActorInfoMap, posts: PostInfoMap, threadgates: ThreadgateInfoMap, embeds: PostEmbedViews, labels: Labels, lists: ListInfoMap, blocks: PostBlocksMap, viewer: string | null, opts?: {
+    formatMaybePostView(uri: string, replyUri: string | null, actors: ActorInfoMap, posts: PostInfoMap, threadgates: ThreadgateInfoMap, embeds: PostEmbedViews, labels: Labels, lists: ListInfoMap, blocks: PostBlocksMap, viewer: string | null, opts?: {
         usePostViewUnion?: boolean;
     }): MaybePostView | undefined;
     blockedPost(post: PostView): {

package/dist/services/moderation/index.d.ts

@@ -48,7 +48,9 @@ export declare class ModerationService {
         lastReviewedAt: string | null;
         muteUntil: string | null;
         lastReviewedBy: string | null;
+        lastAppealedAt: string | null;
         takendown: boolean;
+        appealed: boolean | null;
         suspendUntil: string | null;
         recordCid: string | null;
         recordPath: string;
@@ -79,7 +81,7 @@ export declare class ModerationService {
         createLabelVals: string | null;
         negateLabelVals: string | null;
         durationInHours: number | null;
-        action: "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventEmail";
+        action: "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventResolveAppeal" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventEmail";
         subjectCid: string | null;
         subjectDid: string;
         subjectType: "com.atproto.repo.strongRef" | "com.atproto.admin.defs#repoRef";
@@ -122,10 +124,11 @@ export declare class ModerationService {
         reportedBy: string;
         createdAt?: Date;
     }): Promise<ModerationEventRow>;
-    getSubjectStatuses({ cursor, limit, takendown, reviewState, reviewedAfter, reviewedBefore, reportedAfter, reportedBefore, includeMuted, ignoreSubjects, sortDirection, lastReviewedBy, sortField, subject, }: {
+    getSubjectStatuses({ cursor, limit, takendown, appealed, reviewState, reviewedAfter, reviewedBefore, reportedAfter, reportedBefore, includeMuted, ignoreSubjects, sortDirection, lastReviewedBy, sortField, subject, }: {
         cursor?: string;
         limit?: number;
         takendown?: boolean;
+        appealed?: boolean | null;
         reviewedBefore?: string;
         reviewState?: ModerationSubjectStatusRow['reviewState'];
         reviewedAfter?: string;
@@ -185,7 +188,9 @@ export declare class ModerationService {
             lastReviewedAt: string | null;
             muteUntil: string | null;
             lastReviewedBy: string | null;
+            lastAppealedAt: string | null;
             takendown: boolean;
+            appealed: boolean | null;
             suspendUntil: string | null;
             recordCid: string | null;
             recordPath: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -35,7 +35,7 @@
     "sharp": "^0.32.6",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.7.4",
+    "@atproto/api": "^0.8.0",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/syntax": "^0.1.5",
@@ -52,10 +52,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.7.4",
-    "@atproto/dev-env": "^0.2.21",
+    "@atproto/api": "^0.8.0",
+    "@atproto/dev-env": "^0.2.22",
     "@atproto/lex-cli": "^0.2.5",
-    "@atproto/pds": "^0.3.9",
+    "@atproto/pds": "^0.3.10",
     "@atproto/xrpc": "^0.4.1"
   },
   "scripts": {

package/src/api/app/bsky/feed/getPostThread.ts

@@ -128,9 +128,10 @@ const composeThread = (
   // @TODO re-enable invalidReplyRoot check
   // const badReply = !!info?.invalidReplyRoot || !!info?.violatesThreadGate
   const badReply = !!info?.violatesThreadGate
-  const omitBadReply = !isAnchorPost && badReply
+  const violatesBlock = (post && blocks[post.uri]?.reply) ?? false
+  const omitBadReply = !isAnchorPost && (badReply || violatesBlock)
 
-  if (!post || blocks[post.uri]?.reply || omitBadReply) {
+  if (!post || omitBadReply) {
     return {
       $type: 'app.bsky.feed.defs#notFoundPost',
       uri: threadData.post.postUri,
@@ -156,7 +157,7 @@ const composeThread = (
   }
 
   let parent
-  if (threadData.parent && !badReply) {
+  if (threadData.parent && !badReply && !violatesBlock) {
     if (threadData.parent instanceof ParentNotFoundError) {
       parent = {
         $type: 'app.bsky.feed.defs#notFoundPost',

package/src/api/app/bsky/feed/getTimeline.ts

@@ -1,3 +1,4 @@
+import { sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import { FeedAlgorithm, FeedKeyset, getFeedDateThreshold } from '../util/feed'
@@ -55,6 +56,11 @@ export const skeleton = async (
     throw new InvalidRequestError(`Unsupported algorithm: ${algorithm}`)
   }
 
+  if (limit === 1 && !cursor) {
+    // special case for limit=1, which is often used to check if there are new items at the top of the timeline.
+    return skeletonLimit1(params, ctx)
+  }
+
   const keyset = new FeedKeyset(ref('feed_item.sortAt'), ref('feed_item.cid'))
   const sortFrom = keyset.unpack(cursor)?.primary
 
@@ -117,6 +123,54 @@ export const skeleton = async (
   }
 }
 
+// The limit=1 case is used commonly to check if there are new items at the top of the timeline.
+// Since it's so common, it's optimized here.  The most common strategy that postgres takes to
+// build a timeline is to grab all recent content from each of the user's follow, then paginate it.
+// The downside here is that it requires grabbing all recent content from all follows, even if you
+// only want a single result.  The approach here instead takes the single most recent post from
+// each of the user's follows, then sorts only those and takes the top item.
+const skeletonLimit1 = async (params: Params, ctx: Context) => {
+  const { viewer } = params
+  const { db } = ctx
+  const { ref } = db.db.dynamic
+  const creatorsQb = db.db
+    .selectFrom('follow')
+    .where('creator', '=', viewer)
+    .select('subjectDid as did')
+    .unionAll(sql`select ${viewer} as did`)
+  const feedItemsQb = db.db
+    .selectFrom(creatorsQb.as('creator'))
+    .innerJoinLateral(
+      (eb) => {
+        const keyset = new FeedKeyset(
+          ref('feed_item.sortAt'),
+          ref('feed_item.cid'),
+        )
+        const creatorFeedItemQb = eb
+          .selectFrom('feed_item')
+          .innerJoin('post', 'post.uri', 'feed_item.postUri')
+          .whereRef('feed_item.originatorDid', '=', 'creator.did')
+          .where('feed_item.sortAt', '>', getFeedDateThreshold(undefined, 2))
+          .selectAll('feed_item')
+          .select([
+            'post.replyRoot',
+            'post.replyParent',
+            'post.creator as postAuthorDid',
+          ])
+        return paginate(creatorFeedItemQb, { limit: 1, keyset }).as('result')
+      },
+      (join) => join.onTrue(),
+    )
+    .selectAll('result')
+  const keyset = new FeedKeyset(ref('result.sortAt'), ref('result.cid'))
+  const feedItems = await paginate(feedItemsQb, { limit: 1, keyset }).execute()
+  return {
+    params,
+    feedItems,
+    cursor: keyset.packFromResult(feedItems),
+  }
+}
+
 const hydration = async (
   state: SkeletonState,
   ctx: Context,

package/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,

package/src/api/com/atproto/moderation/createReport.ts

@@ -1,8 +1,9 @@
-import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AuthRequiredError, ForbiddenError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import { getReasonType, getSubject } from './util'
 import { softDeleted } from '../../../../db/util'
+import { REASONAPPEAL } from '../../../../lexicon/types/com/atproto/moderation/defs'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({
@@ -22,12 +23,22 @@ export default function (server: Server, ctx: AppContext) {
         }
       }
 
+      const reportReasonType = getReasonType(reasonType)
+      const reportSubject = getSubject(subject)
+      const subjectDid =
+        'did' in reportSubject ? reportSubject.did : reportSubject.uri.host
+
+      // If the report is an appeal, the requester must be the author of the subject
+      if (reasonType === REASONAPPEAL && requester !== subjectDid) {
+        throw new ForbiddenError('You cannot appeal this report')
+      }
+
       const report = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.services.moderation(dbTxn)
         return moderationTxn.report({
-          reasonType: getReasonType(reasonType),
+          reasonType: reportReasonType,
           reason,
-          subject: getSubject(subject),
+          subject: reportSubject,
           reportedBy: requester || ctx.cfg.serverDid,
         })
       })

package/src/api/com/atproto/moderation/util.ts

@@ -10,6 +10,7 @@ import {
   REASONRUDE,
   REASONSEXUAL,
   REASONVIOLATION,
+  REASONAPPEAL,
 } from '../../../../lexicon/types/com/atproto/moderation/defs'
 import {
   REVIEWCLOSED,
@@ -73,6 +74,7 @@ const reasonTypes = new Set([
   REASONRUDE,
   REASONSEXUAL,
   REASONVIOLATION,
+  REASONAPPEAL,
 ])
 
 const eventTypes = new Set([

package/src/api/health.ts

@@ -5,6 +5,20 @@ import AppContext from '../context'
 export const createRouter = (ctx: AppContext): express.Router => {
   const router = express.Router()
 
+  router.get('/', function (req, res) {
+    res.type('text/plain')
+    res.send(
+      'This is an AT Protocol Application View (AppView) for the "bsky.app" application: https://github.com/bluesky-social/atproto\n\nMost API routes are under /xrpc/',
+    )
+  })
+
+  router.get('/robots.txt', function (req, res) {
+    res.type('text/plain')
+    res.send(
+      '# Hello Friends!\n\n# Crawling the public parts of the API is allowed. HTTP 429 ("backoff") status codes are used for rate-limiting. Up to a handful concurrent requests should be ok.\nUser-agent: *\nAllow: /',
+    )
+  })
+
   router.get('/xrpc/_health', async function (req, res) {
     const { version } = ctx.cfg
     const db = ctx.db.getPrimary()

package/src/auto-moderator/index.ts

@@ -287,6 +287,25 @@ export class AutoModerator {
 
   async storeLabels(uri: AtUri, cid: CID, labels: string[]): Promise<void> {
     if (labels.length < 1) return
+
+    // Given that moderation service is available, log the labeling event for historical purposes
+    if (this.services.moderation) {
+      await this.ctx.db.transaction(async (dbTxn) => {
+        if (!this.services.moderation) return
+        const modSrvc = this.services.moderation(dbTxn)
+        await modSrvc.logEvent({
+          event: {
+            $type: 'com.atproto.admin.defs#modEventLabel',
+            createLabelVals: labels,
+            negateLabelVals: [],
+            comment: '[AutoModerator]: Applying labels',
+          },
+          subject: { uri, cid },
+          createdBy: this.ctx.cfg.labelerDid,
+        })
+      })
+    }
+
     const labelSrvc = this.services.label(this.ctx.db)
     await labelSrvc.formatAndCreate(
       this.ctx.cfg.labelerDid,

package/src/db/migrations/20231213T181744386Z-moderation-subject-appeal.ts

@@ -0,0 +1,23 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .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('lastAppealedAt')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('appealed')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -32,3 +32,4 @@ export * as _20230920T213858047Z from './20230920T213858047Z-add-tags-to-post'
 export * as _20230929T192920807Z from './20230929T192920807Z-record-cursor-indexes'
 export * as _20231003T202833377Z from './20231003T202833377Z-create-moderation-subject-status'
 export * as _20231205T000257238Z from './20231205T000257238Z-remove-did-cache'
+export * as _20231213T181744386Z from './20231213T181744386Z-moderation-subject-appeal'

package/src/db/tables/moderation.ts

@@ -20,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
@@ -47,9 +48,11 @@ export interface ModerationSubjectStatus {
   lastReviewedBy: string | null
   lastReviewedAt: string | null
   lastReportedAt: string | null
+  lastAppealedAt: string | null
   muteUntil: string | null
   suspendUntil: string | null
   takendown: boolean
+  appealed: boolean | null
   comment: string | null
 }
 

package/src/lexicon/index.ts

@@ -135,6 +135,7 @@ export const COM_ATPROTO_MODERATION = {
   DefsReasonSexual: 'com.atproto.moderation.defs#reasonSexual',
   DefsReasonRude: 'com.atproto.moderation.defs#reasonRude',
   DefsReasonOther: 'com.atproto.moderation.defs#reasonOther',
+  DefsReasonAppeal: 'com.atproto.moderation.defs#reasonAppeal',
 }
 export const APP_BSKY_GRAPH = {
   DefsModlist: 'app.bsky.graph.defs#modlist',

package/src/lexicon/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,9 +238,20 @@ export const schemaDict = {
             type: 'string',
             format: 'datetime',
           },
+          lastAppealedAt: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'Timestamp referencing when the author 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',
@@ -717,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',
@@ -816,6 +838,10 @@ export const schemaDict = {
             type: 'string',
             description: 'The subject line of the email sent to the user.',
           },
+          comment: {
+            type: 'string',
+            description: 'Additional comment about the outgoing comm.',
+          },
         },
       },
     },
@@ -1357,6 +1383,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,
@@ -1467,6 +1497,11 @@ export const schemaDict = {
                 type: 'string',
                 format: 'did',
               },
+              comment: {
+                type: 'string',
+                description:
+                  "Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers",
+              },
             },
           },
         },
@@ -1937,6 +1972,7 @@ export const schemaDict = {
           'com.atproto.moderation.defs#reasonSexual',
           'com.atproto.moderation.defs#reasonRude',
           'com.atproto.moderation.defs#reasonOther',
+          'com.atproto.moderation.defs#reasonAppeal',
         ],
       },
       reasonSpam: {
@@ -1964,6 +2000,10 @@ export const schemaDict = {
         type: 'token',
         description: 'Other: reports not falling under another report category',
       },
+      reasonAppeal: {
+        type: 'token',
+        description: 'Appeal: appeal a previously taken moderation action',
+      },
     },
   },
   ComAtprotoRepoApplyWrites: {

package/src/lexicon/types/com/atproto/admin/defs.ts

@@ -76,6 +76,7 @@ export interface ModEventViewDetail {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -147,7 +148,11 @@ export interface SubjectStatusView {
   lastReviewedBy?: string
   lastReviewedAt?: string
   lastReportedAt?: string
+  /** Timestamp referencing when the author of the subject appealed a moderation action */
+  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. */
+  appealed?: boolean
   suspendUntil?: string
   [k: string]: unknown
 }
@@ -538,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
@@ -674,6 +700,8 @@ export function validateModEventUnmute(v: unknown): ValidationResult {
 export interface ModEventEmail {
   /** The subject line of the email sent to the user. */
   subjectLine: string
+  /** Additional comment about the outgoing comm. */
+  comment?: string
   [k: string]: unknown
 }