@rmdes/indiekit-endpoint-conversations 2.0.0 → 2.1.1

package/index.js

@@ -106,25 +106,29 @@ export default class ConversationsEndpoint {
         (process.env.BLUESKY_IDENTIFIER || process.env.BLUESKY_HANDLE) &&
         process.env.BLUESKY_PASSWORD;
 
-      if (hasMastodon || hasBluesky) {
-        // Store detected platforms for dashboard status
-        Indiekit.config.application.conversations = {
-          ...this.options,
-          mastodonEnabled: !!hasMastodon,
-          blueskyEnabled: !!hasBluesky,
-        };
-
-        import("./lib/polling/scheduler.js")
-          .then(({ startPolling }) => {
-            startPolling(Indiekit, this.options);
-          })
-          .catch((error) => {
-            console.error(
-              "[Conversations] Polling scheduler failed to start:",
-              error.message,
-            );
-          });
-      }
+      // Store detected platforms for dashboard status
+      // Note: ActivityPub detection happens at poll time (not init time)
+      // because the AP endpoint may register its collections after this
+      // plugin. The scheduler updates activitypubEnabled dynamically.
+      Indiekit.config.application.conversations = {
+        ...this.options,
+        mastodonEnabled: !!hasMastodon,
+        blueskyEnabled: !!hasBluesky,
+        activitypubEnabled: false,
+      };
+
+      // Always start polling — the scheduler detects available sources
+      // at runtime (Mastodon/Bluesky from env vars, AP from collections)
+      import("./lib/polling/scheduler.js")
+        .then(({ startPolling }) => {
+          startPolling(Indiekit, this.options);
+        })
+        .catch((error) => {
+          console.error(
+            "[Conversations] Polling scheduler failed to start:",
+            error.message,
+          );
+        });
     }
   }
 }

package/lib/controllers/conversations.js

@@ -209,6 +209,12 @@ async function apiStatus(request, response) {
         lastError: pollState?.bluesky_last_error || null,
         lastPoll: pollState?.bluesky_last_poll || null,
       },
