@atproto/bsky 0.0.7 → 0.0.9

package/dist/db/migrations/20230920T213858047Z-add-tags-to-post.d.ts

@@ -0,0 +1,3 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;

package/dist/db/migrations/index.d.ts

@@ -24,3 +24,4 @@ export * as _20230817T195936007Z from './20230817T195936007Z-native-notification
 export * as _20230830T205507322Z from './20230830T205507322Z-suggested-feeds';
 export * as _20230904T211011773Z from './20230904T211011773Z-block-lists';
 export * as _20230906T222220386Z from './20230906T222220386Z-thread-gating';
+export * as _20230920T213858047Z from './20230920T213858047Z-add-tags-to-post';

package/dist/db/tables/post.d.ts

@@ -10,6 +10,7 @@ export interface Post {
     replyParent: string | null;
     replyParentCid: string | null;
     langs: string[] | null;
+    tags: string[] | null;
     invalidReplyRoot: boolean | null;
     violatesThreadGate: boolean | null;
     createdAt: string;

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 up27 = +matches[1];
+        const up28 = +matches[1];
         jsonPointer = matches[2];
         if (jsonPointer === "#") {
-          if (up27 >= dataLevel)
-            throw new Error(errorMsg("property/index", up27));
-          return dataPathArr[dataLevel - up27];
+          if (up28 >= dataLevel)
+            throw new Error(errorMsg("property/index", up28));
+          return dataPathArr[dataLevel - up28];
         }
-        if (up27 > dataLevel)
-          throw new Error(errorMsg("data", up27));
-        data = dataNames[dataLevel - up27];
+        if (up28 > dataLevel)
+          throw new Error(errorMsg("data", up28));
+        data = dataNames[dataLevel - up28];
         if (!jsonPointer)
           return data;
       }
@@ -27886,8 +27886,8 @@ var require_validate = __commonJS({
         }
       }
       return expr;
-      function errorMsg(pointerType, up27) {
-        return `Cannot access ${pointerType} ${up27} levels up, current level is ${dataLevel}`;
+      function errorMsg(pointerType, up28) {
+        return `Cannot access ${pointerType} ${up28} levels up, current level is ${dataLevel}`;
       }
     }
     exports.getData = getData;
@@ -124352,6 +124352,16 @@ var schemaDict = {
               type: "union",
               refs: ["lex:com.atproto.label.defs#selfLabels"]
             },
+            tags: {
+              type: "array",
+              maxLength: 8,
+              items: {
+                type: "string",
+                maxLength: 640,
+                maxGraphemes: 64
+              },
+              description: "Additional non-inline tags describing this post."
+            },
             createdAt: {
               type: "string",
               format: "datetime"
@@ -125485,7 +125495,8 @@ var schemaDict = {
               type: "union",
               refs: [
                 "lex:app.bsky.richtext.facet#mention",
-                "lex:app.bsky.richtext.facet#link"
+                "lex:app.bsky.richtext.facet#link",
+                "lex:app.bsky.richtext.facet#tag"
               ]
             }
           }
@@ -125513,6 +125524,18 @@ var schemaDict = {
           }
         }
       },
+      tag: {
+        type: "object",
+        description: "A hashtag.",
+        required: ["tag"],
+        properties: {
+          tag: {
+            type: "string",
+            maxLength: 640,
+            maxGraphemes: 64
+          }
+        }
+      },
       byteSlice: {
         type: "object",
         description: "A text segment. Start is inclusive, end is exclusive. Indices are for utf8-encoded strings.",
@@ -134634,6 +134657,16 @@ var schemaDict2 = {
               type: "union",
               refs: ["lex:com.atproto.label.defs#selfLabels"]
             },
+            tags: {
+              type: "array",
+              maxLength: 8,
+              items: {
+                type: "string",
+                maxLength: 640,
+                maxGraphemes: 64
+              },
+              description: "Additional non-inline tags describing this post."
+            },
             createdAt: {
               type: "string",
               format: "datetime"
@@ -135767,7 +135800,8 @@ var schemaDict2 = {
               type: "union",
               refs: [
                 "lex:app.bsky.richtext.facet#mention",
-                "lex:app.bsky.richtext.facet#link"
+                "lex:app.bsky.richtext.facet#link",
+                "lex:app.bsky.richtext.facet#tag"
               ]
             }
           }
@@ -135795,6 +135829,18 @@ var schemaDict2 = {
           }
         }
       },
