@rmdes/indiekit-endpoint-activitypub 1.0.15 → 1.0.17

package/lib/inbox-listeners.js

@@ -120,30 +120,15 @@ export function registerInboxListeners(inboxChain, options) {
       }
     })
     .on(Accept, async (ctx, accept) => {
-      // Handle Accept(Follow) — remote server accepted our Follow request
+      // Handle Accept(Follow) — remote server accepted our Follow request.
+      // We don't inspect the inner object type because Fedify often resolves
+      // it to a Person (the Follow's target) rather than the Follow itself.
+      // Instead, we match directly against ap_following — if we have a
+      // pending follow for this actor, any Accept from them confirms it.
       const actorObj = await accept.getActor();
       const actorUrl = actorObj?.id?.href || "";
       if (!actorUrl) return;
 
-      // Check if the inner object is a Follow. Some servers send the full
-      // Follow object, others send only a reference URL that Fedify can't
-      // resolve (since the original Follow was our outgoing activity).
-      let isFollow = false;
-      try {
-        const inner = await accept.getObject();
-        isFollow = inner instanceof Follow;
-        // If inner resolved to a non-Follow activity, skip
-        if (inner && !isFollow) {
-          console.info(
-            `[ActivityPub] Accept from ${actorUrl}: inner is ${inner.constructor?.name}, not Follow — skipping`,
-          );
-          return;
-        }
-      } catch {
-        // getObject() failed — proceed anyway if we have a pending follow
-      }
-
-      // Match against our following list for refollow or microsub-reader follows
       const result = await collections.ap_following.findOneAndUpdate(
         {
           actorUrl,
@@ -347,16 +332,54 @@ async function logActivity(collections, storeRaw, record) {
 let _apChannelId = null;
 
 /**
- * Look up the ActivityPub channel's ObjectId (cached after first call).
+ * Look up (or auto-create) the ActivityPub channel's ObjectId.
+ * Cached after first successful call.
+ *
+ * The channel is created with `userId: "default"` so it appears in the
+ * Microsub reader UI alongside user-created channels.
+ *
  * @param {object} collections - MongoDB collections
  * @returns {Promise<import("mongodb").ObjectId|null>}
  */
 async function getApChannelId(collections) {
   if (_apChannelId) return _apChannelId;
-  const channel = await collections.microsub_channels?.findOne({
+  if (!collections.microsub_channels) return null;
+
+  let channel = await collections.microsub_channels.findOne({
     uid: "activitypub",
   });
-  _apChannelId = channel?._id || null;
+
+  if (!channel) {
+    // Auto-create the channel with the same fields the Microsub plugin uses
+    const maxOrderDoc = await collections.microsub_channels
+      .find({ userId: "default" })
+      .sort({ order: -1 })
+      .limit(1)
+      .toArray();
+    const order = maxOrderDoc.length > 0 ? maxOrderDoc[0].order + 1 : 0;
+
+    const doc = {
+      uid: "activitypub",
+      name: "Fediverse",
+      userId: "default",
+      order,
+      settings: { excludeTypes: [], excludeRegex: null },
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+    await collections.microsub_channels.insertOne(doc);
+    channel = doc;
+    console.info("[ActivityPub] Auto-created Microsub channel 'Fediverse'");
+  } else if (!channel.userId) {
+    // Fix existing channel missing userId (created by earlier version)
+    await collections.microsub_channels.updateOne(
+      { _id: channel._id },
+      { $set: { userId: "default" } },
+    );
+    console.info("[ActivityPub] Fixed Microsub channel: set userId to 'default'");
+  }
+
+  _apChannelId = channel._id;
   return _apChannelId;
 }
 

package/package.json

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