+      activitypub: {
+        enabled: !!config.activitypubEnabled,
+        lastCursor: pollState?.activitypub_last_received_at || null,
+        lastError: pollState?.activitypub_last_error || null,
+        lastPoll: pollState?.activitypub_last_poll || null,
+      },
       totalItems,
     });
   } catch (error) {

package/lib/notifications/activitypub.js

@@ -0,0 +1,110 @@
+/**
+ * ActivityPub interaction fetcher
+ * Reads inbound interactions from the ap_activities collection
+ * (populated by the AP endpoint's inbox listeners) and normalizes
+ * them into the conversations plugin's internal format.
+ * @module notifications/activitypub
+ */
+
+/**
+ * Map AP activity types to conversations interaction types
+ */
+const typeMap = {
+  Like: "like",
+  Announce: "repost",
+  Reply: "reply",
+};
+
+/**
+ * Fetch ActivityPub interactions since the given cursor
+ * @param {object} options
+ * @param {object} options.ap_activities - MongoDB collection
+ * @param {object} options.ap_followers - MongoDB collection (for avatar lookup)
+ * @param {string} [options.since] - ISO 8601 timestamp cursor (process activities after this)
+ * @returns {Promise<{items: Array, cursor: string|null}>}
+ */
+export async function fetchActivityPubInteractions(options) {
+  const { ap_activities, ap_followers, since } = options;
+
+  const query = {
+    direction: "inbound",
+    type: { $in: ["Like", "Announce", "Reply"] },
+  };
+
+  if (since) {
+    query.receivedAt = { $gt: since };
+  }
+
+  const activities = await ap_activities
+    .find(query)
+    .sort({ receivedAt: 1 })
+    .limit(200)
+    .toArray();
+
+  if (activities.length === 0) {
+    return { items: [], cursor: null };
+  }
+
+  const items = [];
+
+  for (const activity of activities) {
+    const avatar = await lookupAvatar(ap_followers, activity.actorUrl);
+    items.push(normalizeActivity(activity, avatar));
+  }
+
+  // Cursor is the receivedAt of the last activity processed
+  const cursor = activities[activities.length - 1].receivedAt;
+
+  return { items, cursor };
+}
+
+/**
+ * Normalize an ap_activities document into conversations internal format
+ * @param {object} activity - Document from ap_activities
+ * @param {string} avatar - Avatar URL from ap_followers lookup
+ * @returns {object} Normalized interaction
+ */
+function normalizeActivity(activity, avatar) {
+  const type = typeMap[activity.type] || "mention";
+  const isReply = activity.type === "Reply";
+
+  // For replies: targetUrl is your post, objectUrl is the reply
+  // For likes/announces: objectUrl is your post, actorUrl is the source
+  const canonicalUrl = isReply
+    ? activity.targetUrl || activity.objectUrl
+    : activity.objectUrl;
+
+  const url = isReply ? activity.objectUrl : activity.actorUrl;
+
+  return {
+    platform: "activitypub",
+    platform_id: `activitypub:${activity.type}:${activity.actorUrl}:${activity.objectUrl}`,
+    type,
+    author: {
+      name: activity.actorName || activity.actorUrl,
+      url: activity.actorUrl,
+      photo: avatar,
+    },
+    content: activity.content || null,
+    url,
+    canonical_url: canonicalUrl,
+    created_at: activity.receivedAt,
+  };
+}
+
+/**
+ * Look up an actor's avatar from the ap_followers collection
+ * @param {object} ap_followers - MongoDB collection
+ * @param {string} actorUrl - The actor's URL
+ * @returns {Promise<string>} Avatar URL or empty string
+ */
+async function lookupAvatar(ap_followers, actorUrl) {
+  if (!ap_followers || !actorUrl) return "";
+
+  try {
+    const follower = await ap_followers.findOne({ actorUrl });
+    return follower?.avatar || "";
+  } catch {
+    return "";
+  }
+}

package/lib/polling/scheduler.js

@@ -78,6 +78,22 @@ export async function runPollCycle(indiekit, options) {
       password: bskyPassword,
     });
   }
