@rmdes/indiekit-endpoint-activitypub 1.1.16 → 1.1.18

package/README.md

@@ -93,6 +93,7 @@ export default {
 | `redisUrl` | string | `""` | Redis connection URL for delivery queue |
 | `parallelWorkers` | number | `5` | Number of parallel delivery workers (requires Redis) |
 | `actorType` | string | `"Person"` | Actor type: `Person`, `Service`, `Organization`, or `Group` |
+| `logLevel` | string | `"warning"` | Fedify log level: `"debug"`, `"info"`, `"warning"`, `"error"`, `"fatal"` |
 | `timelineRetention` | number | `1000` | Maximum timeline items to keep (0 = unlimited) |
 
 ### Redis (Recommended for Production)

package/assets/reader.css

@@ -4,6 +4,54 @@
  * Uses Indiekit CSS custom properties for automatic dark mode support
  */
 
+/* ==========================================================================
+   Fediverse Lookup
+   ========================================================================== */
+
+.ap-lookup {
+  display: flex;
+  gap: var(--space-xs);
+  margin-bottom: var(--space-m);
+}
+
+.ap-lookup__input {
+  flex: 1;
+  padding: var(--space-s) var(--space-m);
+  border: var(--border-width-thin) solid var(--color-outline);
+  border-radius: var(--border-radius-small);
+  background: var(--color-offset);
+  color: var(--color-on-background);
+  font-size: var(--font-size-m);
+  font-family: inherit;
+}
+
+.ap-lookup__input::placeholder {
+  color: var(--color-on-offset);
+}
+
+.ap-lookup__input:focus {
+  outline: 2px solid var(--color-primary);
+  outline-offset: -1px;
+  border-color: var(--color-primary);
+}
+
+.ap-lookup__btn {
+  padding: var(--space-s) var(--space-m);
+  border: var(--border-width-thin) solid var(--color-primary);
+  border-radius: var(--border-radius-small);
+  background: var(--color-primary);
+  color: var(--color-on-primary);
+  font-size: var(--font-size-m);
+  font-family: inherit;
+  font-weight: 600;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.ap-lookup__btn:hover {
+  opacity: 0.9;
+}
+
 /* ==========================================================================
    Tab Navigation
    ========================================================================== */

package/index.js

@@ -1,6 +1,6 @@
 import express from "express";
 
-import { setupFederation } from "./lib/federation-setup.js";
+import { setupFederation, buildPersonActor } from "./lib/federation-setup.js";
 import {
   createFedifyMiddleware,
 } from "./lib/federation-bridge.js";
@@ -57,6 +57,7 @@ import {
   featuredTagsAddController,
   featuredTagsRemoveController,
 } from "./lib/controllers/featured-tags.js";
+import { resolveController } from "./lib/controllers/resolve.js";
 import {
   refollowPauseController,
   refollowResumeController,
@@ -81,6 +82,7 @@ const defaults = {
   redisUrl: "",
   parallelWorkers: 5,
   actorType: "Person",
+  logLevel: "warning",
   timelineRetention: 1000,
   notificationRetentionDays: 30,
 };
@@ -202,6 +204,7 @@ export default class ActivityPubEndpoint {
     router.post("/admin/reader/unlike", unlikeController(mp, this));
     router.post("/admin/reader/boost", boostController(mp, this));
     router.post("/admin/reader/unboost", unboostController(mp, this));
+    router.get("/admin/reader/resolve", resolveController(mp, this));
     router.get("/admin/reader/profile", remoteProfileController(mp, this));
     router.get("/admin/reader/post", postDetailController(mp, this));
     router.post("/admin/reader/follow", followController(mp, this));
@@ -687,9 +690,15 @@ export default class ActivityPubEndpoint {
         { handle, publicationUrl: this._publicationUrl },
       );
 
-      // Retrieve the full actor from the dispatcher (same object remote
-      // servers will get when they re-fetch the actor URL)
-      const actor = await ctx.getActor(handle);
+      // Build the full actor object (same as what the dispatcher serves).
+      // Note: ctx.getActor() only exists on RequestContext, not the base
+      // Context returned by createContext(), so we use the shared helper.
+      const actor = await buildPersonActor(
+        ctx,
+        handle,
+        this._collections,
+        this.options.actorType,
+      );
       if (!actor) {
         console.warn("[ActivityPub] broadcastActorUpdate: could not build actor");
         return;
@@ -889,6 +898,7 @@ export default class ActivityPubEndpoint {
       publicationUrl: this._publicationUrl,
       parallelWorkers: this.options.parallelWorkers,
       actorType: this.options.actorType,
+      logLevel: this.options.logLevel,
     });
 
     this._federation = federation;

package/lib/controllers/followers.js

@@ -32,7 +32,7 @@ export function followersController(mountPath) {
       const cursor = buildCursor(page, totalPages, mountPath + "/admin/followers");
 
       response.render("activitypub-followers", {
-        title: response.locals.__("activitypub.followers"),
+        title: `${totalCount} ${response.locals.__("activitypub.followers")}`,
         followers,
         followerCount: totalCount,
         mountPath,

package/lib/controllers/following.js

@@ -32,7 +32,7 @@ export function followingController(mountPath) {
       const cursor = buildCursor(page, totalPages, mountPath + "/admin/following");
 
       response.render("activitypub-following", {
-        title: response.locals.__("activitypub.following"),
+        title: `${totalCount} ${response.locals.__("activitypub.following")}`,
         following,
         followingCount: totalCount,
         mountPath,

package/lib/controllers/resolve.js

@@ -0,0 +1,109 @@
+/**
+ * Resolve controller — accepts any fediverse URL or handle, resolves it
+ * via lookupObject(), and redirects to the appropriate internal view.
+ */
+import {
+  Article,
+  Note,
+  Person,
+  Service,
+  Application,
+  Organization,
+  Group,
+} from "@fedify/fedify";
+
+/**
+ * GET /admin/reader/resolve?q=<url-or-handle>
+ * Resolves a fediverse URL or @user@domain handle and redirects to
+ * the post detail or remote profile view.
+ */
+export function resolveController(mountPath, plugin) {
+  return async (request, response, next) => {
+    try {
+      const query = (request.query.q || "").trim();
+
+      if (!query) {
+        return response.redirect(`${mountPath}/admin/reader`);
+      }
+
+      if (!plugin._federation) {
+        return response.status(503).render("error", {
+          title: "Error",
+          content: "Federation not initialized",
+        });
+      }
+
+      const handle = plugin.options.actor.handle;
+      const ctx = plugin._federation.createContext(
+        new URL(plugin._publicationUrl),
+        { handle, publicationUrl: plugin._publicationUrl },
+      );
+
+      const documentLoader = await ctx.getDocumentLoader({
+        identifier: handle,
+      });
+
+      // Determine if input is a URL or a handle
+      // lookupObject accepts: URLs, @user@domain, user@domain, acct:user@domain
+      let lookupInput;
+
+      try {
+        // If it parses as a URL, pass as URL object
+        const parsed = new URL(query);
+        lookupInput = parsed;
+      } catch {
+        // Not a URL — treat as handle (strip leading @ if present)
+        lookupInput = query;
+      }
+
+      let object;
+
+      try {
+        object = await ctx.lookupObject(lookupInput, { documentLoader });
+      } catch (error) {
+        console.warn(
+          `[resolve] lookupObject failed for "${query}":`,
+          error.message,
+        );
+      }
+
+      if (!object) {
+        return response.status(404).render("error", {
+          title: response.locals.__("activitypub.reader.resolve.notFoundTitle"),
+          content: response.locals.__(
+            "activitypub.reader.resolve.notFound",
+          ),
+        });
+      }
+
+      // Determine object type and redirect accordingly
+      const objectUrl =
+        object.id?.href || object.url?.href || query;
+
+      if (
+        object instanceof Person ||
+        object instanceof Service ||
+        object instanceof Application ||
+        object instanceof Organization ||
+        object instanceof Group
+      ) {
+        return response.redirect(
+          `${mountPath}/admin/reader/profile?url=${encodeURIComponent(objectUrl)}`,
+        );
+      }
+
+      if (object instanceof Note || object instanceof Article) {
+        return response.redirect(
+          `${mountPath}/admin/reader/post?url=${encodeURIComponent(objectUrl)}`,
+        );
+      }
+
+      // Unknown type — try post detail as fallback
+      return response.redirect(
+        `${mountPath}/admin/reader/post?url=${encodeURIComponent(objectUrl)}`,
+      );
+    } catch (error) {
+      next(error);
+    }
+  };
+}

package/lib/federation-setup.js

@@ -60,6 +60,7 @@ export function setupFederation(options) {
     publicationUrl = "",
     parallelWorkers = 5,
     actorType = "Person",
+    logLevel = "warning",
   } = options;
 
   // Map config string to Fedify actor class
@@ -67,6 +68,9 @@ export function setupFederation(options) {
   const ActorClass = actorTypeMap[actorType] || Person;
 
   // Configure LogTape for Fedify delivery logging (once per process)
+  // Valid levels: "debug" | "info" | "warning" | "error" | "fatal"
+  const validLevels = ["debug", "info", "warning", "error", "fatal"];
+  const resolvedLevel = validLevels.includes(logLevel) ? logLevel : "warning";
   if (!_logtapeConfigured) {
     _logtapeConfigured = true;
     configure({
@@ -79,7 +83,7 @@ export function setupFederation(options) {
           // All Fedify logs — federation, vocab, delivery, HTTP signatures
           category: ["fedify"],
           sinks: ["console"],
-          lowestLevel: "info",
+          lowestLevel: resolvedLevel,
         },
       ],
     }).catch((error) => {
@@ -138,74 +142,7 @@ export function setupFederation(options) {
 
         if (identifier !== handle) return null;
 
-        const profile = await getProfile(collections);
-        const keyPairs = await ctx.getActorKeyPairs(identifier);
-
-        const personOptions = {
-          id: ctx.getActorUri(identifier),
-          preferredUsername: identifier,
-          name: profile.name || identifier,
-          url: profile.url ? new URL(profile.url) : null,
-          inbox: ctx.getInboxUri(identifier),
-          outbox: ctx.getOutboxUri(identifier),
-          followers: ctx.getFollowersUri(identifier),
-          following: ctx.getFollowingUri(identifier),
-          liked: ctx.getLikedUri(identifier),
-          featured: ctx.getFeaturedUri(identifier),
-          featuredTags: ctx.getFeaturedTagsUri(identifier),
-          endpoints: new Endpoints({ sharedInbox: ctx.getInboxUri() }),
-          manuallyApprovesFollowers:
-            profile.manuallyApprovesFollowers || false,
-        };
-
-        if (profile.summary) {
-          personOptions.summary = profile.summary;
-        }
-
-        if (profile.icon) {
-          personOptions.icon = new Image({
-            url: new URL(profile.icon),
-            mediaType: guessImageMediaType(profile.icon),
-          });
-        }
-
-        if (profile.image) {
-          personOptions.image = new Image({
-            url: new URL(profile.image),
-            mediaType: guessImageMediaType(profile.image),
-          });
-        }
-
-        if (keyPairs.length > 0) {
-          personOptions.publicKey = keyPairs[0].cryptographicKey;
-          personOptions.assertionMethods = keyPairs.map((k) => k.multikey);
-        }
-
-        if (profile.attachments?.length > 0) {
-          personOptions.attachments = profile.attachments.map(
-            (att) =>
-              new PropertyValue({
-                name: att.name,
-                value: formatAttachmentValue(att.value),
-              }),
-          );
-        }
-
-        if (profile.alsoKnownAs?.length > 0) {
-          personOptions.alsoKnownAs = profile.alsoKnownAs.map(
-            (u) => new URL(u),
-          );
-        }
-
-        if (profile.createdAt) {
-          personOptions.published = Temporal.Instant.from(profile.createdAt);
-        }
-
-        // Actor type from profile overrides config default
-        const profileActorType = profile.actorType || actorType;
-        const ResolvedActorClass = actorTypeMap[profileActorType] || ActorClass;
-
-        return new ResolvedActorClass(personOptions);
+        return buildPersonActor(ctx, identifier, collections, actorType);
       },
     )
     .mapHandle((_ctx, username) => {
@@ -674,6 +611,90 @@ async function getProfile(collections) {
   return doc || {};
 }
 
+/**
+ * Build the Person/Service/Organization actor object from the stored profile.
+ * Used by both the actor dispatcher (for serving the actor to federation
+ * requests) and broadcastActorUpdate() (for sending Update activities).
+ *
+ * @param {object} ctx - Fedify context (base Context or RequestContext)
+ * @param {string} identifier - Actor handle (e.g. "rick")
+ * @param {object} collections - MongoDB collections
+ * @param {string} [defaultActorType="Person"] - Fallback actor type
+ * @returns {Promise<import("@fedify/fedify").Actor|null>}
+ */
+export async function buildPersonActor(
+  ctx,
+  identifier,
+  collections,
+  defaultActorType = "Person",
+) {
+  const actorTypeMap = { Person, Service, Application, Organization, Group };
+  const profile = await getProfile(collections);
+  const keyPairs = await ctx.getActorKeyPairs(identifier);
+
+  const personOptions = {
+    id: ctx.getActorUri(identifier),
+    preferredUsername: identifier,
+    name: profile.name || identifier,
+    url: profile.url ? new URL(profile.url) : null,
+    inbox: ctx.getInboxUri(identifier),
+    outbox: ctx.getOutboxUri(identifier),
+    followers: ctx.getFollowersUri(identifier),
+    following: ctx.getFollowingUri(identifier),
+    liked: ctx.getLikedUri(identifier),
+    featured: ctx.getFeaturedUri(identifier),
+    featuredTags: ctx.getFeaturedTagsUri(identifier),
+    endpoints: new Endpoints({ sharedInbox: ctx.getInboxUri() }),
+    manuallyApprovesFollowers: profile.manuallyApprovesFollowers || false,
+  };
+
+  if (profile.summary) {
+    personOptions.summary = profile.summary;
+  }
+
+  if (profile.icon) {
+    personOptions.icon = new Image({
+      url: new URL(profile.icon),
+      mediaType: guessImageMediaType(profile.icon),
+    });
+  }
+
+  if (profile.image) {
+    personOptions.image = new Image({
+      url: new URL(profile.image),
+      mediaType: guessImageMediaType(profile.image),
+    });
+  }
+
+  if (keyPairs.length > 0) {
+    personOptions.publicKey = keyPairs[0].cryptographicKey;
+    personOptions.assertionMethods = keyPairs.map((k) => k.multikey);
+  }
+
+  if (profile.attachments?.length > 0) {
+    personOptions.attachments = profile.attachments.map(
+      (att) =>
+        new PropertyValue({
+          name: att.name,
+          value: formatAttachmentValue(att.value),
+        }),
+    );
+  }
+
+  if (profile.alsoKnownAs?.length > 0) {
+    personOptions.alsoKnownAs = profile.alsoKnownAs.map((u) => new URL(u));
+  }
+
+  if (profile.createdAt) {
+    personOptions.published = Temporal.Instant.from(profile.createdAt);
+  }
+
+  const profileActorType = profile.actorType || defaultActorType;
+  const ResolvedActorClass = actorTypeMap[profileActorType] || Person;
+
+  return new ResolvedActorClass(personOptions);
+}
+
 /**
  * Import a PKCS#8 PEM private key using Web Crypto API.
  * Fedify's importPem only handles PKCS#1, but Node.js crypto generates PKCS#8.

package/locales/en.json

@@ -191,6 +191,13 @@
         "loadingThread": "Loading thread...",
         "threadError": "Could not load full thread"
       },
+      "resolve": {
+        "placeholder": "Paste a fediverse URL or @user@domain handle…",
+        "label": "Look up a fediverse post or account",
+        "button": "Look up",
+        "notFoundTitle": "Not found",
+        "notFound": "Could not find this post or account. The URL may be invalid, the server may be unavailable, or the content may have been deleted."
+      },
       "linkPreview": {
         "label": "Link preview"
       }

package/package.json

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

package/views/activitypub-activities.njk

@@ -7,8 +7,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: __("activitypub.activities"), level: 1 }) }}
-
   {% if activities.length > 0 %}
     {% for activity in activities %}
       {{ card({

package/views/activitypub-compose.njk

@@ -3,8 +3,6 @@
 {% from "heading/macro.njk" import heading with context %}
 
 {% block readercontent %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {# Reply context — show the post being replied to #}
   {% if replyContext %}
     <div class="ap-compose__context">

package/views/activitypub-dashboard.njk

@@ -7,8 +7,6 @@
 {% from "badge/macro.njk" import badge with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {{ cardGrid({ cardSize: "16rem", items: [
     {
       title: followerCount + " " + __("activitypub.followers"),

package/views/activitypub-featured-tags.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {% if tags.length > 0 %}
     <table class="table">
       <thead>

package/views/activitypub-featured.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {% if pinned.length > 0 %}
     <table class="table">
       <thead>

package/views/activitypub-followers.njk

@@ -6,8 +6,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: followerCount + " " + __("activitypub.followers"), level: 1 }) }}
-
   {% if followers.length > 0 %}
     {% for follower in followers %}
       {{ card({

package/views/activitypub-following.njk

@@ -7,8 +7,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: followingCount + " " + __("activitypub.following"), level: 1 }) }}
-
   {% if following.length > 0 %}
     {% for account in following %}
       {% if account.source === "import" %}

package/views/activitypub-migrate.njk

@@ -8,8 +8,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {% if result %}
     {{ notificationBanner({ type: result.type, text: result.text }) }}
   {% endif %}

package/views/activitypub-moderation.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {# Blocked actors #}
   <section class="ap-moderation__section">
     <h2>{{ __("activitypub.moderation.blockedTitle") }}</h2>

package/views/activitypub-notifications.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({ text: __("activitypub.notifications.title"), level: 1 }) }}
-
   {% if items.length > 0 %}
     <div class="ap-notifications__toolbar">
       {% if unreadCount > 0 %}

package/views/activitypub-post-detail.njk

@@ -3,8 +3,6 @@
 {% from "heading/macro.njk" import heading with context %}
 
 {% block readercontent %}
-  {{ heading({ text: title, level: 1 }) }}
-
   <div class="ap-post-detail" data-mount-path="{{ mountPath }}">
     {# Back button #}
     <div class="ap-post-detail__back">

package/views/activitypub-profile.njk

@@ -10,8 +10,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {% if result %}
     {{ notificationBanner({ type: result.type, text: result.text }) }}
   {% endif %}

package/views/activitypub-reader.njk

@@ -4,7 +4,13 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({ text: __("activitypub.reader.title"), level: 1 }) }}
+  {# Fediverse lookup #}
+  <form action="{{ mountPath }}/admin/reader/resolve" method="get" class="ap-lookup">
+    <input type="text" name="q" class="ap-lookup__input"
+      placeholder="{{ __('activitypub.reader.resolve.placeholder') }}"
+      aria-label="{{ __('activitypub.reader.resolve.label') }}">
+    <button type="submit" class="ap-lookup__btn">{{ __("activitypub.reader.resolve.button") }}</button>
+  </form>
 
   {# Tab navigation #}
   <nav class="ap-tabs" role="tablist">

package/views/activitypub-remote-profile.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({ text: title, level: 1 }) }}
-
   <div class="ap-profile"
     x-data="{
       following: {{ 'true' if isFollowing else 'false' }},