@rmdes/indiekit-endpoint-activitypub 2.11.0 → 2.11.2

package/index.js

@@ -326,6 +326,38 @@ export default class ActivityPubEndpoint {
     const router = express.Router(); // eslint-disable-line new-cap
     const self = this;
 
+    // Intercept Micropub delete actions to broadcast Delete to fediverse.
+    // Wraps res.json to detect successful delete responses, then fires
+    // broadcastDelete asynchronously so remote servers remove the post.
+    router.use((req, res, next) => {
+      if (req.method !== "POST") return next();
+      if (!req.path.endsWith("/micropub")) return next();
+
+      const action = req.query?.action || req.body?.action;
+      if (action !== "delete") return next();
+
+      const postUrl = req.query?.url || req.body?.url;
+      if (!postUrl) return next();
+
+      const originalJson = res.json.bind(res);
+      res.json = function (body) {
+        // Fire broadcastDelete after successful delete (status 200)
+        if (res.statusCode === 200 && body?.success === "delete") {
+          console.info(
+            `[ActivityPub] Micropub delete detected for ${postUrl}, broadcasting Delete to followers`,
+          );
+          self.broadcastDelete(postUrl).catch((error) => {
+            console.warn(
+              `[ActivityPub] broadcastDelete after Micropub delete failed: ${error.message}`,
+            );
+          });
+        }
+        return originalJson(body);
+      };
+
+      return next();
+    });
+
     // Let Fedify handle NodeInfo data (/nodeinfo/2.1)
     // Only pass GET/HEAD requests — POST/PUT/DELETE must not go through
     // Fedify here, because fromExpressRequest() consumes the body stream,
@@ -483,6 +515,7 @@ export default class ActivityPubEndpoint {
                 resolvedMentions.push({
                   handle,
                   actorUrl: mentionedActor.id.href,
+                  profileUrl: mentionedActor.url?.href || null,
                 });
                 mentionRecipients.push({
                   handle,

package/lib/jf2-to-as2.js

@@ -60,18 +60,18 @@ export function parseMentions(text) {
 
 /**
  * Replace @user@domain patterns in HTML with linked mentions.
- * resolvedMentions: [{ handle, actorUrl }]
- * Unresolved handles get a WebFinger-style link as fallback.
+ * resolvedMentions: [{ handle, actorUrl, profileUrl? }]
+ * Uses profileUrl (human-readable) for href, falls back to Mastodon-style URL.
  */
 function linkifyMentions(html, resolvedMentions) {
   if (!html || !resolvedMentions?.length) return html;
-  for (const { handle, actorUrl } of resolvedMentions) {
+  for (const { handle, profileUrl } of resolvedMentions) {
     // Escape handle for regex (dots, hyphens)
     const escaped = handle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     // Match @handle not already inside an HTML tag attribute or anchor text
     const pattern = new RegExp(`(?<!["\\/\\w])@${escaped}(?![\\w])`, "gi");
     const parts = handle.split("@");
-    const url = actorUrl || `https://${parts[1]}/@${parts[0]}`;
+    const url = profileUrl || `https://${parts[1]}/@${parts[0]}`;
     html = html.replace(
       pattern,
       `<a href="${url}" class="mention" rel="nofollow noopener" target="_blank">@${handle}</a>`,

package/package.json

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