+      tag: {
+        type: "object",
+        description: "A hashtag.",
+        required: ["tag"],
+        properties: {
+          tag: {
+            type: "string",
+            maxLength: 640,
+            maxGraphemes: 64
+          }
+        }
+      },
       byteSlice: {
         type: "object",
         description: "A text segment. Start is inclusive, end is exclusive. Indices are for utf8-encoded strings.",
@@ -141484,8 +141530,8 @@ var ActorViews = class {
           mutedByList,
           blockedBy: !!bam.blockedBy([viewer, did2]),
           blocking: bam.blocking([viewer, did2]) ?? void 0,
-          following: prof?.viewerFollowing || void 0,
-          followedBy: prof?.viewerFollowedBy || void 0
+          following: prof?.viewerFollowing && !bam.block([viewer, did2]) ? prof.viewerFollowing : void 0,
+          followedBy: prof?.viewerFollowedBy && !bam.block([viewer, did2]) ? prof.viewerFollowedBy : void 0
         } : void 0,
         labels: [...actorLabels, ...selfLabels]
       };
@@ -141550,8 +141596,8 @@ var ActorViews = class {
           mutedByList,
           blockedBy: !!bam.blockedBy([viewer, did2]),
           blocking: bam.blocking([viewer, did2]) ?? void 0,
-          following: prof?.viewerFollowing || void 0,
-          followedBy: prof?.viewerFollowedBy || void 0
+          following: prof?.viewerFollowing && !bam.block([viewer, did2]) ? prof.viewerFollowing : void 0,
+          followedBy: prof?.viewerFollowedBy && !bam.block([viewer, did2]) ? prof.viewerFollowedBy : void 0
         } : void 0,
         labels: [...actorLabels, ...selfLabels]
       };
@@ -141987,6 +142033,7 @@ var FeedService = class {
       "post_agg.likeCount as likeCount",
       "post_agg.repostCount as repostCount",
       "post_agg.replyCount as replyCount",
+      "post.tags as tags",
       db.selectFrom("repost").if(!viewer, (q) => q.where(noMatch)).where("creator", "=", viewer ?? "").whereRef("subject", "=", ref("post.uri")).select("uri").as("requesterRepost"),
       db.selectFrom("like").if(!viewer, (q) => q.where(noMatch)).where("creator", "=", viewer ?? "").whereRef("subject", "=", ref("post.uri")).select("uri").as("requesterLike")
     ]).execute();
@@ -143652,7 +143699,8 @@ __export(migrations_exports, {
   _20230817T195936007Z: () => T195936007Z_native_notifications_exports,
   _20230830T205507322Z: () => T205507322Z_suggested_feeds_exports,
   _20230904T211011773Z: () => T211011773Z_block_lists_exports,
-  _20230906T222220386Z: () => T222220386Z_thread_gating_exports
+  _20230906T222220386Z: () => T222220386Z_thread_gating_exports,
+  _20230920T213858047Z: () => T213858047Z_add_tags_to_post_exports
 });
 
 // src/db/migrations/20230309T045948368Z-init.ts
@@ -144117,6 +144165,19 @@ async function down26(db) {
   await db.schema.alterTable("post").dropColumn("violatesThreadGate").execute();
 }
 
