@rmdes/indiekit-endpoint-conversations 2.1.3 → 2.1.5

package/lib/polling/scheduler.js

@@ -100,10 +100,12 @@ export async function runPollCycle(indiekit, options) {
 }
 
 /**
- * Backfill empty author.photo fields in conversation_items using ap_notifications.
- * The AP endpoint stores actorPhoto in notifications for all interactions,
- * so we can use those to enrich conversation_items that were stored before
- * the actorAvatar field was added to ap_activities.
+ * Backfill empty author.photo fields in conversation_items.
+ * Tries four strategies in order:
+ *   1. ap_notifications (actorPhoto)
+ *   2. ap_activities (actorAvatar — new field from inbox handler fix)
+ *   3. ap_followers (avatar)
+ *   4. Live fetch of the actor's ActivityPub profile (icon field)
  */
 async function backfillMissingAvatars(indiekit, stateCollection) {
   try {
@@ -118,20 +120,16 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
     const state = await stateCollection.findOne({ _id: "poll_cursors" });
     if (state?.avatar_backfill_complete) return;
 
-    // Find conversation_items with empty author.photo
-    const itemsWithoutPhoto = await itemsCollection
-      .find({
-        $or: [
-          { "author.photo": "" },
-          { "author.photo": null },
-          { "author.photo": { $exists: false } },
-        ],
-      })
-      .limit(200)
-      .toArray();
-
-    if (itemsWithoutPhoto.length === 0) {
-      // Mark backfill as complete so we don't query every cycle
+    // Get unique actor URLs with empty photos (deduplicate)
+    const actorUrls = await itemsCollection.distinct("author.url", {
+      $or: [
+        { "author.photo": "" },
+        { "author.photo": null },
+        { "author.photo": { $exists: false } },
+      ],
+    });
+
+    if (actorUrls.length === 0) {
       await stateCollection.findOneAndUpdate(
         { _id: "poll_cursors" },
         { $set: { avatar_backfill_complete: true } },
@@ -142,13 +140,12 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
 
     let updated = 0;
 
-    for (const item of itemsWithoutPhoto) {
-      const actorUrl = item.author?.url;
+    for (const actorUrl of actorUrls) {
       if (!actorUrl) continue;
 
       let photo = "";
 
-      // Strategy 1: Check ap_notifications (most reliable — has actorPhoto for all interaction types)
+      // Strategy 1: Check ap_notifications
       if (!photo && notificationsCollection) {
         try {
           const notification = await notificationsCollection.findOne({
@@ -159,7 +156,7 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
         } catch { /* ignore */ }
       }
 
-      // Strategy 2: Check ap_activities for actorAvatar (new field from inbox handler fix)
+      // Strategy 2: Check ap_activities for actorAvatar
       if (!photo && activitiesCollection) {
         try {
           const activity = await activitiesCollection.findOne({
@@ -178,6 +175,25 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
         } catch { /* ignore */ }
       }
 
+      // Strategy 4: Fetch actor profile from the fediverse (last resort)
+      if (!photo) {
+        try {
+          const resp = await fetch(actorUrl, {
+            headers: { Accept: "application/activity+json, application/ld+json" },
+            signal: AbortSignal.timeout(5000),
+          });
+          if (resp.ok) {
+            const actor = await resp.json();
+            const icon = actor.icon;
+            if (typeof icon === "string") {
+              photo = icon;
+            } else if (icon?.url) {
+              photo = icon.url;
+            }
+          }
+        } catch { /* timeout or network error — skip */ }
+      }
+
       if (photo) {
         await itemsCollection.updateMany(
           { "author.url": actorUrl, "author.photo": { $in: ["", null] } },
@@ -189,18 +205,16 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
 
     if (updated > 0) {
       console.info(
-        `[Conversations] Avatar backfill: updated ${updated} actors with photos`,
+        `[Conversations] Avatar backfill: updated ${updated}/${actorUrls.length} actors with photos`,
       );
     }
 
-    // If fewer than 200 items found, backfill is complete
-    if (itemsWithoutPhoto.length < 200) {
-      await stateCollection.findOneAndUpdate(
-        { _id: "poll_cursors" },
-        { $set: { avatar_backfill_complete: true } },
-        { upsert: true },
-      );
-    }
+    // Mark complete — all actors have been attempted
+    await stateCollection.findOneAndUpdate(
+      { _id: "poll_cursors" },
+      { $set: { avatar_backfill_complete: true } },
+      { upsert: true },
+    );
   } catch (error) {
     // Non-critical — log and continue
     console.warn("[Conversations] Avatar backfill error:", error.message);

package/package.json

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