@rmdes/indiekit-endpoint-activitypub 3.6.3 → 3.6.5

package/lib/mastodon/helpers/resolve-account.js

@@ -0,0 +1,123 @@
+/**
+ * Resolve a remote account via WebFinger + ActivityPub actor fetch.
+ * Uses the Fedify federation instance to perform discovery.
+ *
+ * Shared by accounts.js (lookup) and search.js (resolve=true).
+ */
+import { serializeAccount } from "../entities/account.js";
+
+/**
+ * @param {string} acct - Account identifier (user@domain or URL)
+ * @param {object} pluginOptions - Plugin options with federation, handle, publicationUrl
+ * @param {string} baseUrl - Server base URL
+ * @returns {Promise<object|null>} Serialized Mastodon Account or null
+ */
+export async function resolveRemoteAccount(acct, pluginOptions, baseUrl) {
+  const { federation, handle, publicationUrl } = pluginOptions;
+  if (!federation) return null;
+
+  try {
+    const ctx = federation.createContext(
+      new URL(publicationUrl),
+      { handle, publicationUrl },
+    );
+
+    // Determine lookup URI
+    let actorUri;
+    if (acct.includes("@")) {
+      const parts = acct.replace(/^@/, "").split("@");
+      const username = parts[0];
+      const domain = parts[1];
+      if (!username || !domain) return null;
+      actorUri = `acct:${username}@${domain}`;
+    } else if (acct.startsWith("http")) {
+      actorUri = acct;
+    } else {
+      return null;
+    }
+
+    const actor = await ctx.lookupObject(actorUri);
+    if (!actor) return null;
+
+    // Extract data from the Fedify actor object
+    const name = actor.name?.toString() || actor.preferredUsername?.toString() || "";
+    const actorUrl = actor.id?.href || "";
+    const username = actor.preferredUsername?.toString() || "";
+    const domain = actorUrl ? new URL(actorUrl).hostname : "";
+    const summary = actor.summary?.toString() || "";
+
+    // Get avatar
+    let avatarUrl = "";
+    try {
+      const icon = await actor.getIcon();
+      avatarUrl = icon?.url?.href || "";
+    } catch { /* ignore */ }
+
+    // Get header image
+    let headerUrl = "";
+    try {
+      const image = await actor.getImage();
+      headerUrl = image?.url?.href || "";
+    } catch { /* ignore */ }
+
+    // Get collection counts (followers, following, outbox)
+    let followersCount = 0;
+    let followingCount = 0;
+    let statusesCount = 0;
+    try {
+      const followers = await actor.getFollowers();
+      if (followers?.totalItems != null) followersCount = followers.totalItems;
+    } catch { /* ignore */ }
+    try {
+      const following = await actor.getFollowing();
+      if (following?.totalItems != null) followingCount = following.totalItems;
+    } catch { /* ignore */ }
+    try {
+      const outbox = await actor.getOutbox();
+      if (outbox?.totalItems != null) statusesCount = outbox.totalItems;
+    } catch { /* ignore */ }
+
+    // Get published/created date
+    const published = actor.published
+      ? String(actor.published)
+      : null;
+
+    // Profile fields from attachments
+    const fields = [];
+    try {
+      for await (const attachment of actor.getAttachments()) {
+        if (attachment?.name) {
+          fields.push({
+            name: attachment.name?.toString() || "",
+            value: attachment.value?.toString() || "",
+          });
+        }
+      }
+    } catch { /* ignore */ }
+
+    const account = serializeAccount(
+      {
+        name,
+        url: actorUrl,
+        photo: avatarUrl,
+        handle: `@${username}@${domain}`,
+        summary,
+        image: headerUrl,
+        bot: actor.constructor?.name === "Service" || actor.constructor?.name === "Application",
+        attachments: fields.length > 0 ? fields : undefined,
+        createdAt: published || undefined,
+      },
+      { baseUrl },
+    );
+
+    // Override counts with real data from AP collections
+    account.followers_count = followersCount;
+    account.following_count = followingCount;
+    account.statuses_count = statusesCount;
+
+    return account;
+  } catch (error) {
+    console.warn(`[Mastodon API] Remote account resolution failed for ${acct}:`, error.message);
+    return null;
+  }
+}

