@rmdes/indiekit-endpoint-conversations 2.1.0 → 2.1.2

package/index.js

@@ -106,30 +106,29 @@ export default class ConversationsEndpoint {
         (process.env.BLUESKY_IDENTIFIER || process.env.BLUESKY_HANDLE) &&
         process.env.BLUESKY_PASSWORD;
 
-      // ActivityPub: auto-detect from shared collection registry
-      // The AP endpoint registers ap_activities via Indiekit.addCollection()
-      const hasActivityPub = Indiekit.collections.has("ap_activities");
-
-      if (hasMastodon || hasBluesky || hasActivityPub) {
-        // Store detected platforms for dashboard status
-        Indiekit.config.application.conversations = {
-          ...this.options,
-          mastodonEnabled: !!hasMastodon,
-          blueskyEnabled: !!hasBluesky,
-          activitypubEnabled: !!hasActivityPub,
-        };
-
-        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/polling/scheduler.js

@@ -80,8 +80,18 @@ export async function runPollCycle(indiekit, options) {
   }
 
   // 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);
   }
 }
@@ -313,6 +323,16 @@ async function pollActivityPub(indiekit, stateCollection, state) {
 
     if (!ap_activities) return;
 
+    // Resolve the site URL so we only store interactions about OUR content.
+    // indiekit may be the Indiekit class (from startPolling) or the
+    // application object (from triggerPoll via controller).
+    const siteUrl = (
+      indiekit.publication?.me ||
+      indiekit.url ||
+      process.env.PUBLICATION_URL ||
+      ""
+    ).replace(/\/$/, "");
+
     const result = await fetchActivityPubInteractions({
       ap_activities,
       ap_followers,
@@ -320,22 +340,30 @@ async function pollActivityPub(indiekit, stateCollection, state) {
     });
 
     let stored = 0;
+    let skipped = 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++;
+      if (!interaction.canonical_url) continue;
+
+      // Only store interactions targeting our own content — skip activities
+      // about posts on other domains (e.g. forwarded via shared inbox).
+      if (siteUrl && !interaction.canonical_url.startsWith(siteUrl)) {
+        skipped++;
+        continue;
       }
+
+      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
@@ -353,9 +381,9 @@ async function pollActivityPub(indiekit, stateCollection, state) {
       { upsert: true },
     );
 
-    if (stored > 0) {
+    if (stored > 0 || skipped > 0) {
       console.info(
-        `[Conversations] ActivityPub: stored ${stored}/${result.items.length} interactions`,
+        `[Conversations] ActivityPub: stored ${stored}, skipped ${skipped} (not our content) of ${result.items.length} interactions`,
       );
     }
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-conversations",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "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",