@rmdes/indiekit-endpoint-activitypub 2.0.31 → 2.0.33

package/assets/reader.css

@@ -4,6 +4,37 @@
  * Uses Indiekit CSS custom properties for automatic dark mode support
  */
 
+/* ==========================================================================
+   Breadcrumb Navigation
+   ========================================================================== */
+
+.ap-breadcrumb {
+  display: flex;
+  align-items: center;
+  gap: var(--space-xs);
+  margin-bottom: var(--space-m);
+  font-size: var(--font-size-s);
+  color: var(--color-on-offset);
+}
+
+.ap-breadcrumb a {
+  color: var(--color-accent);
+  text-decoration: none;
+}
+
+.ap-breadcrumb a:hover {
+  text-decoration: underline;
+}
+
+.ap-breadcrumb__separator {
+  color: var(--color-on-offset);
+}
+
+.ap-breadcrumb__current {
+  color: var(--color-on-background);
+  font-weight: var(--font-weight-bold);
+}
+
 /* ==========================================================================
    Fediverse Lookup
    ========================================================================== */

package/lib/controllers/activities.js

@@ -12,6 +12,7 @@ export function activitiesController(mountPath) {
       if (!collection) {
         return response.render("activitypub-activities", {
           title: response.locals.__("activitypub.activities"),
+          parent: { href: mountPath, text: response.locals.__("activitypub.title") },
           activities: [],
           mountPath,
         });
@@ -32,6 +33,7 @@ export function activitiesController(mountPath) {
 
       response.render("activitypub-activities", {
         title: response.locals.__("activitypub.activities"),
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         activities,
         mountPath,
         cursor,

package/lib/controllers/compose.js

@@ -141,6 +141,7 @@ export function composeController(mountPath, plugin) {
 
       response.render("activitypub-compose", {
         title: response.locals.__("activitypub.compose.title"),
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         replyTo,
         replyContext,
         syndicationTargets,

package/lib/controllers/explore.js

@@ -141,10 +141,13 @@ export function exploreController(mountPath) {
       const csrfToken = getToken(request.session);
       const deckCount = decks.length;
 
+      const readerParent = { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") };
+
       // No instance specified — render clean initial page (no error)
       if (!rawInstance.trim()) {
         return response.render("activitypub-explore", {
           title: response.locals.__("activitypub.reader.explore.title"),
+          readerParent,
           instance: "",
           scope,
           items: [],
@@ -163,6 +166,7 @@ export function exploreController(mountPath) {
       if (!instance) {
         return response.render("activitypub-explore", {
           title: response.locals.__("activitypub.reader.explore.title"),
+          readerParent,
           instance: rawInstance,
           scope,
           items: [],
@@ -228,6 +232,7 @@ export function exploreController(mountPath) {
 
       response.render("activitypub-explore", {
         title: response.locals.__("activitypub.reader.explore.title"),
+        readerParent,
         instance,
         scope,
         items,

package/lib/controllers/featured-tags.js

@@ -15,6 +15,7 @@ export function featuredTagsGetController(mountPath) {
       response.render("activitypub-featured-tags", {
         title:
           response.locals.__("activitypub.featuredTags") || "Featured Tags",
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         tags,
         mountPath,
       });

package/lib/controllers/featured.js

@@ -57,6 +57,7 @@ export function featuredGetController(mountPath) {
 
       response.render("activitypub-featured", {
         title: response.locals.__("activitypub.featured") || "Pinned Posts",
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         pinned,
         availablePosts,
         maxPins: MAX_PINS,

package/lib/controllers/followers.js

@@ -12,6 +12,7 @@ export function followersController(mountPath) {
       if (!collection) {
         return response.render("activitypub-followers", {
           title: response.locals.__("activitypub.followers"),
+          parent: { href: mountPath, text: response.locals.__("activitypub.title") },
           followers: [],
           followerCount: 0,
           mountPath,
@@ -33,6 +34,7 @@ export function followersController(mountPath) {
 
       response.render("activitypub-followers", {
         title: `${totalCount} ${response.locals.__("activitypub.followers")}`,
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         followers,
         followerCount: totalCount,
         mountPath,

package/lib/controllers/following.js

@@ -12,6 +12,7 @@ export function followingController(mountPath) {
       if (!collection) {
         return response.render("activitypub-following", {
           title: response.locals.__("activitypub.following"),
+          parent: { href: mountPath, text: response.locals.__("activitypub.title") },
           following: [],
           followingCount: 0,
           mountPath,
@@ -33,6 +34,7 @@ export function followingController(mountPath) {
 
       response.render("activitypub-following", {
         title: `${totalCount} ${response.locals.__("activitypub.following")}`,
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         following,
         followingCount: totalCount,
         mountPath,

package/lib/controllers/migrate.js

@@ -24,6 +24,7 @@ export function migrateGetController(mountPath, pluginOptions) {
 
       response.render("activitypub-migrate", {
         title: response.locals.__("activitypub.migrate.title"),
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         mountPath,
         currentAlias,
         result: null,
@@ -61,6 +62,7 @@ export function migratePostController(mountPath, pluginOptions) {
 
       response.render("activitypub-migrate", {
         title: response.locals.__("activitypub.migrate.title"),
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         mountPath,
         currentAlias,
         result,

package/lib/controllers/moderation.js

@@ -301,6 +301,7 @@ export function moderationController(mountPath) {
 
       response.render("activitypub-moderation", {
         title: response.locals.__("activitypub.moderation.title"),
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         muted,
         blocked,
         mutedActors,

package/lib/controllers/my-profile.js

@@ -219,6 +219,7 @@ export function myProfileController(plugin) {
 
       response.render("activitypub-my-profile", {
         title: response.locals.__("activitypub.myProfile.title"),
+        readerParent: { href: mountPath, text: response.locals.__("activitypub.title") },
         profile: profile || {},
         handle,
         domain,

package/lib/controllers/post-detail.js

@@ -197,6 +197,7 @@ export function postDetailController(mountPath, plugin) {
           // Truly not found (no local item either)
           return response.status(404).render("activitypub-post-detail", {
             title: response.locals.__("activitypub.reader.post.title"),
+            readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
             notFound: true, objectUrl, mountPath,
             item: null, interactionMap: {}, csrfToken: null,
             parentPosts: [], replyPosts: [],
@@ -318,6 +319,7 @@ export function postDetailController(mountPath, plugin) {
 
       response.render("activitypub-post-detail", {
         title: response.locals.__("activitypub.reader.post.title"),
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         item: timelineItem,
         interactionMap,
         csrfToken,

package/lib/controllers/profile.js

@@ -18,6 +18,7 @@ export function profileGetController(mountPath) {
 
       response.render("activitypub-profile", {
         title: response.locals.__("activitypub.profile.title"),
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         mountPath,
         profile,
         actorTypes: ACTOR_TYPES,
@@ -96,6 +97,7 @@ export function profilePostController(mountPath, plugin) {
 
       response.render("activitypub-profile", {
         title: response.locals.__("activitypub.profile.title"),
+        parent: { href: mountPath, text: response.locals.__("activitypub.title") },
         mountPath,
         profile,
         actorTypes: ACTOR_TYPES,

package/lib/controllers/profile.remote.js

@@ -126,6 +126,7 @@ export function remoteProfileController(mountPath, plugin) {
 
       response.render("activitypub-remote-profile", {
         title: name,
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         actorUrl,
         name,
         actorHandle,

package/lib/controllers/reader.js

@@ -203,6 +203,7 @@ export function readerController(mountPath) {
 
       response.render("activitypub-reader", {
         title: response.locals.__("activitypub.reader.title"),
+        readerParent: { href: mountPath, text: response.locals.__("activitypub.title") },
         items,
         tab,
         before: result.before,
@@ -253,6 +254,7 @@ export function notificationsController(mountPath) {
 
       response.render("activitypub-notifications", {
         title: response.locals.__("activitypub.notifications.title"),
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         items: result.items,
         before: result.before,
         tab,

package/lib/controllers/tag-timeline.js

@@ -131,6 +131,7 @@ export function tagTimelineController(mountPath) {
 
       response.render("activitypub-tag-timeline", {
         title: `#${tag}`,
+        readerParent: { href: `${mountPath}/admin/reader`, text: response.locals.__("activitypub.reader.title") },
         tag,
         items,
         before: result.before,

package/lib/fedidb.js

@@ -2,10 +2,13 @@
  * FediDB API client with MongoDB caching.
  *
  * Wraps https://api.fedidb.org/v1/ endpoints:
- * - /servers?q=... — search known fediverse instances
+ * - /servers — cursor-paginated list of known fediverse instances (ranked by size)
  * - /popular-accounts — top accounts by follower count
  *
- * Responses are cached in ap_kv to avoid hitting the API on every keystroke.
+ * NOTE: The /servers endpoint ignores query params (q, search, name) and always
+ * returns the same ranked list. We paginate through ~500 servers, cache the full
+ * corpus for 24 hours, and filter locally when the user searches.
+ *
  * Cache TTL: 24 hours for both datasets.
  */
 
@@ -71,46 +74,90 @@ async function writeToCache(kvCollection, cacheKey, data) {
 }
 
 /**
- * Search FediDB for instances matching a query.
- * Returns a flat array of { domain, software, description, mau, openRegistration }.
+ * Fetch the FediDB server catalogue by paginating through cursor-based results.
+ * Cached for 24 hours as a single entry. The API ignores the `q` param and
+ * always returns a ranked list, so we collect a large corpus and filter locally.
  *
- * Results are cached per normalized query for 24 hours.
+ * Paginates up to MAX_PAGES (13 pages × 40 = ~520 servers), which covers
+ * all well-known instances. Results are cached in ap_kv for 24 hours.
  *
  * @param {object} kvCollection - MongoDB ap_kv collection
- * @param {string} query - Search term (e.g. "mast")
- * @param {number} [limit=10] - Max results
  * @returns {Promise<Array>}
  */
-export async function searchInstances(kvCollection, query, limit = 10) {
-  const q = (query || "").trim().toLowerCase();
-  if (!q) return [];
+const MAX_PAGES = 13;
 
-  const cacheKey = `fedidb:instances:${q}:${limit}`;
+async function getAllServers(kvCollection) {
+  const cacheKey = "fedidb:servers-all";
   const cached = await getFromCache(kvCollection, cacheKey);
   if (cached) return cached;
 
+  const results = [];
+
   try {
-    const url = `${API_BASE}/servers?q=${encodeURIComponent(q)}&limit=${limit}`;
-    const res = await fetchWithTimeout(url);
-    if (!res.ok) return [];
+    let cursor = null;
+
+    for (let page = 0; page < MAX_PAGES; page++) {
+      let url = `${API_BASE}/servers?limit=40`;
+      if (cursor) url += `&cursor=${cursor}`;
+
+      const res = await fetchWithTimeout(url);
+      if (!res.ok) break;
+
+      const json = await res.json();
+      const servers = json.data || [];
+      if (servers.length === 0) break;
+
+      for (const s of servers) {
+        results.push({
+          domain: s.domain,
+          software: s.software?.name || "Unknown",
+          description: s.description || "",
+          mau: s.stats?.monthly_active_users || 0,
+          userCount: s.stats?.user_count || 0,
+          openRegistration: s.open_registration || false,
+        });
+      }
 
-    const json = await res.json();
-    const servers = json.data || [];
-
-    const results = servers.map((s) => ({
-      domain: s.domain,
-      software: s.software?.name || "Unknown",
-      description: s.description || "",
-      mau: s.stats?.monthly_active_users || 0,
-      userCount: s.stats?.user_count || 0,
-      openRegistration: s.open_registration || false,
-    }));
+      cursor = json.meta?.next_cursor;
+      if (!cursor) break;
+    }
 
-    await writeToCache(kvCollection, cacheKey, results);
-    return results;
+    if (results.length > 0) {
+      await writeToCache(kvCollection, cacheKey, results);
+    }
   } catch {
-    return [];
+    // Return whatever we collected so far
   }
+
+  return results;
+}
+
+/**
+ * Search FediDB for instances matching a query.
+ * Returns a flat array of { domain, software, description, mau, openRegistration }.
+ *
+ * Fetches the full server list once (cached 24h) and filters by domain/software match.
+ * FediDB's /v1/servers endpoint ignores the `q` param and always returns a static
+ * ranked list, so server-side filtering is the only way to get relevant results.
+ *
+ * @param {object} kvCollection - MongoDB ap_kv collection
+ * @param {string} query - Search term (e.g. "mast")
+ * @param {number} [limit=10] - Max results
+ * @returns {Promise<Array>}
+ */
+export async function searchInstances(kvCollection, query, limit = 10) {
+  const q = (query || "").trim().toLowerCase();
+  if (!q) return [];
+
+  const allServers = await getAllServers(kvCollection);
+
+  return allServers
+    .filter(
+      (s) =>
+        s.domain.toLowerCase().includes(q) ||
+        s.software.toLowerCase().includes(q),
+    )
+    .slice(0, limit);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "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/layouts/ap-reader.njk

@@ -18,6 +18,14 @@
   {# AP link interception for internal navigation #}
   <script defer src="/assets/@rmdes-indiekit-endpoint-activitypub/reader-links.js"></script>
 
+  {% if readerParent %}
+  <nav class="ap-breadcrumb" aria-label="Breadcrumb">
+    <a href="{{ readerParent.href }}">{{ readerParent.text }}</a>
+    <span class="ap-breadcrumb__separator" aria-hidden="true">/</span>
+    <span class="ap-breadcrumb__current" aria-current="page">{{ title }}</span>
+  </nav>
+  {% endif %}
+
   {% block readercontent %}
   {% endblock %}
 {% endblock %}