@atproto/ozone 0.0.17-next.1 → 0.1.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atproto/ozone
 
+## 0.1.0
+
+### Minor Changes
+
+- [`971d3e4c2`](https://github.com/bluesky-social/atproto/commit/971d3e4c26ecfda746e83d458391715752ea7064) Thanks [@devinivy](https://github.com/devinivy)! - Resign labels on overwrite, omit neg:false on labels
+
+### Patch Changes
+
+- Updated dependencies [[`219480764`](https://github.com/bluesky-social/atproto/commit/2194807644cbdb0021e867437693300c1b0e55f5)]:
+  - @atproto/api@0.11.1
+
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies [[`4eaadc0ac`](https://github.com/bluesky-social/atproto/commit/4eaadc0acb6b73b9745dd7a2b929d02e58083ab0), [`4eaadc0ac`](https://github.com/bluesky-social/atproto/commit/4eaadc0acb6b73b9745dd7a2b929d02e58083ab0)]:
+  - @atproto/identity@0.3.3
+  - @atproto/api@0.11.0
+  - @atproto/common@0.3.4
+  - @atproto/lexicon@0.3.3
+  - @atproto/syntax@0.2.1
+  - @atproto/crypto@0.3.0
+  - @atproto/xrpc-server@0.4.4
+
 ## 0.0.16
 
 ### Patch Changes

package/dist/index.js

@@ -104377,6 +104377,11 @@ var schemaDict = {
                 description: "URLs of service policy documents.",
                 ref: "lex:com.atproto.server.describeServer#links"
               },
+              contact: {
+                type: "ref",
+                description: "Contact information",
+                ref: "lex:com.atproto.server.describeServer#contact"
+              },
               did: {
                 type: "string",
                 format: "did"
@@ -104395,6 +104400,14 @@ var schemaDict = {
             type: "string"
           }
         }
+      },
+      contact: {
+        type: "object",
+        properties: {
+          email: {
+            type: "string"
+          }
+        }
       }
     }
   },
@@ -119338,27 +119351,19 @@ function subscribeLabels_default(server, ctx) {
       }
     }
     for await (const evt of outbox.events(cursor, signal)) {
-      yield { $type: "com.atproto.label.subscribeLabels#labels", ...evt };
+      yield { $type: "#labels", ...evt };
     }
   });
 }
 
