@rmdes/indiekit-endpoint-microsub 1.0.51 → 1.0.54

package/lib/controllers/reader.js

@@ -902,33 +902,18 @@ export async function channelHtml(request, response) {
     );
   }
 
-  // Render each item card to HTML using the existing partial
-  const renderLocals = {
-    channel: channelDocument,
-    baseUrl: request.baseUrl,
-    __: request.__,
-    icon: response.locals.icon,
-    application,
-  };
-
-  const htmlParts = await Promise.all(
-    timeline.items.map(
-      (item) =>
-        new Promise((resolve, reject) => {
-          request.app.render(
-            "partials/item-card.njk",
-            { ...renderLocals, item },
-            (error, html) => {
-              if (error) reject(error);
-              else resolve(html);
-            },
-          );
-        }),
-    ),
-  );
+  // Render items via layout-less fragment template (standard response.render
+  // with callback returns HTML string without sending a response)
+  const fragmentHtml = await new Promise((resolve, reject) => {
+    response.render("partials/items-fragment", {
+      items: timeline.items,
+      channel: channelDocument,
+      baseUrl: request.baseUrl,
+    }, (error, html) => error ? reject(error) : resolve(html));
+  });
 
   response.json({
-    html: htmlParts.join(""),
+    html: fragmentHtml,
     paging: timeline.paging,
     count: timeline.items.length,
   });
@@ -985,37 +970,15 @@ export async function timelineHtml(request, response) {
     }
   }
 
-  const renderLocals = {
-    baseUrl: request.baseUrl,
-    __: request.__,
-    icon: response.locals.icon,
-    application,
-  };
-
-  const htmlParts = await Promise.all(
-    result.items.map(
-      (item) =>
-        new Promise((resolve, reject) => {
-          request.app.render(
-            "partials/item-card.njk",
-            { ...renderLocals, item },
-            (error, cardHtml) => {
-              if (error) {
-                reject(error);
-              } else {
-                const badge = item._channelName
-                  ? `<span class="ms-timeline-view__channel-badge" style="background: ${item._channelColor || "#888"}">${item._channelName}</span>`
-                  : "";
-                resolve(`<div class="ms-timeline-view__item">${badge}${cardHtml}</div>`);
-              }
-            },
-          );
-        }),
-    ),
-  );
+  const fragmentHtml = await new Promise((resolve, reject) => {
+    response.render("partials/items-fragment-timeline", {
+      items: result.items,
+      baseUrl: request.baseUrl,
+    }, (error, html) => error ? reject(error) : resolve(html));
+  });
 
   response.json({
-    html: htmlParts.join(""),
+    html: fragmentHtml,
     paging: result.paging,
     count: result.items.length,
   });

package/locales/en.json

@@ -4,7 +4,7 @@
       "title": "Reader",
       "empty": "No items to display",
       "markAllRead": "Mark all as read",
-      "markViewRead": "Mark view as read",
+      "markViewRead": "Mark current view as read",
       "showRead": "Show read ({{count}})",
       "hideRead": "Hide read items",
       "allRead": "All caught up!",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-microsub",
-  "version": "1.0.51",
+  "version": "1.0.54",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/channel.njk

@@ -381,10 +381,11 @@
       window.__microsubLoadMore = loadMore;
     }
 
-    // === Mark view as read button ===
+    // === Mark current view as read button ===
     const markViewBtn = document.querySelector('.js-mark-view-read');
     if (markViewBtn && timeline) {
       markViewBtn.style.display = '';
+      const markViewApiUrl = '{{ baseUrl }}'.replace(/\/reader$/, '');
 
       markViewBtn.addEventListener('click', async () => {
         const unreadCards = timeline.querySelectorAll('.ms-item-card:not(.ms-item-card--read)');
@@ -403,7 +404,7 @@
         }
 
         try {
-          const response = await fetch(microsubApiUrl, {
+          const response = await fetch(markViewApiUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
             body: formData.toString(),
@@ -431,7 +432,7 @@
             markViewBtn.disabled = false;
           }
         } catch (error) {
-          console.error('Error marking view as read:', error);
+          console.error('Error marking current view as read:', error);
           markViewBtn.disabled = false;
         }
       });

package/views/partials/items-fragment-timeline.njk

@@ -0,0 +1,11 @@
+{# Layout-less fragment for AJAX infinite scroll in timeline view #}
+{% for item in items %}
+<div class="ms-timeline-view__item">
+  {% if item._channelName %}
+  <span class="ms-timeline-view__channel-badge" style="background: {{ item._channelColor or '#888' }}">
+    {{ item._channelName }}
+  </span>
+  {% endif %}
+  {% include "partials/item-card.njk" %}
+</div>
+{% endfor %}

package/views/partials/items-fragment.njk

@@ -0,0 +1,4 @@
+{# Layout-less fragment for AJAX infinite scroll responses #}
+{% for item in items %}
+{% include "partials/item-card.njk" %}
+{% endfor %}