+
+  // Poll ActivityPub (auto-detect from local collections)
+  // Detection runs at poll time because the AP endpoint may init after
+  // the conversations plugin, so the collection isn't available at init.
+  const hasActivityPub = await detectActivityPubSource(indiekit);
+  if (hasActivityPub) {
+    // Update config flag so the dashboard shows AP as enabled.
+    // indiekit may be the Indiekit class or the application object
+    // depending on whether called from startPolling or triggerPoll.
+    const convConfig =
+      indiekit.config?.application?.conversations || indiekit.conversations;
+    if (convConfig && !convConfig.activitypubEnabled) {
+      convConfig.activitypubEnabled = true;
+    }
+    await pollActivityPub(indiekit, stateCollection, state);
+  }
 }
 
 /**
@@ -277,6 +293,97 @@ async function pollBluesky(indiekit, stateCollection, state, credentials) {
   }
 }
 
+/**
+ * Detect whether the ActivityPub endpoint is installed and has interaction data
+ * @param {object} indiekit - Indiekit instance
+ * @returns {Promise<boolean>}
+ */
+async function detectActivityPubSource(indiekit) {
+  try {
+    const ap_activities = indiekit.collections.get("ap_activities");
+    if (!ap_activities) return false;
+    // Collection exists — even if empty, polling is zero-cost (local DB query)
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Poll ActivityPub interactions from local ap_activities collection
+ */
+async function pollActivityPub(indiekit, stateCollection, state) {
+  try {
+    const { fetchActivityPubInteractions } = await import(
+      "../notifications/activitypub.js"
+    );
+
+    const ap_activities = indiekit.collections.get("ap_activities");
+    const ap_followers = indiekit.collections.get("ap_followers");
+
+    if (!ap_activities) return;
+
+    const result = await fetchActivityPubInteractions({
+      ap_activities,
+      ap_followers,
+      since: state.activitypub_last_received_at || null,
+    });
+
+    let stored = 0;
+
+    for (const interaction of result.items) {
+      if (interaction.canonical_url) {
+        await upsertConversationItem(indiekit, {
+          canonical_url: interaction.canonical_url,
+          source: "activitypub",
+          type: interaction.type,
+          author: interaction.author,
+          content: interaction.content,
+          url: interaction.url,
+          bridgy_url: null,
+          platform_id: interaction.platform_id,
+          created_at: interaction.created_at,
+        });
+        stored++;
+      }
+    }
+
+    // Update cursor and status
+    const updateFields = {
+      activitypub_last_poll: new Date().toISOString(),
+      activitypub_last_error: null,
+    };
+    if (result.cursor) {
+      updateFields.activitypub_last_received_at = result.cursor;
+    }
+
+    await stateCollection.findOneAndUpdate(
+      { _id: "poll_cursors" },
+      { $set: updateFields },
+      { upsert: true },
+    );
+
+    if (stored > 0) {
+      console.info(
+        `[Conversations] ActivityPub: stored ${stored}/${result.items.length} interactions`,
+      );
+    }
+  } catch (error) {
+    console.error("[Conversations] ActivityPub poll error:", error.message);
+
+    await stateCollection.findOneAndUpdate(
+      { _id: "poll_cursors" },
+      {
+        $set: {
+          activitypub_last_poll: new Date().toISOString(),
+          activitypub_last_error: error.message,
+        },
+      },
+      { upsert: true },
+    );
+  }
+}
+
 /**
  * Resolve a Mastodon status ID to its URL
  * Used to find the parent status of a mention/reply

package/locales/en.json

@@ -12,6 +12,8 @@
       "itemsReceived": "items received",
       "mastodonHint": "Set MASTODON_ACCESS_TOKEN and MASTODON_URL to enable",
       "blueskyHint": "Set BLUESKY_IDENTIFIER and BLUESKY_PASSWORD to enable",
+      "activitypubTitle": "ActivityPub",
+      "activitypubHint": "Auto-enabled when the ActivityPub endpoint receives interactions",
       "webhookTitle": "Webhook / Ingest",
       "webhookHint": "External services can POST webmentions to the ingest endpoint",
       "stats": "Statistics",
@@ -26,7 +28,8 @@
     "source": {
       "webmention": "Webmention",
       "mastodon": "Mastodon",
-      "bluesky": "Bluesky"
+      "bluesky": "Bluesky",
+      "activitypub": "ActivityPub"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-conversations",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Conversation aggregation endpoint for Indiekit. Backend enrichment service that polls Mastodon/Bluesky notifications and serves JF2-compatible data for the interactions page.",
   "keywords": [
     "indiekit",
@@ -10,7 +10,8 @@
     "webmention",
     "textcasting",
     "mastodon",
-    "bluesky"
+    "bluesky",
+    "activitypub"
   ],
   "homepage": "https://github.com/rmdes/indiekit-endpoint-conversations",
   "author": {

package/views/conversations.njk

@@ -80,6 +80,40 @@
       {% endif %}
     </div>
 
+    {# ActivityPub Card #}
+    <div style="border: 1px solid var(--color-border, #e5e7eb); border-radius: 8px; padding: 1rem">
+      <div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem">
+        <svg style="width:20px;height:20px" viewBox="0 0 24 24" fill="#f1007e" aria-label="ActivityPub">
+          <path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18L19.35 8 12 11.82 4.65 8 12 4.18zM4 9.64l7 3.5V19.5l-7-3.5V9.64zm10 9.86v-6.36l7-3.5v6.36l-7 3.5z"/>
+        </svg>
+        <strong>{{ __("conversations.dashboard.activitypubTitle") }}</strong>
+        {% if config.activitypubEnabled %}
+        <span class="badge" style="background: #059669; color: white; font-size: 0.75em">{{ __("conversations.dashboard.connected") }}</span>
+        {% else %}
+        <span class="badge" style="background: #6b7280; color: white; font-size: 0.75em">{{ __("conversations.dashboard.disconnected") }}</span>
+        {% endif %}
+      </div>
+      {% if config.activitypubEnabled %}
+        {% if pollState.activitypub_last_poll %}
+        <p style="font-size: 0.85em; color: #6b7280; margin: 0.25rem 0">
+          {{ __("conversations.dashboard.lastPoll") }}: {{ pollState.activitypub_last_poll | date("PPp") }}
+        </p>
+        {% endif %}
+        {% if pollState.activitypub_last_error %}
+        <p style="font-size: 0.85em; color: #dc2626; margin: 0.25rem 0">
+          {{ __("conversations.dashboard.lastError") }}: {{ pollState.activitypub_last_error }}
+        </p>
+        {% endif %}
+        <p style="font-size: 0.85em; margin: 0.25rem 0">
+          {{ platformCounts.activitypub or 0 }} {{ __("conversations.dashboard.itemsCollected") }}
+        </p>
+      {% else %}
+        <p style="font-size: 0.85em; color: #6b7280; margin: 0.25rem 0">
+          {{ __("conversations.dashboard.activitypubHint") }}
+        </p>
+      {% endif %}
+    </div>
+
     {# Webhook/Ingest Card #}
     <div style="border: 1px solid var(--color-border, #e5e7eb); border-radius: 8px; padding: 1rem">
       <div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem">
@@ -129,7 +163,7 @@
   </div>
 
   {# Manual Poll Button #}
-  {% if config.mastodonEnabled or config.blueskyEnabled %}
+  {% if config.mastodonEnabled or config.blueskyEnabled or config.activitypubEnabled %}
   <div style="margin-bottom: 2rem">
     <form method="post" action="{{ baseUrl }}/poll">
       <button type="submit" class="button">
@@ -150,6 +184,8 @@
       <svg style="width:14px;height:14px;flex-shrink:0" viewBox="0 0 568 501" fill="#0085ff"><path d="M123.121 33.664C188.241 82.553 258.281 181.68 284 234.873c25.719-53.192 95.759-152.32 160.879-201.21C491.866-1.611 568-28.906 568 57.947c0 17.346-9.945 145.713-15.778 166.555-20.275 72.453-94.155 90.933-159.875 79.748C507.222 323.8 536.444 388.56 473.333 453.32c-119.86 122.992-172.272-30.859-185.702-70.281-2.462-7.227-3.614-10.608-3.631-7.733-.017-2.875-1.169.506-3.631 7.733-13.43 39.422-65.842 193.273-185.702 70.281-63.111-64.76-33.89-129.52 80.986-149.071-65.72 11.185-139.6-7.295-159.875-79.748C9.945 203.659 0 75.291 0 57.946 0-28.906 76.135-1.612 123.121 33.664Z"/></svg>
       {% elif item.source == "mastodon" %}
       <svg style="width:14px;height:14px;flex-shrink:0" viewBox="0 0 24 24" fill="#6364ff"><path d="M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.668 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z"/></svg>
+      {% elif item.source == "activitypub" %}
+      <svg style="width:14px;height:14px;flex-shrink:0" viewBox="0 0 24 24" fill="#f1007e"><path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18L19.35 8 12 11.82 4.65 8 12 4.18zM4 9.64l7 3.5V19.5l-7-3.5V9.64zm10 9.86v-6.36l7-3.5v6.36l-7 3.5z"/></svg>
       {% else %}
       <svg style="width:14px;height:14px;flex-shrink:0" viewBox="0 0 24 24" fill="none" stroke="#888" stroke-width="2"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>
       {% endif %}