@rmdes/indiekit-endpoint-activitypub 2.4.1 → 2.4.3

package/lib/controllers/api-timeline.js

@@ -10,6 +10,7 @@ import {
   getBlockedUrls,
   getFilterMode,
 } from "../storage/moderation.js";
+import { stripQuoteReferenceHtml } from "../og-unfurl.js";
 
 export function apiTimelineController(mountPath) {
   return async (request, response, next) => {
@@ -134,6 +135,14 @@ export function apiTimelineController(mountPath) {
         }
       }
 
+      // Strip "RE:" paragraphs from items that have quote embeds
+      for (const item of items) {
+        const quoteRef = item.quoteUrl || item.quote?.url || item.quote?.uid;
+        if (item.quote && quoteRef && item.content?.html) {
+          item.content.html = stripQuoteReferenceHtml(item.content.html, quoteRef);
+        }
+      }
+
       const csrfToken = getToken(request.session);
 
       // Render each card server-side using the same Nunjucks template

package/lib/controllers/explore-utils.js

@@ -92,7 +92,7 @@ export function mapMastodonStatusToItem(status, instance) {
     }
   }
 
-  return {
+  const item = {
     uid: status.url || status.uri || "",
     url: status.url || status.uri || "",
     type: "note",
@@ -116,7 +116,43 @@ export function mapMastodonStatusToItem(status, instance) {
     video,
     audio,
     inReplyTo: status.in_reply_to_id ? `https://${instance}/web/statuses/${status.in_reply_to_id}` : "",
+    quoteUrl: status.quote?.url || status.quote?.uri || "",
     createdAt: new Date().toISOString(),
     _explore: true,
   };
+
+  // Map quoted post data if present (Mastodon 4.3+ quote support)
+  if (status.quote) {
+    const q = status.quote;
+    const qAccount = q.account || {};
+    const qAcct = qAccount.acct || "";
+    const qHandle = qAcct.includes("@") ? `@${qAcct}` : `@${qAcct}@${instance}`;
+    const qPhoto = [];
+    for (const att of q.media_attachments || []) {
+      const attUrl = att.url || att.remote_url || "";
+      if (attUrl && (att.type === "image" || att.type === "gifv")) {
+        qPhoto.push(attUrl);
+      }
+    }
+
+    item.quote = {
+      url: q.url || q.uri || "",
+      uid: q.uri || q.url || "",
+      author: {
+        name: sanitizeHtml(qAccount.display_name || qAccount.username || "Unknown", { allowedTags: [], allowedAttributes: {} }),
+        url: qAccount.url || "",
+        photo: qAccount.avatar || qAccount.avatar_static || "",
+        handle: qHandle,
+      },
+      content: {
+        text: (q.content || "").replace(/<[^>]*>/g, ""),
+        html: sanitizeContent(q.content || ""),
+      },
+      published: q.created_at || "",
+      name: "",
+      photo: qPhoto.slice(0, 1),
+    };
+  }
+
+  return item;
 }

package/lib/controllers/explore.js

@@ -8,6 +8,7 @@
 import { searchInstances, checkInstanceTimeline, getPopularAccounts } from "../fedidb.js";
 import { getToken } from "../csrf.js";
 import { validateInstance, validateHashtag, mapMastodonStatusToItem } from "./explore-utils.js";
+import { stripQuoteReferenceHtml } from "../og-unfurl.js";
 
 const FETCH_TIMEOUT_MS = 10_000;
 const MAX_RESULTS = 20;
@@ -98,6 +99,14 @@ export function exploreController(mountPath) {
 
         items = statuses.map((s) => mapMastodonStatusToItem(s, instance));
 
+        // Strip "RE:" paragraphs from items that have quote embeds
+        for (const item of items) {
+          const quoteRef = item.quoteUrl || item.quote?.url || item.quote?.uid;
+          if (item.quote && quoteRef && item.content?.html) {
+            item.content.html = stripQuoteReferenceHtml(item.content.html, quoteRef);
+          }
+        }
+
         // Get next max_id from last item for pagination
         if (statuses.length === MAX_RESULTS && statuses.length > 0) {
           const last = statuses[statuses.length - 1];
@@ -181,6 +190,14 @@ export function exploreApiController(mountPath) {
 
       const items = statuses.map((s) => mapMastodonStatusToItem(s, instance));
 
+      // Strip "RE:" paragraphs from items that have quote embeds
+      for (const item of items) {
+        const quoteRef = item.quoteUrl || item.quote?.url || item.quote?.uid;
+        if (item.quote && quoteRef && item.content?.html) {
+          item.content.html = stripQuoteReferenceHtml(item.content.html, quoteRef);
+        }
+      }
+
       let nextMaxId = null;
       if (statuses.length === MAX_RESULTS && statuses.length > 0) {
         const last = statuses[statuses.length - 1];

package/lib/controllers/hashtag-explore.js

@@ -18,6 +18,7 @@
 
 import { validateHashtag, mapMastodonStatusToItem } from "./explore-utils.js";
 import { getToken } from "../csrf.js";
+import { stripQuoteReferenceHtml } from "../og-unfurl.js";
 
 const FETCH_TIMEOUT_MS = 10_000;
 const PAGE_SIZE = 20;
@@ -183,6 +184,14 @@ export function hashtagExploreApiController(mountPath) {
         mapMastodonStatusToItem(status, domain)
       );
 
+      // Strip "RE:" paragraphs from items that have quote embeds
+      for (const item of items) {
+        const quoteRef = item.quoteUrl || item.quote?.url || item.quote?.uid;
+        if (item.quote && quoteRef && item.content?.html) {
+          item.content.html = stripQuoteReferenceHtml(item.content.html, quoteRef);
+        }
+      }
+
       // Render HTML AFTER merge/dedup/paginate (don't waste CPU on discarded items)
       const csrfToken = getToken(request.session);
       const templateData = {

package/lib/controllers/post-detail.js

@@ -1,9 +1,9 @@
 // Post detail controller — view individual AP posts/notes/articles
 import { Article, Note, Person, Service, Application } from "@fedify/fedify/vocab";
 import { getToken } from "../csrf.js";
-import { extractObjectData } from "../timeline-store.js";
+import { extractObjectData, extractActorInfo } from "../timeline-store.js";
 import { getCached, setCache } from "../lookup-cache.js";
-import { fetchAndStoreQuote } from "../og-unfurl.js";
+import { fetchAndStoreQuote, stripQuoteReferenceHtml } from "../og-unfurl.js";
 
 // Load parent posts (inReplyTo chain) up to maxDepth levels
 async function loadParentChain(ctx, documentLoader, timelineCol, parentUrl, maxDepth = 5) {
@@ -332,6 +332,20 @@ export function postDetailController(mountPath, plugin) {
 
           if (quoteObject) {
             const quoteData = await extractObjectData(quoteObject, { documentLoader: qLoader });
+
+            // If author photo is empty, try fetching the actor directly
+            if (!quoteData.author.photo && quoteData.author.url) {
+              try {
+                const actor = await qCtx.lookupObject(new URL(quoteData.author.url), { documentLoader: qLoader });
+                if (actor) {
+                  const actorInfo = await extractActorInfo(actor, { documentLoader: qLoader });
+                  if (actorInfo.photo) quoteData.author.photo = actorInfo.photo;
+                }
+              } catch {
+                // Actor fetch failed — keep existing author data
+              }
+            }
+
             timelineItem.quote = {
               url: quoteData.url || quoteData.uid,
               uid: quoteData.uid,
@@ -342,11 +356,24 @@ export function postDetailController(mountPath, plugin) {
               photo: quoteData.photo?.slice(0, 1) || [],
             };
 
+            // Strip RE: paragraph from parent content
+            const quoteRef = timelineItem.quoteUrl || timelineItem.quote.url || timelineItem.quote.uid;
+            if (timelineItem.content?.html && quoteRef) {
+              timelineItem.content.html = stripQuoteReferenceHtml(
+                timelineItem.content.html,
+                quoteRef,
+              );
+            }
+
             // Persist for future requests (fire-and-forget)
             if (timelineCol) {
+              const persistUpdate = { $set: { quote: timelineItem.quote } };
+              if (timelineItem.content?.html) {
+                persistUpdate.$set["content.html"] = timelineItem.content.html;
+              }
               timelineCol.updateOne(
                 { $or: [{ uid: objectUrl }, { url: objectUrl }] },
-                { $set: { quote: timelineItem.quote } },
+                persistUpdate,
               ).catch(() => {});
             }
           }
@@ -355,6 +382,14 @@ export function postDetailController(mountPath, plugin) {
         }
       }
 
+      // Strip RE: paragraph for items with existing quote data (render-time cleanup)
+      if (timelineItem.quote && timelineItem.content?.html) {
+        const quoteRef = timelineItem.quoteUrl || timelineItem.quote.url || timelineItem.quote.uid;
+        if (quoteRef) {
+          timelineItem.content.html = stripQuoteReferenceHtml(timelineItem.content.html, quoteRef);
+        }
+      }
+
       const csrfToken = getToken(request.session);
 
       response.render("activitypub-post-detail", {

package/lib/controllers/reader.js

@@ -19,6 +19,7 @@ import {
   getFilterMode,
 } from "../storage/moderation.js";
 import { getFollowedTags } from "../storage/followed-tags.js";
+import { stripQuoteReferenceHtml } from "../og-unfurl.js";
 
 // Re-export controllers from split modules for backward compatibility
 export {
@@ -196,6 +197,14 @@ export function readerController(mountPath) {
         }
       }
 
+      // Strip "RE:" paragraphs from items that have quote embeds
+      for (const item of items) {
+        const quoteRef = item.quoteUrl || item.quote?.url || item.quote?.uid;
+        if (item.quote && quoteRef && item.content?.html) {
+          item.content.html = stripQuoteReferenceHtml(item.content.html, quoteRef);
+        }
+      }
+
       // CSRF token for interaction forms
       const csrfToken = getToken(request.session);
 

package/lib/og-unfurl.js

@@ -267,6 +267,22 @@ export async function fetchAndStoreQuote(collections, uid, quoteUrl, ctx, docume
 
     const quoteData = await extractObjectData(object, { documentLoader });
 
+    // If author photo is empty, try fetching the actor directly
+    if (!quoteData.author.photo && quoteData.author.url) {
+      try {
+        const actor = await ctx.lookupObject(new URL(quoteData.author.url), { documentLoader });
+        if (actor) {
+          const { extractActorInfo } = await import("./timeline-store.js");
+          const actorInfo = await extractActorInfo(actor, { documentLoader });
+          if (actorInfo.photo) {
+            quoteData.author.photo = actorInfo.photo;
+          }
+        }
+      } catch {
+        // Actor fetch failed — keep existing author data
+      }
+    }
+
     const quote = {
       url: quoteData.url || quoteData.uid,
       uid: quoteData.uid,
@@ -277,11 +293,46 @@ export async function fetchAndStoreQuote(collections, uid, quoteUrl, ctx, docume
       photo: quoteData.photo?.slice(0, 1) || [],
     };
 
-    await collections.ap_timeline.updateOne(
-      { uid },
-      { $set: { quote } },
-    );
+    // Strip the "RE: <link>" paragraph from the parent post's content
+    // Mastodon adds this as: <p>RE: <a href="QUOTE_URL">...</a></p>
+    const update = { $set: { quote } };
+    const parentItem = await collections.ap_timeline.findOne({ uid });
+    if (parentItem?.content?.html) {
+      const cleaned = stripQuoteReferenceHtml(parentItem.content.html, quoteUrl);
+      if (cleaned !== parentItem.content.html) {
+        update.$set["content.html"] = cleaned;
+      }
+    }
+
+    await collections.ap_timeline.updateOne({ uid }, update);
   } catch (error) {
     console.error(`[og-unfurl] Failed to fetch quote for ${uid}: ${error.message}`);
   }
 }
+
+/**
+ * Strip the "RE: <link>" paragraph that Mastodon adds for quoted posts.
+ * Removes <p> elements containing "RE:" followed by a link to the quote URL.
+ * @param {string} html - Content HTML
+ * @param {string} quoteUrl - URL of the quoted post
+ * @returns {string} Cleaned HTML
+ */
+export function stripQuoteReferenceHtml(html, quoteUrl) {
+  if (!html || !quoteUrl) return html;
+  // Match <p> containing "RE:" and a link whose href contains the quote domain+path
+  // Mastodon uses both /users/X/statuses/Y and /@X/Y URL formats
+  try {
+    const quoteUrlObj = new URL(quoteUrl);
+    const quoteDomain = quoteUrlObj.hostname;
+    // Escape special regex chars in domain
+    const domainEscaped = quoteDomain.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    // Match <p>RE: <a href="...DOMAIN...">...</a></p> (with optional whitespace)
+    const re = new RegExp(
+      `<p>\\s*RE:\\s*<a\\s[^>]*href="[^"]*${domainEscaped}[^"]*"[^>]*>.*?</a>\\s*</p>`,
+      "i",
+    );
+    return html.replace(re, "").trim();
+  } catch {
+    return html;
+  }
+}

package/package.json

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