@rmdes/indiekit-endpoint-conversations 2.1.2 → 2.1.4

package/lib/notifications/activitypub.js

@@ -48,7 +48,11 @@ export async function fetchActivityPubInteractions(options) {
   const items = [];
 
   for (const activity of activities) {
-    const avatar = await lookupAvatar(ap_followers, activity.actorUrl);
+    // Prefer avatar stored directly on the activity (added by inbox handler),
+    // fall back to ap_followers lookup for historical data without actorAvatar
+    const avatar =
+      activity.actorAvatar ||
+      (await lookupAvatar(ap_followers, activity.actorUrl));
     items.push(normalizeActivity(activity, avatar));
   }
 

package/lib/polling/scheduler.js

@@ -94,6 +94,138 @@ export async function runPollCycle(indiekit, options) {
     }
     await pollActivityPub(indiekit, stateCollection, state);
   }
+
+  // Backfill missing avatars from ap_notifications (one-time sweep per cycle)
+  await backfillMissingAvatars(indiekit, stateCollection);
+}
+
+/**
+ * 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 {
+    const itemsCollection = indiekit.collections.get("conversation_items");
+    const notificationsCollection = indiekit.collections.get("ap_notifications");
+    const activitiesCollection = indiekit.collections.get("ap_activities");
+    const followersCollection = indiekit.collections.get("ap_followers");
+
+    if (!itemsCollection) return;
+
+    // Check if backfill already completed
+    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
+      await stateCollection.findOneAndUpdate(
+        { _id: "poll_cursors" },
+        { $set: { avatar_backfill_complete: true } },
+        { upsert: true },
+      );
+      return;
+    }
+
+    let updated = 0;
+
+    for (const item of itemsWithoutPhoto) {
+      const actorUrl = item.author?.url;
+      if (!actorUrl) continue;
+
+      let photo = "";
+
+      // Strategy 1: Check ap_notifications (most reliable — has actorPhoto for all interaction types)
+      if (!photo && notificationsCollection) {
+        try {
+          const notification = await notificationsCollection.findOne({
+            actorUrl,
+            actorPhoto: { $ne: "" },
+          });
+          if (notification?.actorPhoto) photo = notification.actorPhoto;
+        } catch { /* ignore */ }
+      }
+
+      // Strategy 2: Check ap_activities for actorAvatar (new field from inbox handler fix)
+      if (!photo && activitiesCollection) {
+        try {
+          const activity = await activitiesCollection.findOne({
+            actorUrl,
+            actorAvatar: { $ne: "" },
+          });
+          if (activity?.actorAvatar) photo = activity.actorAvatar;
+        } catch { /* ignore */ }
+      }
+
+      // Strategy 3: Check ap_followers
+      if (!photo && followersCollection) {
+        try {
+          const follower = await followersCollection.findOne({ actorUrl });
+          if (follower?.avatar) photo = follower.avatar;
+        } catch { /* ignore */ }
+      }
+
+      // Strategy 4: Fetch actor profile from the fediverse (last resort)
+      if (!photo && actorUrl) {
+        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] } },
+          { $set: { "author.photo": photo } },
+        );
+        updated++;
+      }
+    }
+
+    if (updated > 0) {
+      console.info(
+        `[Conversations] Avatar backfill: updated ${updated} 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 },
+      );
+    }
+  } 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.2",
+  "version": "2.1.4",
   "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",