@atproto/ozone 0.0.7 → 0.0.8

package/dist/index.js

@@ -27864,16 +27864,16 @@ var require_validate = __commonJS({
         const matches = RELATIVE_JSON_POINTER.exec($data);
         if (!matches)
           throw new Error(`Invalid JSON-pointer: ${$data}`);
-        const up3 = +matches[1];
+        const up4 = +matches[1];
         jsonPointer = matches[2];
         if (jsonPointer === "#") {
-          if (up3 >= dataLevel)
-            throw new Error(errorMsg("property/index", up3));
-          return dataPathArr[dataLevel - up3];
+          if (up4 >= dataLevel)
+            throw new Error(errorMsg("property/index", up4));
+          return dataPathArr[dataLevel - up4];
         }
-        if (up3 > dataLevel)
-          throw new Error(errorMsg("data", up3));
-        data = dataNames[dataLevel - up3];
+        if (up4 > dataLevel)
+          throw new Error(errorMsg("data", up4));
+        data = dataNames[dataLevel - up4];
         if (!jsonPointer)
           return data;
       }
@@ -27886,8 +27886,8 @@ var require_validate = __commonJS({
         }
       }
       return expr;
-      function errorMsg(pointerType, up3) {
-        return `Cannot access ${pointerType} ${up3} levels up, current level is ${dataLevel}`;
+      function errorMsg(pointerType, up4) {
+        return `Cannot access ${pointerType} ${up4} levels up, current level is ${dataLevel}`;
       }
     }
     exports.getData = getData;
@@ -101683,7 +101683,8 @@ var 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#modEventEmail",
+              "lex:com.atproto.admin.defs#modEventResolveAppeal"
             ]
           },
           subject: {
@@ -101740,6 +101741,7 @@ var 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"
             ]
           },
@@ -103029,6 +103031,16 @@ var schemaDict = {
               enum: ["asc", "desc"],
               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"
@@ -103044,6 +103056,34 @@ var 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"
             }
@@ -109608,54 +109648,6 @@ var 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",
@@ -109855,7 +109847,8 @@ var eventTypes = /* @__PURE__ */ new Set([
   "com.atproto.admin.defs#modEventMute",
   "com.atproto.admin.defs#modEventUnmute",
   "com.atproto.admin.defs#modEventReverseTakedown",
-  "com.atproto.admin.defs#modEventEmail"
+  "com.atproto.admin.defs#modEventEmail",
+  "com.atproto.admin.defs#modEventResolveAppeal"
 ]);
 
 // src/mod-service/subject.ts
