@atproto/ozone 0.0.7 → 0.0.8

package/dist/lexicon/index.d.ts

@@ -117,7 +117,6 @@ import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen';
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators';
 import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions';
-import * as AppBskyUnspeccedGetTimelineSkeleton from './types/app/bsky/unspecced/getTimelineSkeleton';
 import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton';
 import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton';
 export declare const COM_ATPROTO_ADMIN: {
@@ -355,7 +354,6 @@ export declare class AppBskyUnspeccedNS {
     constructor(server: Server);
     getPopularFeedGenerators<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetPopularFeedGenerators.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetPopularFeedGenerators.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getTaggedSuggestions<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetTaggedSuggestions.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetTaggedSuggestions.HandlerReqCtx<ExtractAuth<AV>>>): void;
-    getTimelineSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetTimelineSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetTimelineSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
     searchActorsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchActorsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchActorsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
     searchPostsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchPostsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchPostsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
 }

package/dist/lexicon/lexicons.d.ts

@@ -1296,6 +1296,16 @@ export declare const schemaDict: {
                             enum: string[];
                             description: string;
                         };
+                        createdAfter: {
+                            type: string;
+                            format: string;
+                            description: string;
+                        };
+                        createdBefore: {
+                            type: string;
+                            format: string;
+                            description: string;
+                        };
                         subject: {
                             type: string;
                             format: string;
@@ -1311,6 +1321,34 @@ export declare const schemaDict: {
                             maximum: number;
                             default: number;
                         };
+                        hasComment: {
+                            type: string;
+                            description: string;
+                        };
+                        comment: {
+                            type: string;
+                            description: string;
+                        };
+                        addedLabels: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        removedLabels: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        reportTypes: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        };
                         cursor: {
                             type: string;
                         };
@@ -7602,52 +7640,6 @@ export declare const schemaDict: {
             };
         };
     };