-// src/mod-service/types.ts
-var UNSPECCED_TAKEDOWN_LABEL = "!unspecced-takedown";
-var UNSPECCED_TAKEDOWN_BLOBS_LABEL = "!unspecced-takedown-blobs";
-
 // src/api/label/fetchLabels.ts
 function fetchLabels_default(server, ctx) {
   server.com.atproto.temp.fetchLabels({
     auth: ctx.authVerifier.standardOptionalOrAdminToken,
-    handler: async ({ auth, params: params2 }) => {
+    handler: async ({ params: params2 }) => {
       const { limit } = params2;
       const since = params2.since !== void 0 ? new Date(params2.since).toISOString() : "";
-      const includeUnspeccedTakedowns = auth.credentials.type === "none" ? false : auth.credentials.isAdmin;
-      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 labelRes = await ctx.db.db.selectFrom("label").selectAll().orderBy("label.cts", "asc").where("cts", ">", since).limit(limit).execute();
       const modSrvc = ctx.modService(ctx.db);
       const labels = await Promise.all(labelRes.map((l) => modSrvc.views.formatLabelAndEnsureSig(l)));
       return {
@@ -122988,6 +122993,11 @@ var schemaDict2 = {
                 description: "URLs of service policy documents.",
                 ref: "lex:com.atproto.server.describeServer#links"
               },
+              contact: {
+                type: "ref",
+                description: "Contact information",
+                ref: "lex:com.atproto.server.describeServer#contact"
+              },
               did: {
                 type: "string",
                 format: "did"
@@ -123006,6 +123016,14 @@ var schemaDict2 = {
             type: "string"
           }
         }
+      },
+      contact: {
+        type: "object",
+        properties: {
+          email: {
+            type: "string"
+          }
+        }
       }
     }
   },
@@ -131932,6 +131950,7 @@ var _AtpAgent = class {
     inst.labelersHeader = this.labelersHeader;
     inst.proxyHeader = this.proxyHeader;
     inst.pdsUrl = this.pdsUrl;
+    inst.api.xrpc.uri = this.pdsUrl || this.service;
   }
   withProxy(serviceType, did2) {
     const inst = this.clone();
@@ -132415,7 +132434,7 @@ var formatLabel = (row) => {
     uri: row.uri,
     cid: row.cid === "" ? void 0 : row.cid,
     val: row.val,
-    neg: row.neg,
+    neg: row.neg === true ? true : void 0,
     cts: row.cts,
     exp: row.exp ?? void 0,
     sig: row.sig ? new Uint8Array(row.sig) : void 0
@@ -132860,7 +132879,7 @@ function getSelfLabels(details) {
   const src3 = new AtUri(uri2).host;
   const cts = typeof record.createdAt === "string" ? normalizeDatetimeAlways(record.createdAt) : new Date(0).toISOString();
   return record.labels.values.map(({ val }) => {
-    return { src: src3, uri: uri2, cid: cid2, val, cts, neg: false };
+    return { src: src3, uri: uri2, cid: cid2, val, cts };
   });
 }
 
@@ -133435,8 +133454,9 @@ var ModerationService = class {
       attempts: 0,
       lastAttempted: null
     })).returning("id").execute();
+    const takedownLabel = isSuspend ? SUSPEND_LABEL : TAKEDOWN_LABEL;
     await this.formatAndCreateLabels(subject.did, null, {
-      create: [UNSPECCED_TAKEDOWN_LABEL]
+      create: [takedownLabel]
     });
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
@@ -133451,8 +133471,10 @@ var ModerationService = class {
       attempts: 0,
       lastAttempted: null
     }).returning("id").execute();
+    const existingTakedownLabels = await this.db.db.selectFrom("label").where("label.uri", "=", subject.did).where("label.val", "in", [TAKEDOWN_LABEL, SUSPEND_LABEL]).where("neg", "=", false).selectAll().execute();
+    const takedownVals = existingTakedownLabels.map((row) => row.val);
     await this.formatAndCreateLabels(subject.did, null, {
-      negate: [UNSPECCED_TAKEDOWN_LABEL]
+      negate: takedownVals
     });
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
@@ -133462,33 +133484,11 @@ var ModerationService = class {
   }
   async takedownRecord(subject, takedownId) {
     this.db.assertTransaction();
-    const takedownRef = `BSKY-TAKEDOWN-${takedownId}`;
-    const values = this.eventPusher.takedowns.map((eventType) => ({
-      eventType,
-      subjectDid: subject.did,
-      subjectUri: subject.uri,
-      subjectCid: subject.cid,
-      takedownRef
-    }));
-    const blobCids = subject.blobCids;
-    const labels = [UNSPECCED_TAKEDOWN_LABEL];
-    if (blobCids && blobCids.length > 0) {
-      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL);
-    }
-    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();
     await 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)));
-      });
+      create: [TAKEDOWN_LABEL]
     });
+    const takedownRef = `BSKY-TAKEDOWN-${takedownId}`;
+    const blobCids = subject.blobCids;
     if (blobCids && blobCids.length > 0) {
       const blobValues = [];
       for (const eventType of this.eventPusher.takedowns) {
@@ -133518,24 +133518,10 @@ var ModerationService = class {
   }
   async reverseTakedownRecord(subject) {
     this.db.assertTransaction();
-    const labels = [UNSPECCED_TAKEDOWN_LABEL];
-    const blobCids = subject.blobCids;
-    if (blobCids && blobCids.length > 0) {
-      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL);
-    }
-    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();
     await 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)));
-      });
+      negate: [TAKEDOWN_LABEL]
     });
+    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,
@@ -133687,7 +133673,10 @@ var ModerationService = class {
     const res = await this.db.db.insertInto("label").values(dbVals).onConflict((oc) => oc.columns(["src", "uri", "cid", "val"]).doUpdateSet({
       id: sql`${excluded("id")}`,
       neg: sql`${excluded("neg")}`,
-      cts: sql`${excluded("cts")}`
+      cts: sql`${excluded("cts")}`,
+      exp: sql`${excluded("exp")}`,
+      sig: sql`${excluded("sig")}`,
+      signingKeyId: sql`${excluded("signingKeyId")}`
     })).returningAll().execute();
     return res.map((row) => formatLabel(row));
   }
@@ -133727,6 +133716,8 @@ var isSafeUrl = (url) => {
   return true;
 };
 var TAKEDOWNS = ["pds_takedown", "appview_takedown"];
+var TAKEDOWN_LABEL = "!takedown";
+var SUSPEND_LABEL = "!suspend";
 
 // src/background.ts
 var import_p_queue = __toESM(require_dist5());