@@ -109873,7 +109866,7 @@ var subjectFromInput = (subject, blobs) => {
 };
 var subjectFromEventRow = (row) => {
   if (row.subjectType === "com.atproto.repo.strongRef" && row.subjectUri && row.subjectCid) {
-    return new RecordSubject(row.subjectUri, row.subjectCid);
+    return new RecordSubject(row.subjectUri, row.subjectCid, row.subjectBlobCids ?? []);
   } else {
     return new RepoSubject(row.subjectDid);
   }
@@ -109881,7 +109874,7 @@ var subjectFromEventRow = (row) => {
 var subjectFromStatusRow = (row) => {
   if (row.recordPath && row.recordCid) {
     const uri2 = AtUri.make(row.did, ...row.recordPath.split("/")).toString();
-    return new RecordSubject(uri2.toString(), row.recordCid);
+    return new RecordSubject(uri2.toString(), row.recordCid, row.blobCids ?? []);
   } else {
     return new RepoSubject(row.did);
   }
@@ -109903,7 +109896,8 @@ var RepoSubject = class {
       subjectType: "com.atproto.admin.defs#repoRef",
       subjectDid: this.did,
       subjectUri: null,
-      subjectCid: null
+      subjectCid: null,
+      subjectBlobCids: null
     };
   }
   lex() {
@@ -109933,7 +109927,8 @@ var RecordSubject = class {
       subjectType: "com.atproto.repo.strongRef",
       subjectDid: this.did,
       subjectUri: this.uri,
-      subjectCid: this.cid
+      subjectCid: this.cid,
+      subjectBlobCids: this.blobCids ?? []
     };
   }
   lex() {
@@ -110004,13 +109999,16 @@ function emitModerationEvent_default(server, ctx) {
         ]);
       }
       if (isTakedownEvent || isReverseTakedownEvent) {
-        const isSubjectTakendown = await moderationService.isSubjectTakendown(subject);
-        if (isSubjectTakendown && isTakedownEvent) {
+        const status = await moderationService.getStatus(subject);
+        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()) {
+          subject.blobCids = status.blobCids ?? [];
+        }
       }
       const moderationEvent = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.modService(dbTxn);
@@ -110035,7 +110033,7 @@ function emitModerationEvent_default(server, ctx) {
           }
         }
         if (isLabelEvent) {
-          await moderationTxn.formatAndCreateLabels(ctx.cfg.service.did, result.subjectUri ?? result.subjectDid, result.subjectCid, {
+          await moderationTxn.formatAndCreateLabels(result.subjectUri ?? result.subjectDid, result.subjectCid, {
             create: result.createLabelVals?.length ? result.createLabelVals.split(" ") : void 0,
             negate: result.negateLabelVals?.length ? result.negateLabelVals.split(" ") : void 0
           });
@@ -110241,7 +110239,14 @@ function queryModerationEvents_default(server, ctx) {
         sortDirection = "desc",
         types,
         includeAllUserRecords = false,
-        createdBy
+        hasComment,
+        comment,
+        createdBy,
+        createdAfter,
+        createdBefore,
+        addedLabels = [],
+        removedLabels = [],
+        reportTypes
       } = params2;
       const db = ctx.db;
       const modService = ctx.modService(db);
@@ -110252,7 +110257,14 @@ function queryModerationEvents_default(server, ctx) {
         limit,
         cursor,
         sortDirection,
-        includeAllUserRecords
+        includeAllUserRecords,
+        hasComment,
+        comment,
+        createdAfter,
+        createdBefore,
+        addedLabels,
+        removedLabels,
+        reportTypes
       });
       return {
         encoding: "application/json",
@@ -110283,22 +110295,33 @@ function getModerationEvent_default(server, ctx) {
   });
 }
 
+// src/mod-service/types.ts
+var UNSPECCED_TAKEDOWN_LABEL = "!unspecced-takedown";
+var UNSPECCED_TAKEDOWN_BLOBS_LABEL = "!unspecced-takedown-blobs";
+
 // src/api/temp/fetchLabels.ts
 function fetchLabels_default(server, ctx) {
-  server.com.atproto.temp.fetchLabels(async ({ params: params2 }) => {
-    const { limit } = params2;
-    const since = params2.since !== void 0 ? new Date(params2.since).toISOString() : "";
-    const labelRes = await ctx.db.db.selectFrom("label").selectAll().orderBy("label.cts", "asc").where("cts", ">", since).limit(limit).execute();
-    const labels = labelRes.map((l) => ({
-      ...l,
-      cid: l.cid === "" ? void 0 : l.cid
-    }));
-    return {
-      encoding: "application/json",
-      body: {
-        labels
-      }
-    };
+  server.com.atproto.temp.fetchLabels({
+    auth: ctx.authOptionalAccessOrRoleVerifier,
+    handler: async ({ auth, params: params2 }) => {
+      const { limit } = params2;
+      const since = params2.since !== void 0 ? new Date(params2.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 === "" ? void 0 : l.cid
+      }));
+      return {
+        encoding: "application/json",
+        body: {
+          labels
+        }
+      };
+    }
   });
 }
 
@@ -118631,10 +118654,6 @@ var AppBskyUnspeccedNS = class {
     const nsid2 = "app.bsky.unspecced.getTaggedSuggestions";
     return this._server.xrpc.method(nsid2, cfg);
   }
-  getTimelineSkeleton(cfg) {
-    const nsid2 = "app.bsky.unspecced.getTimelineSkeleton";
-    return this._server.xrpc.method(nsid2, cfg);
-  }
   searchActorsSkeleton(cfg) {
     const nsid2 = "app.bsky.unspecced.searchActorsSkeleton";
     return this._server.xrpc.method(nsid2, cfg);
@@ -119070,7 +119089,8 @@ var schemaDict2 = {
               "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#modEventEmail",
+              "lex:com.atproto.admin.defs#modEventResolveAppeal"
             ]
           },
           subject: {
@@ -119127,6 +119147,7 @@ var schemaDict2 = {
               "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"
             ]
           },
@@ -120416,6 +120437,16 @@ var schemaDict2 = {
               enum: ["asc", "desc"],
               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"
@@ -120431,6 +120462,34 @@ var schemaDict2 = {
               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"
             }
@@ -126995,54 +127054,6 @@ var schemaDict2 = {
       }
     }
   },
