@rmdes/indiekit-endpoint-conversations 2.1.4 → 2.1.6

package/lib/polling/scheduler.js

@@ -120,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 } },
@@ -144,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({
@@ -161,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({
@@ -180,8 +175,20 @@ async function backfillMissingAvatars(indiekit, stateCollection) {
         } catch { /* ignore */ }
       }
 
-      // Strategy 4: Fetch actor profile from the fediverse (last resort)
-      if (!photo && actorUrl) {
+      // Strategy 4a: Use AP endpoint's signed fetch (handles Authorized Fetch servers)
+      if (!photo) {
+        const resolveAvatar =
+          indiekit.config?.application?.resolveActorAvatar ||
+          indiekit.resolveActorAvatar;
+        if (resolveAvatar) {
+          try {
+            photo = await resolveAvatar(actorUrl);
+          } catch { /* ignore */ }
+        }
+      }
+
+      // Strategy 4b: Plain fetch fallback (AP endpoint not installed)
+      if (!photo) {
         try {
           const resp = await fetch(actorUrl, {
             headers: { Accept: "application/activity+json, application/ld+json" },
@@ -210,18 +217,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.4",
+  "version": "2.1.6",
   "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",