+// src/db/migrations/20230920T213858047Z-add-tags-to-post.ts
+var T213858047Z_add_tags_to_post_exports = {};
+__export(T213858047Z_add_tags_to_post_exports, {
+  down: () => down27,
+  up: () => up27
+});
+async function up27(db) {
+  await db.schema.alterTable("post").addColumn("tags", "jsonb").execute();
+}
+async function down27(db) {
+  await db.schema.alterTable("post").dropColumn("tags").execute();
+}
+
 // src/db/migrations/provider.ts
 var CtxMigrationProvider = class {
   constructor(migrations, ctx) {
@@ -145014,6 +145075,7 @@ var insertFn = async (db, uri2, cid2, obj, timestamp) => {
     replyParent: obj.reply?.parent?.uri || null,
     replyParentCid: obj.reply?.parent?.cid || null,
     langs: obj.langs?.length ? sql`${JSON.stringify(obj.langs)}` : null,
+    tags: obj.tags?.length ? sql`${JSON.stringify(obj.tags)}` : null,
     indexedAt: timestamp
   };
   const [insertedPost] = await Promise.all([
@@ -146645,11 +146707,11 @@ var Abyss = class {
     this.ctx = ctx;
     this.auth = basicAuth(this.password);
   }
-  async scanImage(did2, cid2) {
+  async scanImage(did2, cid2, uri2) {
     const start = Date.now();
     const res = await retryHttp(async () => {
       try {
-        return await this.makeReq(did2, cid2);
+        return await this.makeReq(did2, cid2, uri2);
       } catch (err) {
         labelerLogger.warn({ err, did: did2, cid: cid2.toString() }, "abyss request failed");
         throw err;
@@ -146658,9 +146720,9 @@ var Abyss = class {
     labelerLogger.info({ res, did: did2, cid: cid2.toString(), duration: Date.now() - start }, "abyss response");
     return this.parseRes(res);
   }
-  async makeReq(did2, cid2) {
+  async makeReq(did2, cid2, uri2) {
     const { stream, contentType } = await resolveBlob(did2, cid2, this.ctx.db, this.ctx.idResolver);
-    const { data } = await import_axios8.default.post(this.getReqUrl({ did: did2 }), stream, {
+    const { data } = await import_axios8.default.post(this.getReqUrl({ did: did2, uri: uri2.toString() }), stream, {
       headers: {
         "Content-Type": contentType,
         authorization: this.auth
@@ -146682,7 +146744,8 @@ var Abyss = class {
     return labels;
   }
   getReqUrl(params2) {
-    return `${this.endpoint}/xrpc/com.atproto.unspecced.scanBlob?did=${params2.did}`;
+    const search = new URLSearchParams(params2);
+    return `${this.endpoint}/xrpc/com.atproto.unspecced.scanBlob?${search.toString()}`;
   }
 };
 var TAKEDOWN_LABELS = ["csam", "csem"];
@@ -146859,7 +146922,7 @@ var AutoModerator = class {
   async checkImgForTakedown(uri2, recordCid, imgCids) {
     if (imgCids.length < 0)
       return;
-    const results = await Promise.all(imgCids.map((cid2) => this.imageFlagger?.scanImage(uri2.host, cid2)));
+    const results = await Promise.all(imgCids.map((cid2) => this.imageFlagger?.scanImage(uri2.host, cid2, uri2)));
     const takedownCids = [];
     for (let i = 0; i < results.length; i++) {
       if (results.at(i)?.length) {
@@ -146880,7 +146943,30 @@ var AutoModerator = class {
     }
   }
   async persistTakedown(uri2, recordCid, takedownCids, labels) {
-    const reason = `automated takedown for labels: ${labels.join(", ")}`;
+    const reportReason = `automated takedown (${labels.join(", ")}). account needs review and possibly additional action`;
+    const takedownReason = `automated takedown for labels: ${labels.join(", ")}`;
+    labelerLogger.warn({
+      uri: uri2.toString(),
+      blobCids: takedownCids,
+      labels
+    }, "hard takedown of record (and blobs) based on auto-matching");
+    if (this.services.moderation) {
+      await this.ctx.db.transaction(async (dbTxn) => {
+        if (!this.services.moderation) {
+          return;
+        }
+        const modSrvc = this.services.moderation(dbTxn);
+        await modSrvc.report({
+          reportedBy: this.ctx.cfg.labelerDid,
+          reasonType: REASONVIOLATION,
+          subject: {
+            uri: uri2,
+            cid: recordCid
+          },
+          reason: reportReason
+        });
+      });
+    }
     if (this.pushAgent) {
       await this.pushAgent.com.atproto.admin.takeModerationAction({
         action: "com.atproto.admin.defs#takedown",
@@ -146890,7 +146976,7 @@ var AutoModerator = class {
           cid: recordCid.toString()
         },
         subjectBlobCids: takedownCids.map((c) => c.toString()),
-        reason,
+        reason: takedownReason,
         createdBy: this.ctx.cfg.labelerDid
       });
     } else {
@@ -146903,7 +146989,7 @@ var AutoModerator = class {
           action: "com.atproto.admin.defs#takedown",
           subject: { uri: uri2, cid: recordCid },
           subjectBlobCids: takedownCids,
-          reason,
+          reason: takedownReason,
           createdBy: this.ctx.cfg.labelerDid
         });
         await modSrvc.takedownRecord({