@rmdes/indiekit-endpoint-activitypub 2.0.17 → 2.0.19

package/index.js

@@ -875,107 +875,115 @@ export default class ActivityPubEndpoint {
       _publicationUrl: this._publicationUrl,
     };
 
-    // TTL index for activity cleanup (MongoDB handles expiry automatically)
-    const retentionDays = this.options.activityRetentionDays;
-    if (retentionDays > 0) {
+    // Create indexes — wrapped in try-catch because collection references
+    // may be undefined if MongoDB hasn't finished connecting yet.
+    // Indexes are idempotent; they'll be created on next successful startup.
+    try {
+      // TTL index for activity cleanup (MongoDB handles expiry automatically)
+      const retentionDays = this.options.activityRetentionDays;
+      if (retentionDays > 0) {
+        this._collections.ap_activities.createIndex(
+          { receivedAt: 1 },
+          { expireAfterSeconds: retentionDays * 86_400 },
+        );
+      }
+
+      // Performance indexes for inbox handlers and batch refollow
+      this._collections.ap_followers.createIndex(
+        { actorUrl: 1 },
+        { unique: true, background: true },
+      );
+      this._collections.ap_following.createIndex(
+        { actorUrl: 1 },
+        { unique: true, background: true },
+      );
+      this._collections.ap_following.createIndex(
+        { source: 1 },
+        { background: true },
+      );
       this._collections.ap_activities.createIndex(
-        { receivedAt: 1 },
-        { expireAfterSeconds: retentionDays * 86_400 },
+        { objectUrl: 1 },
+        { background: true },
+      );
+      this._collections.ap_activities.createIndex(
+        { type: 1, actorUrl: 1, objectUrl: 1 },
+        { background: true },
       );
-    }
-
-    // Performance indexes for inbox handlers and batch refollow
-    this._collections.ap_followers.createIndex(
-      { actorUrl: 1 },
-      { unique: true, background: true },
-    );
-    this._collections.ap_following.createIndex(
-      { actorUrl: 1 },
-      { unique: true, background: true },
-    );
-    this._collections.ap_following.createIndex(
-      { source: 1 },
-      { background: true },
-    );
-    this._collections.ap_activities.createIndex(
-      { objectUrl: 1 },
-      { background: true },
-    );
-    this._collections.ap_activities.createIndex(
-      { type: 1, actorUrl: 1, objectUrl: 1 },
-      { background: true },
-    );
-
-    // Reader indexes (timeline, notifications, moderation, interactions)
-    this._collections.ap_timeline.createIndex(
-      { uid: 1 },
-      { unique: true, background: true },
-    );
-    this._collections.ap_timeline.createIndex(
-      { published: -1 },
-      { background: true },
-    );
-    this._collections.ap_timeline.createIndex(
-      { "author.url": 1 },
-      { background: true },
-    );
-    this._collections.ap_timeline.createIndex(
-      { type: 1, published: -1 },
-      { background: true },
-    );
 
-    this._collections.ap_notifications.createIndex(
-      { uid: 1 },
-      { unique: true, background: true },
-    );
-    this._collections.ap_notifications.createIndex(
-      { published: -1 },
-      { background: true },
-    );
-    this._collections.ap_notifications.createIndex(
-      { read: 1 },
-      { background: true },
-    );
-    this._collections.ap_notifications.createIndex(
-      { type: 1, published: -1 },
-      { background: true },
-    );
+      // Reader indexes (timeline, notifications, moderation, interactions)
+      this._collections.ap_timeline.createIndex(
+        { uid: 1 },
+        { unique: true, background: true },
+      );
+      this._collections.ap_timeline.createIndex(
+        { published: -1 },
+        { background: true },
+      );
+      this._collections.ap_timeline.createIndex(
+        { "author.url": 1 },
+        { background: true },
+      );
+      this._collections.ap_timeline.createIndex(
+        { type: 1, published: -1 },
+        { background: true },
+      );
 
-    // TTL index for notification cleanup
-    const notifRetention = this.options.notificationRetentionDays;
-    if (notifRetention > 0) {
       this._collections.ap_notifications.createIndex(
-        { createdAt: 1 },
-        { expireAfterSeconds: notifRetention * 86_400 },
+        { uid: 1 },
+        { unique: true, background: true },
+      );
+      this._collections.ap_notifications.createIndex(
+        { published: -1 },
+        { background: true },
+      );
+      this._collections.ap_notifications.createIndex(
+        { read: 1 },
+        { background: true },
+      );
+      this._collections.ap_notifications.createIndex(
+        { type: 1, published: -1 },
+        { background: true },
       );
-    }
 
-    // Drop non-sparse indexes if they exist (created by earlier versions),
-    // then recreate with sparse:true so multiple null values are allowed.
-    this._collections.ap_muted.dropIndex("url_1").catch(() => {});
-    this._collections.ap_muted.dropIndex("keyword_1").catch(() => {});
-    this._collections.ap_muted.createIndex(
-      { url: 1 },
-      { unique: true, sparse: true, background: true },
-    );
-    this._collections.ap_muted.createIndex(
-      { keyword: 1 },
-      { unique: true, sparse: true, background: true },
-    );
+      // TTL index for notification cleanup
+      const notifRetention = this.options.notificationRetentionDays;
+      if (notifRetention > 0) {
+        this._collections.ap_notifications.createIndex(
+          { createdAt: 1 },
+          { expireAfterSeconds: notifRetention * 86_400 },
+        );
+      }
 
-    this._collections.ap_blocked.createIndex(
-      { url: 1 },
-      { unique: true, background: true },
-    );
+      // Drop non-sparse indexes if they exist (created by earlier versions),
+      // then recreate with sparse:true so multiple null values are allowed.
+      this._collections.ap_muted.dropIndex("url_1").catch(() => {});
+      this._collections.ap_muted.dropIndex("keyword_1").catch(() => {});
+      this._collections.ap_muted.createIndex(
+        { url: 1 },
+        { unique: true, sparse: true, background: true },
+      );
+      this._collections.ap_muted.createIndex(
+        { keyword: 1 },
+        { unique: true, sparse: true, background: true },
+      );
 
-    this._collections.ap_interactions.createIndex(
-      { objectUrl: 1, type: 1 },
-      { unique: true, background: true },
-    );
-    this._collections.ap_interactions.createIndex(
-      { type: 1 },
-      { background: true },
-    );
+      this._collections.ap_blocked.createIndex(
+        { url: 1 },
+        { unique: true, background: true },
+      );
+
+      this._collections.ap_interactions.createIndex(
+        { objectUrl: 1, type: 1 },
+        { unique: true, background: true },
+      );
+      this._collections.ap_interactions.createIndex(
+        { type: 1 },
+        { background: true },
+      );
+    } catch {
+      // Index creation failed — collections not yet available.
+      // Indexes already exist from previous startups; non-fatal.
+    }
 
     // Seed actor profile from config on first run
     this._seedProfile().catch((error) => {

package/lib/controllers/post-detail.js

@@ -153,7 +153,15 @@ export function postDetailController(mountPath, plugin) {
 
       let object = null;
 
-      if (!timelineItem) {
+      // If stored item has no media, re-fetch from Fedify to pick up
+      // attachments that were missed before the async iteration fix.
+      const storedHasNoMedia =
+        timelineItem &&
+        (!timelineItem.photo || timelineItem.photo.length === 0) &&
+        (!timelineItem.video || timelineItem.video.length === 0) &&
+        (!timelineItem.audio || timelineItem.audio.length === 0);
+
+      if (!timelineItem || storedHasNoMedia) {
         // Not in local timeline — fetch via lookupObject
         const handle = plugin.options.actor.handle;
         const ctx = plugin._federation.createContext(
@@ -185,7 +193,8 @@ export function postDetailController(mountPath, plugin) {
           }
         }
 
-        if (!object) {
+        if (!object && !storedHasNoMedia) {
+          // Truly not found (no local item either)
           return response.status(404).render("activitypub-post-detail", {
             title: response.locals.__("activitypub.reader.post.title"),
             notFound: true, objectUrl, mountPath,
@@ -194,34 +203,57 @@ export function postDetailController(mountPath, plugin) {
           });
         }
 
-        // If it's an actor (Person, Service, Application), redirect to profile
-        if (
-          object instanceof Person ||
-          object instanceof Service ||
-          object instanceof Application
-        ) {
-          return response.redirect(
-            `${mountPath}/admin/reader/profile?url=${encodeURIComponent(objectUrl)}`,
-          );
-        }
+        if (object) {
+          // If it's an actor (Person, Service, Application), redirect to profile
+          if (
+            object instanceof Person ||
+            object instanceof Service ||
+            object instanceof Application
+          ) {
+            return response.redirect(
+              `${mountPath}/admin/reader/profile?url=${encodeURIComponent(objectUrl)}`,
+            );
+          }
 
-        // Extract timeline item data from the Fedify object
-        if (object instanceof Note || object instanceof Article) {
-          try {
-            timelineItem = await extractObjectData(object);
-          } catch (error) {
-            console.error(`[post-detail] extractObjectData failed for ${objectUrl}:`, error.message);
-            return response.status(500).render("error", {
+          // Extract timeline item data from the Fedify object
+          if (object instanceof Note || object instanceof Article) {
+            try {
+              const freshItem = await extractObjectData(object);
+
+              // If re-fetch found media that the stored item was missing, update MongoDB
+              if (storedHasNoMedia && timelineCol) {
+                const hasMedia =
+                  (freshItem.photo && freshItem.photo.length > 0) ||
+                  (freshItem.video && freshItem.video.length > 0) ||
+                  (freshItem.audio && freshItem.audio.length > 0);
+                if (hasMedia) {
+                  await timelineCol.updateOne(
+                    { $or: [{ uid: objectUrl }, { url: objectUrl }] },
+                    { $set: { photo: freshItem.photo, video: freshItem.video, audio: freshItem.audio } },
+                  ).catch(() => {});
+                }
+              }
+
+              timelineItem = freshItem;
+            } catch (error) {
+              // If re-extraction fails but we have a stored item, use it
+              if (!storedHasNoMedia) {
+                console.error(`[post-detail] extractObjectData failed for ${objectUrl}:`, error.message);
+                return response.status(500).render("error", {
+                  title: "Error",
+                  content: "Failed to extract post data",
+                });
+              }
+              // storedHasNoMedia=true means timelineItem still has the stored data
+            }
+          } else if (!storedHasNoMedia) {
+            return response.status(400).render("error", {
               title: "Error",
-              content: "Failed to extract post data",
+              content: "Object is not a viewable post (must be Note or Article)",
             });
           }
-        } else {
-          return response.status(400).render("error", {
-            title: "Error",
-            content: "Object is not a viewable post (must be Note or Article)",
-          });
         }
+        // If object is null and storedHasNoMedia, we fall through with the stored timelineItem
       }
 
       // Build interaction state for this post

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",