package/lib/mastodon/routes/accounts.js

@@ -9,6 +9,7 @@ import { serializeCredentialAccount, serializeAccount } from "../entities/accoun
 import { serializeStatus } from "../entities/status.js";
 import { accountId, remoteActorId } from "../helpers/id-mapping.js";
 import { buildPaginationQuery, parseLimit, setPaginationHeaders } from "../helpers/pagination.js";
+import { resolveRemoteAccount } from "../helpers/resolve-account.js";
 
 const router = express.Router(); // eslint-disable-line new-cap
 
@@ -100,7 +101,7 @@ router.get("/api/v1/accounts/lookup", async (req, res, next) => {
       }
     }
 
-    // Check followers/following for known remote actors
+    // Check followers for known remote actors
     const follower = await collections.ap_followers.findOne({
       $or: [
         { handle: `@${bareAcct}` },
@@ -116,6 +117,38 @@ router.get("/api/v1/accounts/lookup", async (req, res, next) => {
       );
     }
 
+    // Check following
+    const following = await collections.ap_following.findOne({
+      $or: [
+        { handle: `@${bareAcct}` },
+        { handle: bareAcct },
+      ],
+    });
+    if (following) {
+      return res.json(
+        serializeAccount(
+          { name: following.name, url: following.actorUrl, photo: following.avatar, handle: following.handle },
+          { baseUrl },
+        ),
+      );
+    }
+
+    // Check timeline authors (people whose posts are in our timeline)
+    const timelineAuthor = await collections.ap_timeline.findOne({
+      "author.handle": { $in: [`@${bareAcct}`, bareAcct] },
+    });
+    if (timelineAuthor?.author) {
+      return res.json(
+        serializeAccount(timelineAuthor.author, { baseUrl }),
+      );
+    }
+
+    // Resolve remotely via federation (WebFinger + actor fetch)
+    const resolved = await resolveRemoteAccount(bareAcct, pluginOptions, baseUrl);
+    if (resolved) {
+      return res.json(resolved);
+    }
+
     return res.status(404).json({ error: "Record not found" });
   } catch (error) {
     next(error);

package/lib/mastodon/routes/search.js

@@ -7,6 +7,7 @@ import express from "express";
 import { serializeStatus } from "../entities/status.js";
 import { serializeAccount } from "../entities/account.js";
 import { parseLimit } from "../helpers/pagination.js";
+import { resolveRemoteAccount } from "../helpers/resolve-account.js";
 
 const router = express.Router(); // eslint-disable-line new-cap
 
@@ -21,6 +22,9 @@ router.get("/api/v2/search", async (req, res, next) => {
     const limit = parseLimit(req.query.limit);
     const offset = Math.max(0, Number.parseInt(req.query.offset, 10) || 0);
 
+    const resolve = req.query.resolve === "true";
+    const pluginOptions = req.app.locals.mastodonPluginOptions || {};
+
     if (!query) {
       return res.json({ accounts: [], statuses: [], hashtags: [] });
     }
@@ -75,6 +79,14 @@ router.get("/api/v2/search", async (req, res, next) => {
         }
         if (results.accounts.length >= limit) break;
       }
+
+      // If no local results and resolve=true, try remote lookup
+      if (results.accounts.length === 0 && resolve && query.includes("@")) {
+        const resolved = await resolveRemoteAccount(query, pluginOptions, baseUrl);
+        if (resolved) {
+          results.accounts.push(resolved);
+        }
+      }
     }
 
     // ─── Status search ───────────────────────────────────────────────────

package/package.json

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