@rmdes/indiekit-endpoint-blogroll 1.0.12 → 1.0.14

package/lib/storage/blogs.js

@@ -262,31 +262,54 @@ export async function upsertBlog(application, data) {
     filter.sourceId = new ObjectId(data.sourceId);
   }
 
+  // Build $set with base fields
+  const setFields = {
+    title: data.title,
+    siteUrl: data.siteUrl,
+    feedType: data.feedType,
+    category: data.category,
+    sourceId: data.sourceId ? new ObjectId(data.sourceId) : null,
+    updatedAt: now,
+  };
+
+  // Conditionally add microsub/optional fields to $set when provided
+  if (data.source !== undefined) setFields.source = data.source;
+  if (data.microsubFeedId !== undefined) setFields.microsubFeedId = data.microsubFeedId;
+  if (data.microsubChannelId !== undefined) setFields.microsubChannelId = data.microsubChannelId;
+  if (data.microsubChannelName !== undefined) setFields.microsubChannelName = data.microsubChannelName;
+  if (data.skipItemFetch !== undefined) setFields.skipItemFetch = data.skipItemFetch;
+  if (data.photo !== undefined) setFields.photo = data.photo;
+  if (data.lastFetchAt !== undefined) setFields.lastFetchAt = data.lastFetchAt;
+  if (data.status !== undefined) setFields.status = data.status;
+
+  // $setOnInsert only for fields NOT already in $set (avoids MongoDB path conflicts)
+  const insertDefaults = {
+    description: null,
+    tags: [],
+    author: null,
+    lastError: null,
+    itemCount: 0,
+    pinned: false,
+    hidden: false,
+    notes: null,
+    createdAt: now,
+  };
+
+  // Add defaults for optional fields only when they're NOT in $set
+  if (!("source" in setFields)) insertDefaults.source = null;
+  if (!("microsubFeedId" in setFields)) insertDefaults.microsubFeedId = null;
+  if (!("microsubChannelId" in setFields)) insertDefaults.microsubChannelId = null;
+  if (!("microsubChannelName" in setFields)) insertDefaults.microsubChannelName = null;
+  if (!("skipItemFetch" in setFields)) insertDefaults.skipItemFetch = false;
+  if (!("photo" in setFields)) insertDefaults.photo = null;
+  if (!("lastFetchAt" in setFields)) insertDefaults.lastFetchAt = null;
+  if (!("status" in setFields)) insertDefaults.status = "active";
+
   const result = await collection.updateOne(
     filter,
     {
-      $set: {
-        title: data.title,
-        siteUrl: data.siteUrl,
-        feedType: data.feedType,
-        category: data.category,
-        sourceId: data.sourceId ? new ObjectId(data.sourceId) : null,
-        updatedAt: now,
-      },
-      $setOnInsert: {
-        description: null,
-        tags: [],
-        photo: null,
-        author: null,
-        status: "active",
-        lastFetchAt: null,
-        lastError: null,
-        itemCount: 0,
-        pinned: false,
-        hidden: false,
-        notes: null,
-        createdAt: now,
-      },
+      $set: setFields,
+      $setOnInsert: insertDefaults,
     },
     { upsert: true }
   );

package/lib/sync/microsub.js

@@ -43,6 +43,7 @@ export async function syncMicrosubSource(application, source) {
     let added = 0;
     let updated = 0;
     let total = 0;
+    const currentMicrosubFeedIds = [];
 
     for (const channel of channels) {
       // Get all feeds subscribed in this channel
@@ -50,6 +51,7 @@ export async function syncMicrosubSource(application, source) {
 
       for (const feed of feeds) {
         total++;
+        currentMicrosubFeedIds.push(feed._id.toString());
 
         // Store REFERENCE to Microsub feed, not a copy
         // Items will be queried from microsub_items directly
@@ -83,14 +85,40 @@ export async function syncMicrosubSource(application, source) {
       }
     }
 
+    // Orphan detection: soft-delete blogs whose microsub feed no longer exists
+    let orphaned = 0;
+    if (currentMicrosubFeedIds.length > 0) {
+      const db = application.getBlogrollDb();
+      const orphanResult = await db.collection("blogrollBlogs").updateMany(
+        {
+          source: "microsub",
+          sourceId: source._id,
+          microsubFeedId: { $nin: currentMicrosubFeedIds },
+          status: { $ne: "deleted" },
+        },
+        {
+          $set: {
+            status: "deleted",
+            hidden: true,
+            deletedAt: new Date(),
+            updatedAt: new Date(),
+          },
+        }
+      );
+      orphaned = orphanResult.modifiedCount;
+      if (orphaned > 0) {
+        console.log(`[Blogroll] Cleaned up ${orphaned} orphaned Microsub blog(s) no longer subscribed`);
+      }
+    }
+
     // Update source sync status
     await updateSourceSyncStatus(application, source._id, { success: true });
 
     console.log(
-      `[Blogroll] Synced Microsub source "${source.name}": ${added} added, ${updated} updated, ${total} total from ${channels.length} channels (items served from Microsub)`
+      `[Blogroll] Synced Microsub source "${source.name}": ${added} added, ${updated} updated, ${orphaned} orphaned, ${total} total from ${channels.length} channels (items served from Microsub)`
     );
 
-    return { success: true, added, updated, total };
+    return { success: true, added, updated, orphaned, total };
   } catch (error) {
     // Update source with error status
     await updateSourceSyncStatus(application, source._id, {

package/lib/sync/scheduler.js

@@ -198,9 +198,9 @@ export async function clearAndResync(application, options = {}) {
   // Clear all items (but keep blogs and sources)
   await db.collection("blogrollItems").deleteMany({});
 
-  // Reset blog item counts and status
+  // Reset blog item counts and status (skip soft-deleted blogs)
   await db.collection("blogrollBlogs").updateMany(
-    {},
+    { status: { $ne: "deleted" } },
     {
       $set: {
         itemCount: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-blogroll",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Blogroll endpoint for Indiekit. Aggregates blog feeds from OPML, JSON feeds, or manual entry.",
   "keywords": [
     "indiekit",