@rmdes/indiekit-endpoint-activitypub 2.15.2 → 2.15.4

package/index.js

@@ -434,7 +434,7 @@ export default class ActivityPubEndpoint {
           "properties.url": requestUrl,
         });
 
-        if (!post) {
+        if (!post || post.properties?.deleted) {
           return next();
         }
 

package/lib/controllers/compose.js

@@ -216,7 +216,7 @@ export function submitComposeController(mountPath, plugin) {
       }
 
       if (cwEnabled && summary && summary.trim()) {
-        micropubData.append("summary", summary.trim());
+        micropubData.append("content-warning", summary.trim());
         micropubData.append("sensitive", "true");
       }
 

package/lib/federation-setup.js

@@ -609,10 +609,11 @@ function setupOutbox(federation, mountPath, handle, collections) {
 
         const pageSize = 20;
         const skip = cursor ? Number.parseInt(cursor, 10) : 0;
-        const total = await postsCollection.countDocuments();
+        const notDeleted = { "properties.deleted": { $exists: false } };
+        const total = await postsCollection.countDocuments(notDeleted);
 
         const posts = await postsCollection
-          .find()
+          .find(notDeleted)
           .sort({ "properties.published": -1 })
           .skip(skip)
           .limit(pageSize)
@@ -644,7 +645,9 @@ function setupOutbox(federation, mountPath, handle, collections) {
       if (identifier !== handle) return 0;
       const postsCollection = collections.posts;
       if (!postsCollection) return 0;
-      return await postsCollection.countDocuments();
+      return await postsCollection.countDocuments({
+        "properties.deleted": { $exists: false },
+      });
     })
     .setFirstCursor(async () => "0");
 }
@@ -656,6 +659,8 @@ function setupObjectDispatchers(federation, mountPath, handle, collections, publ
     const postUrl = `${publicationUrl.replace(/\/$/, "")}/${id}`;
     const post = await collections.posts.findOne({ "properties.url": postUrl });
     if (!post) return null;
+    // Soft-deleted posts should not be dereferenceable
+    if (post.properties?.deleted) return null;
     const actorUrl = ctx.getActorUri(handle).href;
     const activity = jf2ToAS2Activity(post.properties, actorUrl, publicationUrl);
     // Only Create activities wrap Note/Article objects

package/lib/jf2-to-as2.js

@@ -171,6 +171,12 @@ export function jf2ToActivityStreams(properties, actorUrl, publicationUrl, optio
     object.sensitive = true;
   }
 
+  // Content warning text for Mastodon CW display
+  if (properties["content-warning"]) {
+    object.summary = properties["content-warning"];
+    object.sensitive = true;
+  }
+
   if (properties["in-reply-to"]) {
     object.inReplyTo = properties["in-reply-to"];
   }
@@ -337,9 +343,9 @@ export function jf2ToAS2Activity(properties, actorUrl, publicationUrl, options =
   if (properties["post-status"] === "sensitive") {
     noteOptions.sensitive = true;
   }
-  // Summary doubles as CW text in Mastodon (notes only — articles already use summary for description)
-  if (properties.summary && !isArticle) {
-    noteOptions.summary = properties.summary;
+  // Content warning text for Mastodon CW display
+  if (properties["content-warning"]) {
+    noteOptions.summary = properties["content-warning"];
     noteOptions.sensitive = true;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.15.2",
+  "version": "2.15.4",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",