@rmdes/indiekit-endpoint-activitypub 3.12.1 → 3.12.3

package/lib/mastodon/entities/status.js

@@ -15,6 +15,7 @@
  */
 import { serializeAccount } from "./account.js";
 import { sanitizeHtml } from "./sanitize.js";
+import { remoteActorId } from "../helpers/id-mapping.js";
 
 // Module-level defaults set once at startup via setLocalIdentity()
 let _localPublicationUrl = "";
@@ -99,7 +100,17 @@ export function serializeStatus(item, { baseUrl, favouritedIds, rebloggedIds, bo
   }
 
   // Regular status (note, article, question)
-  const content = item.content?.html || item.content?.text || "";
+  let content = item.content?.html || item.content?.text || "";
+
+  // Append permalink for own posts at read time — matches what fediverse
+  // users see via federation (jf2-to-as2 appends the same link).
+  // Done here instead of at write time so it survives backfills and cleanups.
+  const isOwnPost = _localPublicationUrl && item.author?.url === _localPublicationUrl;
+  const postUrl = item.uid || item.url;
+  if (isOwnPost && postUrl && !content.includes(postUrl)) {
+    const escaped = postUrl.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    content += `\n<p>\u{1F517} <a href="${escaped}">${escaped}</a></p>`;
+  }
   const spoilerText = item.summary || "";
   const sensitive = item.sensitive || false;
   const visibility = item.visibility || "public";
@@ -168,13 +179,17 @@ export function serializeStatus(item, { baseUrl, favouritedIds, rebloggedIds, bo
     url: `${baseUrl}/tags/${encodeURIComponent(tag)}`,
   }));
 
-  // Mentions
-  const mentions = (item.mentions || []).map((m) => ({
-    id: "0", // We don't have stable IDs for mentioned accounts
-    username: m.name || "",
-    url: m.url || "",
-    acct: m.name || "",
-  }));
+  // Mentions — use actorUrl for deterministic ID, parse acct from handle
+  const mentions = (item.mentions || []).map((m) => {
+    const handle = (m.name || "").replace(/^@/, "");
+    const parts = handle.split("@");
+    return {
+      id: m.actorUrl ? remoteActorId(m.actorUrl) : "0",
+      username: parts[0] || handle,
+      url: m.url || m.actorUrl || "",
+      acct: handle,
+    };
+  });
 
   // Custom emojis
   const emojis = (item.emojis || []).map((e) => ({

package/lib/syndicator.js

@@ -225,20 +225,41 @@ export function createSyndicator(plugin) {
         try {
           const profile = await plugin._collections.ap_profile?.findOne({});
           const content = buildTimelineContent(properties);
-
-          // Append permalink to ALL post types so the Mastodon API timeline
-          // matches what fediverse users see via federation (jf2-to-as2 appends it too).
-          if (properties.url) {
-            const esc = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-            content.text = `${content.text}\n\n\u{1F517} ${properties.url}`;
-            content.html = `${content.html}\n<p>\u{1F517} <a href="${esc(properties.url)}">${esc(properties.url)}</a></p>`;
+          // Permalink is appended at read time by serializeStatus, not here.
+
+          // Linkify @mentions in content using resolved WebFinger data.
+          // This ensures the ap_timeline HTML has proper <a> links for
+          // mentions, matching what the federated AS2 activity contains.
+          if (resolvedMentions.length > 0 && content.html) {
+            const { default: jf2Mod } = await import("./jf2-to-as2.js");
+            // Import linkifyMentions — it's not exported, so inline the logic
+            for (const { handle, profileUrl, actorUrl } of resolvedMentions) {
+              const escaped = handle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+              const pattern = new RegExp(`(?<!["\\/\\w])@${escaped}(?![\\w])`, "gi");
+              const parts = handle.split("@");
+              const url = profileUrl || (actorUrl ? actorUrl : `https://${parts[1]}/@${parts[0]}`);
+              content.html = content.html.replace(
+                pattern,
+                `<a href="${url}" class="mention" rel="nofollow noopener" target="_blank">@${handle}</a>`,
+              );
+            }
           }
 
+          // Store resolved mentions for Mastodon API serialization
+          const timelineMentions = resolvedMentions
+            .filter(m => m.actorUrl)
+            .map(m => ({
+              name: `@${m.handle}`,
+              url: m.profileUrl || m.actorUrl,
+              actorUrl: m.actorUrl,
+            }));
+
           const timelineItem = {
             uid: properties.url,
             url: properties.url,
             type: mapPostType(properties["post-type"]),
             content,
+            mentions: timelineMentions,
             author: {
               name: profile?.name || handle,
               url: profile?.url || plugin._publicationUrl,

package/package.json

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