-  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",
@@ -128322,27 +128333,13 @@ function toKnownErr116(e) {
   return e;
 }
 
-// ../api/src/client/types/app/bsky/unspecced/getTimelineSkeleton.ts
-var UnknownFeedError3 = class extends XRPCError {
-  constructor(src3) {
-    super(src3.status, src3.error, src3.message, src3.headers);
-  }
-};
-function toKnownErr117(e) {
-  if (e instanceof XRPCError) {
-    if (e.error === "UnknownFeed")
-      return new UnknownFeedError3(e);
-  }
-  return e;
-}
-
 // ../api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
 var BadQueryStringError2 = class extends XRPCError {
   constructor(src3) {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr118(e) {
+function toKnownErr117(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError2(e);
@@ -128356,7 +128353,7 @@ var BadQueryStringError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr119(e) {
+function toKnownErr118(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError3(e);
@@ -129384,19 +129381,14 @@ var AppBskyUnspeccedNS2 = class {
       throw toKnownErr116(e);
     });
   }
-  getTimelineSkeleton(params2, opts) {
-    return this._service.xrpc.call("app.bsky.unspecced.getTimelineSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr117(e);
-    });
-  }
   searchActorsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchActorsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr118(e);
+      throw toKnownErr117(e);
     });
   }
   searchPostsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchPostsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr119(e);
+      throw toKnownErr118(e);
     });
   }
 };
@@ -130541,7 +130533,8 @@ var import_stream8 = require("stream");
 var migrations_exports = {};
 __export(migrations_exports, {
   _20231219T205730722Z: () => T205730722Z_init_exports,
-  _20240116T085607200Z: () => T085607200Z_communication_template_exports
+  _20240116T085607200Z: () => T085607200Z_communication_template_exports,
+  _20240201T051104136Z: () => T051104136Z_mod_event_blobs_exports
 });
 
 // src/db/migrations/20231219T205730722Z-init.ts
@@ -130599,6 +130592,19 @@ async function down2(db) {
   await db.schema.dropTable("communication_template");
 }
 
+// src/db/migrations/20240201T051104136Z-mod-event-blobs.ts
+var T051104136Z_mod_event_blobs_exports = {};
+__export(T051104136Z_mod_event_blobs_exports, {
+  down: () => down3,
+  up: () => up3
+});
+async function up3(db) {
+  await db.schema.alterTable("moderation_event").addColumn("subjectBlobCids", "jsonb").execute();
+}
+async function down3(db) {
+  await db.schema.alterTable("moderation_event").dropColumn("subjectBlobCids").execute();
+}
+
 // src/db/migrations/provider.ts
 var CtxMigrationProvider = class {
   constructor(migrations, ctx) {
@@ -130799,7 +130805,7 @@ var ModerationViews = class {
         comment: event.comment ?? void 0
       },
       subject: subjectFromEventRow(event).lex(),
-      subjectBlobCids: [],
+      subjectBlobCids: event.subjectBlobCids ?? [],
       createdBy: event.createdBy,
       createdAt: event.createdAt,
       subjectHandle: event.subjectHandle ?? void 0,
@@ -131126,6 +131132,13 @@ function getSelfLabels(details) {
   });
 }
 
