@rmdes/indiekit-endpoint-conversations 2.2.0 → 2.3.0

package/lib/controllers/conversations.js

@@ -166,54 +166,99 @@ async function apiMentions(request, response) {
     const children = items.map(conversationItemToJf2);
 
     // Enrich with owner replies from the posts collection
-    // Owner replies are Micropub posts with in-reply-to matching an interaction URL
+    // Owner replies are Micropub posts with in-reply-to matching an interaction URL.
+    // We collect reply URLs from conversations DB items, but also need to find
+    // owner replies to interactions that only exist in webmention.io (e.g., Bluesky
+    // replies via Bridgy). Strategy: query for reply URLs from conversations items,
+    // plus find owner posts replying to any URL that the frontend might display
+    // by checking the canonical post's syndication targets.
     const replyUrls = children
       .filter((c) => c["wm-property"] === "in-reply-to")
       .map((c) => c.url)
       .filter(Boolean);
 
-    if (replyUrls.length > 0) {
-      const postsCollection = application.collections?.get("posts");
-      if (postsCollection) {
-        const siteUrl = application.publication?.me || application.url || "";
-        const ownerName =
-          process.env.AUTHOR_NAME ||
-          (siteUrl ? new URL(siteUrl).hostname : "Owner");
-
-        const ownerPosts = await postsCollection
-          .find({
-            "properties.in-reply-to": { $in: replyUrls },
-          })
+    const postsCollection = application.collections?.get("posts");
+    if (postsCollection) {
+      const siteUrl = application.publication?.me || application.url || "";
+      const ownerName =
+        process.env.AUTHOR_NAME ||
+        (siteUrl ? new URL(siteUrl).hostname : "Owner");
+
+      // Find the canonical post to get its syndication URLs
+      // Interactions on syndicated copies (e.g., Bluesky replies to the bsky.app
+      // syndicated post) arrive via webmention.io but not conversations DB.
+      // Owner replies to those interactions have in-reply-to pointing to external
+      // URLs (bsky.app, mastodon, etc.) — we need to find them too.
+      let syndicationDomains = [];
+      if (target) {
+        const targetWithout = target.endsWith("/") ? target.slice(0, -1) : target;
+        const canonicalPost = await postsCollection.findOne({
+          $or: [
+            { "properties.url": target },
+            { "properties.url": targetWithout },
+          ],
+        });
+        if (canonicalPost?.properties?.syndication) {
+          const syns = Array.isArray(canonicalPost.properties.syndication)
+            ? canonicalPost.properties.syndication
+            : [canonicalPost.properties.syndication];
+          for (const syn of syns) {
+            try {
+              const domain = new URL(syn).hostname;
+              if (domain && !domain.includes(new URL(siteUrl).hostname)) {
+                syndicationDomains.push(domain);
+              }
+            } catch { /* skip invalid URLs */ }
+          }
+        }
+      }
+
+      // Build query: replies to known conversation URLs OR replies to URLs
+      // on syndication domains (for webmention.io items not in our DB)
+      const orClauses = [];
+      if (replyUrls.length > 0) {
+        orClauses.push({ "properties.in-reply-to": { $in: replyUrls } });
+      }
+      for (const domain of syndicationDomains) {
+        orClauses.push({
+          "properties.in-reply-to": { $regex: domain.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") },
+        });
+      }
+
+      let ownerPosts = [];
+      if (orClauses.length > 0) {
+        ownerPosts = await postsCollection
+          .find({ $or: orClauses })
           .sort({ "properties.published": -1 })
           .limit(50)
           .toArray();
+      }
 
-        for (const post of ownerPosts) {
-          const inReplyTo = post.properties?.["in-reply-to"];
-          if (!inReplyTo || typeof inReplyTo !== "string") continue;
-
-          children.push({
-            type: "entry",
-            "wm-id": `owner-reply-${post._id}`,
-            "wm-property": "in-reply-to",
-            "wm-target": target || "",
-            "wm-received": post.properties?.published || "",
-            author: {
-              type: "card",
-              name: ownerName,
-              url: siteUrl,
-              photo: process.env.AUTHOR_AVATAR || "",
-            },
-            url: post.properties?.url || "",
-            published: post.properties?.published || "",
-            content: {
-              text: post.properties?.content?.text || "",
-              html: post.properties?.content?.html || "",
-            },
-            is_owner: true,
-            parent_url: inReplyTo,
-          });
-        }
+      for (const post of ownerPosts) {
+        const inReplyTo = post.properties?.["in-reply-to"];
+        if (!inReplyTo || typeof inReplyTo !== "string") continue;
+
+        children.push({
+          type: "entry",
+          "wm-id": `owner-reply-${post._id}`,
+          "wm-property": "in-reply-to",
+          "wm-target": target || "",
+          "wm-received": post.properties?.published || "",
+          author: {
+            type: "card",
+            name: ownerName,
+            url: siteUrl,
+            photo: process.env.AUTHOR_AVATAR || "",
+          },
+          url: post.properties?.url || "",
+          published: post.properties?.published || "",
+          content: {
+            text: post.properties?.content?.text || "",
+            html: post.properties?.content?.html || "",
+          },
+          is_owner: true,
+          parent_url: inReplyTo,
+        });
       }
     }
 

package/lib/notifications/bluesky.js

@@ -27,9 +27,11 @@ export async function fetchBlueskyNotifications(options) {
   // Get or refresh session
   const session = await getSession(serviceUrl, identifier, password);
 
-  // Fetch notifications
+  // Fetch the most recent notifications (no cursor)
+  // Bluesky's listNotifications returns newest first; the cursor pages backward
+  // into history. For polling, we always want the latest batch and rely on
+  // upsert deduplication (platform_id) to skip already-stored items.
   const params = new URLSearchParams({ limit: "50" });
-  if (options.cursor) params.set("cursor", options.cursor);
 
   let notifResponse = await fetch(
     `${serviceUrl}/xrpc/app.bsky.notification.listNotifications?${params.toString()}`,

package/lib/polling/scheduler.js

@@ -425,7 +425,6 @@ async function pollBluesky(indiekit, stateCollection, state, credentials) {
     const result = await fetchBlueskyNotifications({
       identifier: credentials.identifier,
       password: credentials.password,
-      cursor: state.bluesky_cursor,
     });
 
     let stored = 0;
@@ -457,22 +456,19 @@ async function pollBluesky(indiekit, stateCollection, state, credentials) {
       }
     }
 
-    // Update cursor and status
-    const updateFields = {
-      bluesky_last_poll: new Date().toISOString(),
-      bluesky_last_error: null,
-    };
-    if (result.cursor) {
-      updateFields.bluesky_cursor = result.cursor;
-    }
-
+    // Update poll timestamp
     await stateCollection.findOneAndUpdate(
       { _id: "poll_cursors" },
-      { $set: updateFields },
+      {
+        $set: {
+          bluesky_last_poll: new Date().toISOString(),
+          bluesky_last_error: null,
+        },
+      },
       { upsert: true },
     );
 
-    if (stored > 0) {
+    if (stored > 0 || result.items.length > 0) {
       console.info(
         `[Conversations] Bluesky: stored ${stored}/${result.items.length} interactions`,
       );

package/package.json

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