-    AppBskyUnspeccedGetTimelineSkeleton: {
-        lexicon: number;
-        id: string;
-        defs: {
-            main: {
-                type: string;
-                description: string;
-                parameters: {
-                    type: string;
-                    properties: {
-                        limit: {
-                            type: string;
-                            minimum: number;
-                            maximum: number;
-                            default: number;
-                        };
-                        cursor: {
-                            type: string;
-                        };
-                    };
-                };
-                output: {
-                    encoding: string;
-                    schema: {
-                        type: string;
-                        required: string[];
-                        properties: {
-                            cursor: {
-                                type: string;
-                            };
-                            feed: {
-                                type: string;
-                                items: {
-                                    type: string;
-                                    ref: string;
-                                };
-                            };
-                        };
-                    };
-                };
-                errors: {
-                    name: string;
-                }[];
-            };
-        };
-    };
     AppBskyUnspeccedSearchActorsSkeleton: {
         lexicon: number;
         id: string;
@@ -7911,7 +7903,6 @@ export declare const ids: {
     AppBskyUnspeccedDefs: string;
     AppBskyUnspeccedGetPopularFeedGenerators: string;
     AppBskyUnspeccedGetTaggedSuggestions: string;
-    AppBskyUnspeccedGetTimelineSkeleton: string;
     AppBskyUnspeccedSearchActorsSkeleton: string;
     AppBskyUnspeccedSearchPostsSkeleton: string;
 };

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

@@ -12,7 +12,7 @@ export declare function isStatusAttr(v: unknown): v is StatusAttr;
 export declare function validateStatusAttr(v: unknown): ValidationResult;
 export interface ModEventView {
     id: number;
-    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | {
+    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | ModEventResolveAppeal | {
         $type: string;
         [k: string]: unknown;
     };
@@ -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 | ModEventResolveAppeal | {
+    event: ModEventTakedown | ModEventReverseTakedown | ModEventComment | ModEventReport | ModEventLabel | ModEventAcknowledge | ModEventEscalate | ModEventMute | ModEventEmail | ModEventResolveAppeal | {
         $type: string;
         [k: string]: unknown;
     };

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

@@ -5,9 +5,16 @@ export interface QueryParams {
     types?: string[];
     createdBy?: string;
     sortDirection: 'asc' | 'desc';
+    createdAfter?: string;
+    createdBefore?: string;
     subject?: string;
     includeAllUserRecords: boolean;
     limit: number;
+    hasComment?: boolean;
+    comment?: string;
+    addedLabels?: string[];
+    removedLabels?: string[];
+    reportTypes?: string[];
     cursor?: string;
 }
 export type InputSchema = undefined;

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

@@ -18,8 +18,9 @@ export declare class ModerationService {
     eventPusher: EventPusher;
     appviewAgent: AtpAgent;
     private appviewAuth;
-    constructor(db: Database, backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth);
-    static creator(backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth): (db: Database) => ModerationService;
+    serverDid: string;
+    constructor(db: Database, backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth, serverDid: string);
+    static creator(backgroundQueue: BackgroundQueue, eventPusher: EventPusher, appviewAgent: AtpAgent, appviewAuth: AppviewAuth, serverDid: string): (db: Database) => ModerationService;
     views: ModerationViews;
     getEvent(id: number): Promise<ModerationEventRow | undefined>;
     getEventOrThrow(id: number): Promise<ModerationEventRow>;
@@ -31,6 +32,13 @@ export declare class ModerationService {
         includeAllUserRecords: boolean;
         types: ModerationEvent['action'][];
         sortDirection?: 'asc' | 'desc';
+        hasComment?: boolean;
+        comment?: string;
+        createdAfter?: string;
+        createdBefore?: string;
+        addedLabels: string[];
+        removedLabels: string[];
+        reportTypes?: string[];
     }): Promise<{
         cursor?: string;
         events: ModerationEventRow[];
@@ -69,6 +77,7 @@ export declare class ModerationService {
     }): Promise<ModerationEventRow>;
     getLastReversibleEventForSubject(subject: ReversalSubject): Promise<{
         id: number;
+        subjectBlobCids: string[] | null;
         createdBy: string;
         createdAt: string;
         comment: string | null;
@@ -137,8 +146,8 @@ export declare class ModerationService {
         }[];
         cursor: string | undefined;
     }>;
-    isSubjectTakendown(subject: ModSubject): Promise<boolean>;
-    formatAndCreateLabels(src: string, uri: string, cid: string | null, labels: {
+    getStatus(subject: ModSubject): Promise<ModerationSubjectStatusRow | null>;
+    formatAndCreateLabels(uri: string, cid: string | null, labels: {
         create?: string[];
         negate?: string[];
     }): Promise<Label[]>;

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

@@ -13,6 +13,7 @@ type SubjectInfo = {
     subjectDid: string;
     subjectUri: string | null;
     subjectCid: string | null;
+    subjectBlobCids: string[] | null;
 };
 export interface ModSubject {
     did: string;
@@ -35,6 +36,7 @@ export declare class RepoSubject implements ModSubject {
         subjectDid: string;
         subjectUri: null;
         subjectCid: null;
+        subjectBlobCids: null;
     };
     lex(): RepoRef;
 }
@@ -53,6 +55,7 @@ export declare class RecordSubject implements ModSubject {
         subjectDid: string;
         subjectUri: string;
         subjectCid: string;
+        subjectBlobCids: string[];
     };
     lex(): StrongRef;
 }

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

@@ -17,3 +17,5 @@ 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 declare const UNSPECCED_TAKEDOWN_LABEL = "!unspecced-takedown";
+export declare const UNSPECCED_TAKEDOWN_BLOBS_LABEL = "!unspecced-takedown-blobs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -30,7 +30,7 @@
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.9.5",
+    "@atproto/api": "^0.9.6",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/syntax": "^0.1.5",
@@ -46,10 +46,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.9.5",
-    "@atproto/dev-env": "^0.2.28",
+    "@atproto/api": "^0.9.6",
+    "@atproto/dev-env": "^0.2.29",
     "@atproto/lex-cli": "^0.3.0",
-    "@atproto/pds": "^0.3.16",
+    "@atproto/pds": "^0.3.17",
     "@atproto/xrpc": "^0.4.1"
   },
   "scripts": {

package/src/api/admin/emitModerationEvent.ts

@@ -51,17 +51,21 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (isTakedownEvent || isReverseTakedownEvent) {
-        const isSubjectTakendown = await moderationService.isSubjectTakendown(
-          subject,
-        )
+        const status = await moderationService.getStatus(subject)
 
-        if (isSubjectTakendown && isTakedownEvent) {
+        if (status?.takendown && isTakedownEvent) {
           throw new InvalidRequestError(`Subject is already taken down`)
         }
 
-        if (!isSubjectTakendown && isReverseTakedownEvent) {
+        if (!status?.takendown && isReverseTakedownEvent) {
           throw new InvalidRequestError(`Subject is not taken down`)
         }
+
+        if (status?.takendown && isReverseTakedownEvent && subject.isRecord()) {
+          // due to the way blob status is modeled, we should reverse takedown on all
+          // blobs for the record being restored, which aren't taken down on another record.
+          subject.blobCids = status.blobCids ?? []
+        }
       }
 
       const moderationEvent = await db.transaction(async (dbTxn) => {
@@ -92,7 +96,6 @@ export default function (server: Server, ctx: AppContext) {
 
         if (isLabelEvent) {
           await moderationTxn.formatAndCreateLabels(
-            ctx.cfg.service.did,
             result.subjectUri ?? result.subjectDid,
             result.subjectCid,
             {

package/src/api/admin/queryModerationEvents.ts

@@ -13,7 +13,14 @@ export default function (server: Server, ctx: AppContext) {
         sortDirection = 'desc',
         types,
         includeAllUserRecords = false,
+        hasComment,
+        comment,
         createdBy,
+        createdAfter,
+        createdBefore,
+        addedLabels = [],
+        removedLabels = [],
+        reportTypes,
       } = params
       const db = ctx.db
       const modService = ctx.modService(db)
@@ -25,6 +32,13 @@ export default function (server: Server, ctx: AppContext) {
         cursor,
         sortDirection,
         includeAllUserRecords,
+        hasComment,
+        comment,
+        createdAfter,
+        createdBefore,
+        addedLabels,
+        removedLabels,
+        reportTypes,
       })
       return {
         encoding: 'application/json',

package/src/api/moderation/util.ts

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

package/src/api/temp/fetchLabels.ts

@@ -1,29 +1,44 @@
 import { Server } from '../../lexicon'
 import AppContext from '../../context'
+import {
+  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
+  UNSPECCED_TAKEDOWN_LABEL,
+} from '../../mod-service/types'
 
 export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.temp.fetchLabels(async ({ params }) => {
-    const { limit } = params
-    const since =
-      params.since !== undefined ? new Date(params.since).toISOString() : ''
-    const labelRes = await ctx.db.db
-      .selectFrom('label')
-      .selectAll()
-      .orderBy('label.cts', 'asc')
-      .where('cts', '>', since)
-      .limit(limit)
-      .execute()
+  server.com.atproto.temp.fetchLabels({
+    auth: ctx.authOptionalAccessOrRoleVerifier,
+    handler: async ({ auth, params }) => {
+      const { limit } = params
+      const since =
+        params.since !== undefined ? new Date(params.since).toISOString() : ''
+      const includeUnspeccedTakedowns =
+        auth.credentials.type === 'role' && auth.credentials.admin
+      const labelRes = await ctx.db.db
+        .selectFrom('label')
+        .selectAll()
+        .orderBy('label.cts', 'asc')
+        .where('cts', '>', since)
+        .if(!includeUnspeccedTakedowns, (q) =>
+          q.where('label.val', 'not in', [
+            UNSPECCED_TAKEDOWN_LABEL,
+            UNSPECCED_TAKEDOWN_BLOBS_LABEL,
+          ]),
+        )
+        .limit(limit)
+        .execute()
 
-    const labels = labelRes.map((l) => ({
-      ...l,
-      cid: l.cid === '' ? undefined : l.cid,
-    }))
+      const labels = labelRes.map((l) => ({
+        ...l,
+        cid: l.cid === '' ? undefined : l.cid,
+      }))
 
-    return {
-      encoding: 'application/json',
-      body: {
-        labels,
-      },
-    }
+      return {
+        encoding: 'application/json',
+        body: {
+          labels,
+        },
+      }
+    },
   })
 }

package/src/context.ts

@@ -65,6 +65,7 @@ export class AppContext {
       eventPusher,
       appviewAgent,
       appviewAuth,
+      cfg.service.did,
     )
 
     const communicationTemplateService = CommunicationTemplateService.creator()

package/src/daemon/context.ts

@@ -52,6 +52,7 @@ export class DaemonContext {
       eventPusher,
       appviewAgent,
       appviewAuth,
+      cfg.service.did,
     )
     const eventReverser = new EventReverser(db, modService)
 

package/src/db/migrations/20240201T051104136Z-mod-event-blobs.ts

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

package/src/db/migrations/index.ts

@@ -4,3 +4,4 @@
 
 export * as _20231219T205730722Z from './20231219T205730722Z-init'
 export * as _20240116T085607200Z from './20240116T085607200Z-communication-template'
+export * as _20240201T051104136Z from './20240201T051104136Z-mod-event-blobs'

package/src/db/schema/moderation_event.ts

@@ -19,6 +19,7 @@ export interface ModerationEvent {
   subjectDid: string
   subjectUri: string | null
   subjectCid: string | null
+  subjectBlobCids: string[] | null
   createLabelVals: string | null
   negateLabelVals: string | null
   comment: string | null

package/src/db/types.ts

@@ -1,5 +1,5 @@
 import { Pool as PgPool } from 'pg'
-import { DynamicModule, RawBuilder, SelectQueryBuilder } from 'kysely'
+import { DynamicModule, RawBuilder, SelectQueryBuilder, sql } from 'kysely'
 
 export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
 
@@ -13,3 +13,8 @@ export type PgOptions = {
   poolMaxUses?: number
   poolIdleTimeoutMs?: number
 }
+
+export const jsonb = <T>(val: T) => {
+  if (val === null) return sql<T>`null`
+  return sql<T>`${JSON.stringify(val)}::jsonb`
+}

package/src/lexicon/index.ts

@@ -127,7 +127,6 @@ import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
 import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTimelineSkeleton from './types/app/bsky/unspecced/getTimelineSkeleton'
 import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
 import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
 
@@ -1649,17 +1648,6 @@ export class AppBskyUnspeccedNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
-  getTimelineSkeleton<AV extends AuthVerifier>(
-    cfg: ConfigOf<
-      AV,
-      AppBskyUnspeccedGetTimelineSkeleton.Handler<ExtractAuth<AV>>,
-      AppBskyUnspeccedGetTimelineSkeleton.HandlerReqCtx<ExtractAuth<AV>>
-    >,
-  ) {
-    const nsid = 'app.bsky.unspecced.getTimelineSkeleton' // @ts-ignore
-    return this._server.xrpc.method(nsid, cfg)
-  }
-
   searchActorsSkeleton<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,

package/src/lexicon/lexicons.ts

@@ -91,6 +91,7 @@ export const schemaDict = {
               'lex:com.atproto.admin.defs#modEventEscalate',
               'lex:com.atproto.admin.defs#modEventMute',
               'lex:com.atproto.admin.defs#modEventEmail',
+              'lex:com.atproto.admin.defs#modEventResolveAppeal',
             ],
           },
           subject: {
@@ -147,6 +148,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#modEventEmail',
               'lex:com.atproto.admin.defs#modEventResolveAppeal',
             ],
           },
@@ -1450,6 +1452,16 @@ export const schemaDict = {
               description:
                 'Sort direction for the events. Defaults to descending order of created at timestamp.',
             },
+            createdAfter: {
+              type: 'string',
+              format: 'datetime',
+              description: 'Retrieve events created after a given timestamp',
+            },
+            createdBefore: {
+              type: 'string',
+              format: 'datetime',
+              description: 'Retrieve events created before a given timestamp',
+            },
             subject: {
               type: 'string',
               format: 'uri',
@@ -1466,6 +1478,37 @@ export const schemaDict = {
               maximum: 100,
               default: 50,
             },
+            hasComment: {
+              type: 'boolean',
+              description: 'If true, only events with comments are returned',
+            },
+            comment: {
+              type: 'string',
+              description:
+                'If specified, only events with comments containing the keyword are returned',
+            },
+            addedLabels: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these labels were added are returned',
+            },
+            removedLabels: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+              description:
+                'If specified, only events where all of these labels were removed are returned',
+            },
+            reportTypes: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             cursor: {
               type: 'string',
             },
@@ -8100,55 +8143,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyUnspeccedGetTimelineSkeleton: {
-    lexicon: 1,
-    id: 'app.bsky.unspecced.getTimelineSkeleton',
-    defs: {
-      main: {
-        type: 'query',
-        description:
-          'DEPRECATED: a skeleton of a timeline. Unspecced and will be unavailable soon.',
-        parameters: {
-          type: 'params',
-          properties: {
-            limit: {
-              type: 'integer',
-              minimum: 1,
-              maximum: 100,
-              default: 50,
-            },
-            cursor: {
-              type: 'string',
-            },
-          },
-        },
-        output: {
-          encoding: 'application/json',
-          schema: {
-            type: 'object',
-            required: ['feed'],
-            properties: {
-              cursor: {
-                type: 'string',
-              },
-              feed: {
-                type: 'array',
-                items: {
-                  type: 'ref',
-                  ref: 'lex:app.bsky.feed.defs#skeletonFeedPost',
-                },
-              },
-            },
-          },
-        },
-        errors: [
-          {
-            name: 'UnknownFeed',
-          },
-        ],
-      },
-    },
-  },
   AppBskyUnspeccedSearchActorsSkeleton: {
     lexicon: 1,
     id: 'app.bsky.unspecced.searchActorsSkeleton',
@@ -8438,7 +8432,6 @@ export const ids = {
     'app.bsky.unspecced.getPopularFeedGenerators',
   AppBskyUnspeccedGetTaggedSuggestions:
     'app.bsky.unspecced.getTaggedSuggestions',
-  AppBskyUnspeccedGetTimelineSkeleton: 'app.bsky.unspecced.getTimelineSkeleton',
   AppBskyUnspeccedSearchActorsSkeleton:
     'app.bsky.unspecced.searchActorsSkeleton',
   AppBskyUnspeccedSearchPostsSkeleton: 'app.bsky.unspecced.searchPostsSkeleton',

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

@@ -40,6 +40,7 @@ export interface ModEventView {
     | ModEventEscalate
     | ModEventMute
     | ModEventEmail
+    | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoRef
@@ -76,6 +77,7 @@ export interface ModEventViewDetail {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventEmail
     | ModEventResolveAppeal
     | { $type: string; [k: string]: unknown }
   subject: