@rmdes/indiekit-endpoint-blogroll 1.0.11 → 1.0.13

package/lib/controllers/api.js

@@ -249,12 +249,14 @@ function sanitizeBlog(blog) {
  * @returns {object} Sanitized item
  */
 function sanitizeItem(item) {
+  const published = item.published ? new Date(item.published) : null;
   return {
     id: item._id.toString(),
     url: item.url,
     title: item.title,
     summary: item.summary,
     published: item.published,
+    isFuture: published ? published > new Date() : false,
     author: item.author,
     photo: item.photo,
     categories: item.categories,

package/lib/storage/blogs.js

@@ -262,29 +262,47 @@ 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 fields when present
+  if (data.source) setFields.source = data.source;
+  if (data.microsubFeedId) setFields.microsubFeedId = data.microsubFeedId;
+  if (data.microsubChannelId) setFields.microsubChannelId = data.microsubChannelId;
+  if (data.microsubChannelName) setFields.microsubChannelName = data.microsubChannelName;
+  if (data.skipItemFetch !== undefined) setFields.skipItemFetch = data.skipItemFetch;
+  if (data.photo) setFields.photo = data.photo;
+  if (data.lastFetchAt !== undefined) setFields.lastFetchAt = data.lastFetchAt;
+  if (data.status) setFields.status = data.status;
+
   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,
-      },
+      $set: setFields,
       $setOnInsert: {
         description: null,
         tags: [],
-        photo: null,
+        photo: data.photo || null,
         author: null,
-        status: "active",
-        lastFetchAt: null,
+        status: data.status || "active",
+        lastFetchAt: data.lastFetchAt || null,
         lastError: null,
         itemCount: 0,
         pinned: false,
         hidden: false,
         notes: null,
+        source: data.source || null,
+        microsubFeedId: data.microsubFeedId || null,
+        microsubChannelId: data.microsubChannelId || null,
+        microsubChannelName: data.microsubChannelName || null,
+        skipItemFetch: data.skipItemFetch || false,
         createdAt: now,
       },
     },

package/lib/sync/feed.js

@@ -134,14 +134,14 @@ function parseJsonFeed(content, feedUrl, maxItems) {
   const items = (feed.items || []).slice(0, maxItems).map((item) => ({
     uid: generateUid(feedUrl, item.id || item.url),
     url: item.url || item.external_url,
-    title: item.title || "Untitled",
+    title: decodeEntities(item.title) || "Untitled",
     content: {
       html: item.content_html
         ? sanitizeHtml(item.content_html, SANITIZE_OPTIONS)
         : undefined,
       text: item.content_text,
     },
-    summary: item.summary || truncateText(item.content_text, 300),
+    summary: decodeEntities(item.summary) || truncateText(item.content_text, 300),
     published: item.date_published ? new Date(item.date_published) : new Date(),
     updated: item.date_modified ? new Date(item.date_modified) : undefined,
     author: item.author || (item.authors?.[0]),
@@ -171,7 +171,7 @@ function normalizeItem(item, feedUrl) {
   return {
     uid: generateUid(feedUrl, item.guid || item.link),
     url: item.link || item.origlink,
-    title: item.title || "Untitled",
+    title: decodeEntities(item.title) || "Untitled",
     content: {
       html: description ? sanitizeHtml(description, SANITIZE_OPTIONS) : undefined,
       text: stripHtml(description),
@@ -200,16 +200,37 @@ function generateUid(feedUrl, itemId) {
 }
 
 /**
- * Strip HTML tags from string
+ * Strip HTML tags and decode HTML entities from string
  * @param {string} html - HTML string
  * @returns {string} Plain text
  */
 function stripHtml(html) {
   if (!html) return "";
-  return html
-    .replace(/<[^>]*>/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
+  return decodeEntities(
+    html
+      .replace(/<[^>]*>/g, " ")
+      .replace(/\s+/g, " ")
+      .trim()
+  );
+}
+
+/**
+ * Decode HTML entities to their character equivalents
+ * @param {string} str - String with HTML entities
+ * @returns {string} Decoded string
+ */
+function decodeEntities(str) {
+  if (!str) return "";
+  return str
+    .replace(/&amp;/g, "&")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, '"')
+    .replace(/&apos;/g, "'")
+    .replace(/&#39;/g, "'")
+    .replace(/&#x27;/g, "'")
+    .replace(/&#(\d+);/g, (_, code) => String.fromCharCode(Number(code)))
+    .replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)));
 }
 
 /**

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.11",
+  "version": "1.0.13",
   "description": "Blogroll endpoint for Indiekit. Aggregates blog feeds from OPML, JSON feeds, or manual entry.",
   "keywords": [
     "indiekit",