@atproto/ozone 0.0.9 → 0.0.10

package/dist/lexicon/lexicons.d.ts

@@ -236,6 +236,12 @@ export declare const schemaDict: {
                         type: string;
                         format: string;
                     };
+                    tags: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                    };
                 };
             };
             reportViewDetail: {
@@ -779,6 +785,31 @@ export declare const schemaDict: {
                     };
                 };
             };
+            modEventTag: {
+                type: string;
+                description: string;
+                required: string[];
+                properties: {
+                    add: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                        description: string;
+                    };
+                    remove: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                        description: string;
+                    };
+                    comment: {
+                        type: string;
+                        description: string;
+                    };
+                };
+            };
             communicationTemplateView: {
                 type: string;
                 required: string[];
@@ -1343,6 +1374,20 @@ export declare const schemaDict: {
                             };
                             description: string;
                         };
+                        addedTags: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        removedTags: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
                         reportTypes: {
                             type: string;
                             items: {
@@ -1458,6 +1503,18 @@ export declare const schemaDict: {
                             maximum: number;
                             default: number;
                         };
+                        tags: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        };
+                        excludeTags: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        };
                         cursor: {
                             type: string;
                         };

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

@@ -82,6 +82,7 @@ export interface SubjectStatusView {
     takendown?: boolean;
     appealed?: boolean;
     suspendUntil?: string;
+    tags?: string[];
     [k: string]: unknown;
 }
 export declare function isSubjectStatusView(v: unknown): v is SubjectStatusView;
@@ -317,6 +318,14 @@ export interface ModEventEmail {
 }
 export declare function isModEventEmail(v: unknown): v is ModEventEmail;
 export declare function validateModEventEmail(v: unknown): ValidationResult;