+// src/db/types.ts
+var jsonb = (val) => {
+  if (val === null)
+    return sql`null`;
+  return sql`${JSON.stringify(val)}::jsonb`;
+};
+
 // src/mod-service/status.ts
 var getSubjectStatusForModerationEvent = ({
   action,
@@ -131250,7 +131263,7 @@ var adjustModerationSubjectStatus = async (db, moderationEvent, blobCids) => {
     subjectStatus.comment = comment;
   }
   if (blobCids?.length) {
-    const newBlobCids = sql`${JSON.stringify(blobCids)}`;
+    const newBlobCids = jsonb(blobCids);
     newStatus.blobCids = newBlobCids;
     subjectStatus.blobCids = newBlobCids;
   }
@@ -131423,16 +131436,17 @@ var paginate = (qb, opts) => {
 
 // src/mod-service/index.ts
 var ModerationService = class {
-  constructor(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth) {
+  constructor(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid) {
     this.db = db;
     this.backgroundQueue = backgroundQueue;
     this.eventPusher = eventPusher;
     this.appviewAgent = appviewAgent;
     this.appviewAuth = appviewAuth;
+    this.serverDid = serverDid;
     this.views = new ModerationViews(this.db, this.appviewAgent, this.appviewAuth);
   }
-  static creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth) {
-    return (db) => new ModerationService(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth);
+  static creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid) {
+    return (db) => new ModerationService(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid);
   }
   async getEvent(id) {
     return await this.db.db.selectFrom("moderation_event").selectAll().where("id", "=", id).executeTakeFirst();
@@ -131451,7 +131465,14 @@ var ModerationService = class {
       cursor,
       includeAllUserRecords,
       sortDirection = "desc",
-      types
+      types,
+      hasComment,
+      comment,
+      createdAfter,
+      createdBefore,
+      addedLabels,
+      removedLabels,
+      reportTypes
     } = opts;
     let builder = this.db.db.selectFrom("moderation_event").selectAll();
     if (subject) {
@@ -131477,6 +131498,31 @@ var ModerationService = class {
     if (createdBy) {
       builder = builder.where("createdBy", "=", createdBy);
     }
+    if (createdAfter) {
+      builder = builder.where("createdAt", ">=", createdAfter);
+    }
+    if (createdBefore) {
+      builder = builder.where("createdAt", "<=", createdBefore);
+    }
+    if (comment) {
+      builder = builder.where("comment", "ilike", `%${comment}%`);
+    }
+    if (hasComment) {
+      builder = builder.where("comment", "is not", null);
+    }
+    if (addedLabels.length) {
+      addedLabels.forEach((label) => {
+        builder = builder.where("createLabelVals", "ilike", `%${label}%`);
+      });
+    }
+    if (removedLabels.length) {
+      removedLabels.forEach((label) => {
+        builder = builder.where("negateLabelVals", "ilike", `%${label}%`);
+      });
+    }
+    if (reportTypes?.length) {
+      builder = builder.where(sql`meta->>'reportType'`, "in", reportTypes);
+    }
     const { ref } = this.db.db.dynamic;
     const keyset = new TimeIdKeyset(ref(`moderation_event.createdAt`), ref("moderation_event.id"));
     const paginatedBuilder = paginate(builder, {
@@ -131525,6 +131571,7 @@ var ModerationService = class {
     if (isModEventEmail(event)) {
       meta.subjectLine = event.subjectLine;
     }
+    const subjectInfo = subject.info();
     const modEvent = await this.db.db.insertInto("moderation_event").values({
       comment: event.comment ? `${event.comment}` : null,
       action: event.$type,
@@ -131535,7 +131582,11 @@ var ModerationService = class {
       durationInHours: event.durationInHours ? Number(event.durationInHours) : null,
       meta,
       expiresAt: (isModEventTakedown(event) || isModEventMute(event)) && event.durationInHours ? addHoursToDate(event.durationInHours, createdAt).toISOString() : void 0,
-      ...subject.info()
+      subjectType: subjectInfo.subjectType,
+      subjectDid: subjectInfo.subjectDid,
+      subjectUri: subjectInfo.subjectUri,
+      subjectCid: subjectInfo.subjectCid,
+      subjectBlobCids: jsonb(subjectInfo.subjectBlobCids)
     }).returningAll().executeTakeFirstOrThrow();
     await adjustModerationSubjectStatus(this.db, modEvent, subject.blobCids);
     return modEvent;
@@ -131603,12 +131654,17 @@ var ModerationService = class {
       subjectDid: subject.did,
       takedownRef
     }));
-    const repoEvts = await this.db.db.insertInto("repo_push_event").values(values).onConflict((oc) => oc.columns(["subjectDid", "eventType"]).doUpdateSet({
-      takedownRef,
-      confirmedAt: null,
-      attempts: 0,
-      lastAttempted: null
-    })).returning("id").execute();
+    const [repoEvts] = await Promise.all([
+      this.db.db.insertInto("repo_push_event").values(values).onConflict((oc) => oc.columns(["subjectDid", "eventType"]).doUpdateSet({
+        takedownRef,
+        confirmedAt: null,
+        attempts: 0,
+        lastAttempted: null
+      })).returning("id").execute(),
+      this.formatAndCreateLabels(subject.did, null, {
+        create: [UNSPECCED_TAKEDOWN_LABEL]
+      })
+    ]);
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(repoEvts.map((evt) => this.eventPusher.attemptRepoEvent(evt.id)));
@@ -131616,12 +131672,17 @@ var ModerationService = class {
     });
   }
   async reverseTakedownRepo(subject) {
-    const repoEvts = await this.db.db.updateTable("repo_push_event").where("eventType", "in", TAKEDOWNS).where("subjectDid", "=", subject.did).set({
-      takedownRef: null,
-      confirmedAt: null,
-      attempts: 0,
-      lastAttempted: null
-    }).returning("id").execute();
+    const [repoEvts] = await Promise.all([
+      this.db.db.updateTable("repo_push_event").where("eventType", "in", TAKEDOWNS).where("subjectDid", "=", subject.did).set({
+        takedownRef: null,
+        confirmedAt: null,
+        attempts: 0,
+        lastAttempted: null
+      }).returning("id").execute(),
+      this.formatAndCreateLabels(subject.did, null, {
+        negate: [UNSPECCED_TAKEDOWN_LABEL]
+      })
+    ]);
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(repoEvts.map((evt) => this.eventPusher.attemptRepoEvent(evt.id)));
@@ -131638,18 +131699,25 @@ var ModerationService = class {
       subjectCid: subject.cid,
       takedownRef
     }));
-    const recordEvts = await this.db.db.insertInto("record_push_event").values(values).onConflict((oc) => oc.columns(["subjectUri", "eventType"]).doUpdateSet({
-      takedownRef,
-      confirmedAt: null,
-      attempts: 0,
-      lastAttempted: null
-    })).returning("id").execute();
+    const blobCids = subject.blobCids;
+    const labels = [UNSPECCED_TAKEDOWN_LABEL];
+    if (blobCids && blobCids.length > 0) {
+      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL);
+    }
+    const [recordEvts] = await Promise.all([
+      this.db.db.insertInto("record_push_event").values(values).onConflict((oc) => oc.columns(["subjectUri", "eventType"]).doUpdateSet({
+        takedownRef,
+        confirmedAt: null,
+        attempts: 0,
+        lastAttempted: null
+      })).returning("id").execute(),
+      this.formatAndCreateLabels(subject.uri, subject.cid, { create: labels })
+    ]);
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(recordEvts.map((evt) => this.eventPusher.attemptRecordEvent(evt.id)));
       });
     });
-    const blobCids = subject.blobCids;
     if (blobCids && blobCids.length > 0) {
       const blobValues = [];
       for (const eventType of TAKEDOWNS) {
@@ -131677,18 +131745,25 @@ var ModerationService = class {
   }
   async reverseTakedownRecord(subject) {
     this.db.assertTransaction();
-    const recordEvts = await this.db.db.updateTable("record_push_event").where("eventType", "in", TAKEDOWNS).where("subjectDid", "=", subject.did).where("subjectUri", "=", subject.uri).set({
-      takedownRef: null,
-      confirmedAt: null,
-      attempts: 0,
-      lastAttempted: null
-    }).returning("id").execute();
+    const labels = [UNSPECCED_TAKEDOWN_LABEL];
+    const blobCids = subject.blobCids;
+    if (blobCids && blobCids.length > 0) {
+      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL);
+    }
+    const [recordEvts] = await Promise.all([
+      this.db.db.updateTable("record_push_event").where("eventType", "in", TAKEDOWNS).where("subjectDid", "=", subject.did).where("subjectUri", "=", subject.uri).set({
+        takedownRef: null,
+        confirmedAt: null,
+        attempts: 0,
+        lastAttempted: null
+      }).returning("id").execute(),
+      this.formatAndCreateLabels(subject.uri, subject.cid, { negate: labels })
+    ]);
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(recordEvts.map((evt) => this.eventPusher.attemptRecordEvent(evt.id)));
       });
     });