+export interface ModEventTag {
+    add: string[];
+    remove: string[];
+    comment?: string;
+    [k: string]: unknown;
+}
+export declare function isModEventTag(v: unknown): v is ModEventTag;
+export declare function validateModEventTag(v: unknown): ValidationResult;
 export interface CommunicationTemplateView {
     id: string;
     name: string;

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

@@ -5,7 +5,7 @@ import * as ComAtprotoRepoStrongRef from '../repo/strongRef';
 export interface QueryParams {
 }
 export interface InputSchema {
-    event: ComAtprotoAdminDefs.ModEventTakedown | ComAtprotoAdminDefs.ModEventAcknowledge | ComAtprotoAdminDefs.ModEventEscalate | ComAtprotoAdminDefs.ModEventComment | ComAtprotoAdminDefs.ModEventLabel | ComAtprotoAdminDefs.ModEventReport | ComAtprotoAdminDefs.ModEventMute | ComAtprotoAdminDefs.ModEventReverseTakedown | ComAtprotoAdminDefs.ModEventUnmute | ComAtprotoAdminDefs.ModEventEmail | {
+    event: ComAtprotoAdminDefs.ModEventTakedown | ComAtprotoAdminDefs.ModEventAcknowledge | ComAtprotoAdminDefs.ModEventEscalate | ComAtprotoAdminDefs.ModEventComment | ComAtprotoAdminDefs.ModEventLabel | ComAtprotoAdminDefs.ModEventReport | ComAtprotoAdminDefs.ModEventMute | ComAtprotoAdminDefs.ModEventReverseTakedown | ComAtprotoAdminDefs.ModEventUnmute | ComAtprotoAdminDefs.ModEventEmail | ComAtprotoAdminDefs.ModEventTag | {
         $type: string;
         [k: string]: unknown;
     };

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

@@ -14,6 +14,8 @@ export interface QueryParams {
     comment?: string;
     addedLabels?: string[];
     removedLabels?: string[];
+    addedTags?: string[];
+    removedTags?: string[];
     reportTypes?: string[];
     cursor?: string;
 }

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

@@ -17,6 +17,8 @@ export interface QueryParams {
     takendown?: boolean;
     appealed?: boolean;
     limit: number;
+    tags?: string[];
+    excludeTags?: string[];
     cursor?: string;
 }
 export type InputSchema = undefined;

package/dist/logger.d.ts

@@ -1,4 +1,5 @@
 import { subsystemLogger } from '@atproto/common';
 export declare const dbLogger: ReturnType<typeof subsystemLogger>;
 export declare const httpLogger: ReturnType<typeof subsystemLogger>;
+export declare const langLogger: ReturnType<typeof subsystemLogger>;
 export declare const loggerMiddleware: import("pino-http").HttpLogger;

package/dist/mod-service/index.d.ts

@@ -38,6 +38,8 @@ export declare class ModerationService {
         createdBefore?: string;
         addedLabels: string[];
         removedLabels: string[];
+        addedTags: string[];
+        removedTags: string[];
         reportTypes?: string[];
     }): Promise<{
         cursor?: string;
@@ -60,6 +62,7 @@ export declare class ModerationService {
         comment: string | null;
         lastReportedAt: string | null;
         lastReviewedAt: string | null;
+        tags: string[] | null;
         muteUntil: string | null;
         lastReviewedBy: string | null;
         lastAppealedAt: string | null;
@@ -74,7 +77,10 @@ export declare class ModerationService {
         subject: ModSubject;
         createdBy: string;
         createdAt?: Date;
-    }): Promise<ModerationEventRow>;
+    }): Promise<{
+        event: ModerationEventRow;
+        subjectStatus: ModerationSubjectStatusRow | null;
+    }>;
     getLastReversibleEventForSubject(subject: ReversalSubject): Promise<{
         id: number;
         subjectBlobCids: string[] | null;
@@ -84,7 +90,7 @@ export declare class ModerationService {
         createLabelVals: string | null;
         negateLabelVals: string | null;
         durationInHours: number | null;
-        action: "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventEmail" | "com.atproto.admin.defs#modEventResolveAppeal";
+        action: "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventEmail" | "com.atproto.admin.defs#modEventResolveAppeal" | "com.atproto.admin.defs#modEventTag";
         subjectType: "com.atproto.admin.defs#repoRef" | "com.atproto.repo.strongRef";
         subjectDid: string;
         subjectUri: string | null;
@@ -92,6 +98,8 @@ export declare class ModerationService {
         meta: Record<string, string | boolean> | null;
         expiresAt: string | null;
         legacyRefId: number | null;
+        addedTags: string[] | null;
+        removedTags: string[] | null;
     } | null | undefined>;
     getSubjectsDueForReversal(): Promise<ReversalSubject[]>;
     isSubjectSuspended(did: string): Promise<boolean>;
@@ -106,8 +114,11 @@ export declare class ModerationService {
         subject: ModSubject;
         reportedBy: string;
         createdAt?: Date;
-    }): Promise<ModerationEventRow>;
-    getSubjectStatuses({ cursor, limit, takendown, appealed, reviewState, reviewedAfter, reviewedBefore, reportedAfter, reportedBefore, includeMuted, ignoreSubjects, sortDirection, lastReviewedBy, sortField, subject, }: {
+    }): Promise<{
+        event: ModerationEventRow;
+        subjectStatus: ModerationSubjectStatusRow | null;
+    }>;
+    getSubjectStatuses({ cursor, limit, takendown, appealed, reviewState, reviewedAfter, reviewedBefore, reportedAfter, reportedBefore, includeMuted, ignoreSubjects, sortDirection, lastReviewedBy, sortField, subject, tags, excludeTags, }: {
         cursor?: string;
         limit?: number;
         takendown?: boolean;
@@ -123,6 +134,8 @@ export declare class ModerationService {
         sortDirection: 'asc' | 'desc';
         lastReviewedBy?: string;
         sortField: 'lastReviewedAt' | 'lastReportedAt';
+        tags: string[];
+        excludeTags: string[];
     }): Promise<{
         statuses: {
             handle: string;
@@ -135,6 +148,7 @@ export declare class ModerationService {
             comment: string | null;
             lastReportedAt: string | null;
             lastReviewedAt: string | null;
+            tags: string[] | null;
             muteUntil: string | null;
             lastReviewedBy: string | null;
             lastAppealedAt: string | null;

package/dist/mod-service/lang.d.ts

@@ -0,0 +1,15 @@
+import { ModerationService } from '.';
+import { ModSubject } from './subject';
+import { ModerationSubjectStatusRow } from './types';
+export declare class ModerationLangService {
+    private moderationService;
+    constructor(moderationService: ModerationService);
+    tagSubjectWithLang({ subject, subjectStatus, createdBy, }: {
+        subject: ModSubject;
+        createdBy: string;
+        subjectStatus: ModerationSubjectStatusRow | null;
+    }): Promise<void>;
+    getRecordLang({ subject, }: {
+        subject: ModSubject;
+    }): Promise<string[] | null>;
+}

package/dist/mod-service/status.d.ts

@@ -2,7 +2,7 @@ import { AtUri } from '@atproto/syntax';
 import { Database } from '../db';
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status';
 import { ModerationEventRow } from './types';
-export declare const adjustModerationSubjectStatus: (db: Database, moderationEvent: ModerationEventRow, blobCids?: string[]) => Promise<import("kysely").InsertResult | null>;
+export declare const adjustModerationSubjectStatus: (db: Database, moderationEvent: ModerationEventRow, blobCids?: string[]) => Promise<import("kysely").Selectable<ModerationSubjectStatus> | null>;
 type ModerationSubjectStatusFilter = Pick<ModerationSubjectStatus, 'did'> | Pick<ModerationSubjectStatus, 'did' | 'recordPath'> | Pick<ModerationSubjectStatus, 'did' | 'recordPath' | 'recordCid'>;
 export declare const getModerationSubjectStatus: (db: Database, filters: ModerationSubjectStatusFilter) => Promise<{} | undefined>;
 export declare const getStatusIdentifierFromSubject: (subject: string | AtUri) => {

package/dist/mod-service/types.d.ts

@@ -16,6 +16,6 @@ export type ModerationSubjectStatusRow = Selectable<ModerationSubjectStatus>;
 export type ModerationSubjectStatusRowWithHandle = ModerationSubjectStatusRow & {
     handle: string | null;
 };
-export type ModEventType = ComAtprotoAdminDefs.ModEventTakedown | ComAtprotoAdminDefs.ModEventAcknowledge | ComAtprotoAdminDefs.ModEventEscalate | ComAtprotoAdminDefs.ModEventComment | ComAtprotoAdminDefs.ModEventLabel | ComAtprotoAdminDefs.ModEventReport | ComAtprotoAdminDefs.ModEventMute | ComAtprotoAdminDefs.ModEventReverseTakedown;
+export type ModEventType = ComAtprotoAdminDefs.ModEventTakedown | ComAtprotoAdminDefs.ModEventAcknowledge | ComAtprotoAdminDefs.ModEventEscalate | ComAtprotoAdminDefs.ModEventComment | ComAtprotoAdminDefs.ModEventLabel | ComAtprotoAdminDefs.ModEventReport | ComAtprotoAdminDefs.ModEventMute | ComAtprotoAdminDefs.ModEventReverseTakedown | ComAtprotoAdminDefs.ModEventTag;
 export declare const UNSPECCED_TAKEDOWN_LABEL = "!unspecced-takedown";
 export declare const UNSPECCED_TAKEDOWN_BLOBS_LABEL = "!unspecced-takedown-blobs";

package/dist/mod-service/views.d.ts

@@ -1,4 +1,4 @@
-import AtpAgent from '@atproto/api';
+import AtpAgent, { AppBskyFeedDefs } from '@atproto/api';
 import { BlobRef } from '@atproto/lexicon';
 import { Database } from '../db';
 import { ModEventView, RepoView, RepoViewDetail, RecordView, RecordViewDetail, ReportViewDetail, BlobView, SubjectStatusView, ModEventViewDetail, AccountView } from '../lexicon/types/com/atproto/admin/defs';
@@ -29,6 +29,7 @@ export declare class ModerationViews {
     labels(subject: string, includeNeg?: boolean): Promise<Label[]>;
     getSubjectStatus(subjects: string[]): Promise<Map<string, ModerationSubjectStatusRowWithHandle>>;
     formatSubjectStatus(status: ModerationSubjectStatusRowWithHandle): SubjectStatusView;
+    fetchAuthorFeed(actor: string): Promise<AppBskyFeedDefs.FeedViewPost[]>;
 }
 type RecordSubject = {
     uri: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -30,12 +30,12 @@
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.9.7",
+    "@atproto/api": "^0.9.8",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
-    "@atproto/syntax": "^0.1.5",
     "@atproto/identity": "^0.3.2",
     "@atproto/lexicon": "^0.3.1",
+    "@atproto/syntax": "^0.1.5",
     "@atproto/xrpc-server": "^0.4.2"
   },
   "devDependencies": {
@@ -46,10 +46,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.9.7",
-    "@atproto/dev-env": "^0.2.30",
+    "@atproto/api": "^0.9.8",
+    "@atproto/dev-env": "^0.2.31",
     "@atproto/lex-cli": "^0.3.0",
-    "@atproto/pds": "^0.3.18",
+    "@atproto/pds": "^0.3.19",
     "@atproto/xrpc": "^0.4.1"
   },
   "scripts": {

package/src/api/admin/emitModerationEvent.ts

@@ -7,6 +7,7 @@ import {
   isModEventTakedown,
 } from '../../lexicon/types/com/atproto/admin/defs'
 import { subjectFromInput } from '../../mod-service/subject'
+import { ModerationLangService } from '../../mod-service/lang'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.emitModerationEvent({
@@ -77,10 +78,21 @@ export default function (server: Server, ctx: AppContext) {
           createdBy,
         })
 
+        const moderationLangService = new ModerationLangService(moderationTxn)
+        await moderationLangService.tagSubjectWithLang({
+          subject,
+          createdBy: ctx.cfg.service.did,
+          subjectStatus: result.subjectStatus,
+        })
+
         if (subject.isRepo()) {
           if (isTakedownEvent) {
-            const isSuspend = !!result.durationInHours
-            await moderationTxn.takedownRepo(subject, result.id, isSuspend)
+            const isSuspend = !!result.event.durationInHours
+            await moderationTxn.takedownRepo(
+              subject,
+              result.event.id,
+              isSuspend,
+            )
           } else if (isReverseTakedownEvent) {
             await moderationTxn.reverseTakedownRepo(subject)
           }
@@ -88,7 +100,7 @@ export default function (server: Server, ctx: AppContext) {
 
         if (subject.isRecord()) {
           if (isTakedownEvent) {
-            await moderationTxn.takedownRecord(subject, result.id)
+            await moderationTxn.takedownRecord(subject, result.event.id)
           } else if (isReverseTakedownEvent) {
             await moderationTxn.reverseTakedownRecord(subject)
           }
@@ -96,20 +108,20 @@ export default function (server: Server, ctx: AppContext) {
 
         if (isLabelEvent) {
           await moderationTxn.formatAndCreateLabels(
-            result.subjectUri ?? result.subjectDid,
-            result.subjectCid,
+            result.event.subjectUri ?? result.event.subjectDid,
+            result.event.subjectCid,
             {
-              create: result.createLabelVals?.length
-                ? result.createLabelVals.split(' ')
+              create: result.event.createLabelVals?.length
+                ? result.event.createLabelVals.split(' ')
                 : undefined,
-              negate: result.negateLabelVals?.length
-                ? result.negateLabelVals.split(' ')
+              negate: result.event.negateLabelVals?.length
+                ? result.event.negateLabelVals.split(' ')
                 : undefined,
             },
           )
         }
 
-        return result
+        return result.event
       })
 
       return {

package/src/api/admin/queryModerationEvents.ts

@@ -20,6 +20,8 @@ export default function (server: Server, ctx: AppContext) {
         createdBefore,
         addedLabels = [],
         removedLabels = [],
+        addedTags = [],
+        removedTags = [],
         reportTypes,
       } = params
       const db = ctx.db
@@ -37,7 +39,9 @@ export default function (server: Server, ctx: AppContext) {
         createdAfter,
         createdBefore,
         addedLabels,
+        addedTags,
         removedLabels,
+        removedTags,
         reportTypes,
       })
       return {

package/src/api/admin/queryModerationStatuses.ts

@@ -22,6 +22,8 @@ export default function (server: Server, ctx: AppContext) {
         includeMuted = false,
         limit = 50,
         cursor,
+        tags = [],
+        excludeTags = [],
       } = params
       const db = ctx.db
       const modService = ctx.modService(db)
@@ -41,6 +43,8 @@ export default function (server: Server, ctx: AppContext) {
         sortField,
         limit,
         cursor,
+        tags,
+        excludeTags,
       })
       const subjectStatuses = results.statuses.map((status) =>
         modService.views.formatSubjectStatus(status),

package/src/api/moderation/createReport.ts

@@ -4,6 +4,7 @@ import { getReasonType } from './util'
 import { subjectFromInput } from '../../mod-service/subject'
 import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
 import { ForbiddenError } from '@atproto/xrpc-server'
+import { ModerationLangService } from '../../mod-service/lang'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({
@@ -23,12 +24,22 @@ export default function (server: Server, ctx: AppContext) {
       const db = ctx.db
       const report = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.modService(dbTxn)
-        return moderationTxn.report({
-          reasonType: getReasonType(reasonType),
-          reason,
+        const { event: reportEvent, subjectStatus } =
+          await moderationTxn.report({
+            reasonType: getReasonType(reasonType),
+            reason,
+            subject,
+            reportedBy: requester || ctx.cfg.service.did,
+          })
+
+        const moderationLangService = new ModerationLangService(moderationTxn)
+        await moderationLangService.tagSubjectWithLang({
           subject,
-          reportedBy: requester || ctx.cfg.service.did,
+          subjectStatus,
+          createdBy: ctx.cfg.service.did,
         })
+
+        return reportEvent
       })
 
       const body = ctx.modService(db).views.formatReport(report)

package/src/api/moderation/util.ts

@@ -63,4 +63,5 @@ const eventTypes = new Set([
   'com.atproto.admin.defs#modEventReverseTakedown',
   'com.atproto.admin.defs#modEventEmail',
   'com.atproto.admin.defs#modEventResolveAppeal',
+  'com.atproto.admin.defs#modEventTag',
 ])

package/src/db/migrations/20240208T213404429Z-add-tags-column-to-moderation-subject.ts

@@ -0,0 +1,31 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_event')
+    .addColumn('addedTags', 'jsonb')
+    .execute()
+  await db.schema
+    .alterTable('moderation_event')
+    .addColumn('removedTags', 'jsonb')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('tags', 'jsonb')
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_event')
+    .dropColumn('addedTags')
+    .execute()
+  await db.schema
+    .alterTable('moderation_event')
+    .dropColumn('removedTags')
+    .execute()
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('tags')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -5,3 +5,4 @@
 export * as _20231219T205730722Z from './20231219T205730722Z-init'
 export * as _20240116T085607200Z from './20240116T085607200Z-communication-template'
 export * as _20240201T051104136Z from './20240201T051104136Z-mod-event-blobs'
+export * as _20240208T213404429Z from './20240208T213404429Z-add-tags-column-to-moderation-subject'

package/src/db/schema/moderation_event.ts

@@ -15,6 +15,7 @@ export interface ModerationEvent {
     | 'com.atproto.admin.defs#modEventReverseTakedown'
     | 'com.atproto.admin.defs#modEventEmail'
     | 'com.atproto.admin.defs#modEventResolveAppeal'
+    | 'com.atproto.admin.defs#modEventTag'
   subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'
   subjectDid: string
   subjectUri: string | null
@@ -28,6 +29,8 @@ export interface ModerationEvent {
   durationInHours: number | null
   expiresAt: string | null
   meta: Record<string, string | boolean> | null
+  addedTags: string[] | null
+  removedTags: string[] | null
   legacyRefId: number | null
 }
 

package/src/db/schema/moderation_subject_status.ts

@@ -25,6 +25,7 @@ export interface ModerationSubjectStatus {
   takendown: boolean
   appealed: boolean | null
   comment: string | null
+  tags: string[] | null
 }
 
 export type PartialDB = {

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

package/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. */

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