-    const blobCids = subject.blobCids;
     if (blobCids && blobCids.length > 0) {
       const blobEvts = await this.db.db.updateTable("blob_push_event").where("eventType", "in", TAKEDOWNS).where("subjectDid", "=", subject.did).where("subjectBlobCid", "in", blobCids.map((c) => c.toString())).set({
         takedownRef: null,
@@ -131796,15 +131871,14 @@ var ModerationService = class {
       cursor: keyset.packFromResult(results)
     };
   }
-  async isSubjectTakendown(subject) {
-    const builder = this.db.db.selectFrom("moderation_subject_status").where("did", "=", subject.did).where("recordPath", "=", subject.recordPath || "");
-    const result = await builder.select("takendown").executeTakeFirst();
-    return !!result?.takendown;
+  async getStatus(subject) {
+    const result = await this.db.db.selectFrom("moderation_subject_status").where("did", "=", subject.did).where("recordPath", "=", subject.recordPath ?? "").selectAll().executeTakeFirst();
+    return result ?? null;
   }
-  async formatAndCreateLabels(src3, uri2, cid2, labels) {
+  async formatAndCreateLabels(uri2, cid2, labels) {
     const { create: create2 = [], negate = [] } = labels;
     const toCreate = create2.map((val) => ({
-      src: src3,
+      src: this.serverDid,
       uri: uri2,
       cid: cid2 ?? void 0,
       val,
@@ -131812,7 +131886,7 @@ var ModerationService = class {
       cts: new Date().toISOString()
     }));
     const toNegate = negate.map((val) => ({
-      src: src3,
+      src: this.serverDid,
       uri: uri2,
       cid: cid2 ?? void 0,
       val,
@@ -132232,7 +132306,7 @@ var DaemonContext = class {
       pds: cfg.pds ?? void 0
     });
     const backgroundQueue = new BackgroundQueue(db);
-    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth);
+    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, cfg.service.did);
     const eventReverser = new EventReverser(db, modService);
     return new DaemonContext({
       db,
@@ -132377,7 +132451,7 @@ var AppContext = class {
       appview: cfg.appview,
       pds: cfg.pds ?? void 0
     });
-    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth);
+    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, cfg.service.did);
     const communicationTemplateService = CommunicationTemplateService.creator();
     const idResolver = new IdResolver({
       plcUrl: cfg.identity.plcUrl