@rmdes/indiekit-endpoint-microsub 1.0.56 → 1.0.58

package/lib/storage/read-state.js

@@ -3,7 +3,7 @@
  * @module storage/read-state
  */
 
-import { markItemsRead, markItemsUnread, getUnreadCount } from "./items.js";
+import { markItemsRead, markItemsUnread, getUnreadCount } from "./items-read-state.js";
 
 /**
  * Mark entries as read for a user

package/lib/utils/async-handler.js

@@ -0,0 +1,7 @@
+/**
+ * Wrap async route handlers to catch rejections and pass to Express error middleware
+ * @param {Function} fn - Async route handler
+ * @returns {Function} Wrapped handler
+ */
+export const asyncHandler = (fn) => (req, res, next) =>
+  Promise.resolve(fn(req, res, next)).catch(next);

package/lib/utils/html.js

@@ -0,0 +1,25 @@
+/**
+ * Shared HTML utilities
+ * @module utils/html
+ */
+
+/**
+ * Extract image URLs from HTML content (fallback for items without explicit photos)
+ * @param {string} html - HTML content
+ * @returns {string[]} Array of image URLs
+ */
+export function extractImagesFromHtml(html) {
+  if (!html) {
+    return [];
+  }
+  const urls = [];
+  const imgRegex = /<img[^>]+src=["']([^"']+)["'][^>]*>/gi;
+  let match;
+  while ((match = imgRegex.exec(html)) !== null) {
+    const src = match[1];
+    if (src && !urls.includes(src)) {
+      urls.push(src);
+    }
+  }
+  return urls;
+}

package/lib/utils/source-type.js

@@ -0,0 +1,28 @@
+/**
+ * URL classification utilities
+ * @module utils/source-type
+ */
+
+/**
+ * Classify a URL by its platform/protocol
+ * @param {string} url - URL to classify
+ * @returns {{ type: string, protocol: string }}
+ */
+export function classifyUrl(url) {
+  if (!url || typeof url !== "string") return { type: "web", protocol: "web" };
+  const lower = url.toLowerCase();
+  if (lower.includes("bsky.app") || lower.includes("bluesky")) {
+    return { type: "bluesky", protocol: "atmosphere" };
+  }
+  if (
+    lower.includes("mastodon.") ||
+    lower.includes("mstdn.") ||
+    lower.includes("fosstodon.") ||
+    lower.includes("pleroma.") ||
+    lower.includes("misskey.") ||
+    lower.includes("pixelfed.")
+  ) {
+    return { type: "mastodon", protocol: "fediverse" };
+  }
+  return { type: "web", protocol: "web" };
+}

package/lib/webmention/processor.js

@@ -78,7 +78,7 @@ export async function processWebmention(application, source, target, userId) {
   }
 
   // Publish real-time event
-  const redis = getRedisClient(application);
+  const redis = await getRedisClient(application);
   if (redis && userId) {
     await publishEvent(redis, `microsub:user:${userId}`, {
       type: "new-notification",

package/locales/de.json

@@ -4,6 +4,9 @@
       "title": "Leser",
       "empty": "Keine Elemente zum Anzeigen",
       "markAllRead": "Alle als gelesen markieren",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Gelesene anzeigen ({{count}})",
       "hideRead": "Gelesene Elemente ausblenden",
       "allRead": "Alles aufgeholt!",

package/locales/en.json

@@ -5,6 +5,8 @@
       "empty": "No items to display",
       "markAllRead": "Mark all as read",
       "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Show read ({{count}})",
       "hideRead": "Hide read items",
       "allRead": "All caught up!",

package/locales/es-419.json

@@ -4,6 +4,9 @@
       "title": "Lector",
       "empty": "No hay elementos para mostrar",
       "markAllRead": "Marcar todo como leído",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Mostrar leídos ({{count}})",
       "hideRead": "Ocultar elementos leídos",
       "allRead": "¡Todo al día!",

package/locales/es.json

@@ -4,6 +4,9 @@
       "title": "Lector",
       "empty": "No hay elementos para mostrar",
       "markAllRead": "Marcar todo como leído",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Mostrar leídos ({{count}})",
       "hideRead": "Ocultar elementos leídos",
       "allRead": "¡Todo al día!",

package/locales/fr.json

@@ -4,6 +4,9 @@
       "title": "Lecteur",
       "empty": "Aucun élément à afficher",
       "markAllRead": "Tout marquer comme lu",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Afficher les lus ({{count}})",
       "hideRead": "Masquer les éléments lus",
       "allRead": "Tout est à jour !",

package/locales/hi.json

@@ -4,6 +4,9 @@
       "title": "रीडर",
       "empty": "प्रदर्शित करने के लिए कोई आइटम नहीं",
       "markAllRead": "सभी को पढ़ा हुआ चिह्नित करें",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "पढ़े हुए दिखाएं ({{count}})",
       "hideRead": "पढ़े हुए आइटम छिपाएं",
       "allRead": "सब पकड़ लिया!",

package/locales/id.json

@@ -4,6 +4,9 @@
       "title": "Pembaca",
       "empty": "Tidak ada item untuk ditampilkan",
       "markAllRead": "Tandai semua sudah dibaca",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Tampilkan yang sudah dibaca ({{count}})",
       "hideRead": "Sembunyikan item yang sudah dibaca",
       "allRead": "Semua sudah terbaca!",

package/locales/it.json

@@ -4,6 +4,9 @@
       "title": "Lettore",
       "empty": "Nessun elemento da visualizzare",
       "markAllRead": "Segna tutto come letto",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Mostra letti ({{count}})",
       "hideRead": "Nascondi elementi letti",
       "allRead": "Tutto aggiornato!",

package/locales/nl.json

@@ -4,6 +4,9 @@
       "title": "Lezer",
       "empty": "Geen items om weer te geven",
       "markAllRead": "Alles als gelezen markeren",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Toon gelezen ({{count}})",
       "hideRead": "Verberg gelezen items",
       "allRead": "Alles bijgewerkt!",

package/locales/pl.json

@@ -4,6 +4,9 @@
       "title": "Czytnik",
       "empty": "Brak elementów do wyświetlenia",
       "markAllRead": "Oznacz wszystkie jako przeczytane",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Pokaż przeczytane ({{count}})",
       "hideRead": "Ukryj przeczytane elementy",
       "allRead": "Wszystko przeczytane!",

package/locales/pt-BR.json

@@ -4,6 +4,9 @@
       "title": "Leitor",
       "empty": "Nenhum item para exibir",
       "markAllRead": "Marcar tudo como lido",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Mostrar lidos ({{count}})",
       "hideRead": "Ocultar itens lidos",
       "allRead": "Tudo em dia!",

package/locales/pt.json

@@ -4,6 +4,9 @@
       "title": "Leitor",
       "empty": "Nenhum item para exibir",
       "markAllRead": "Marcar tudo como lido",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Mostrar lidos ({{count}})",
       "hideRead": "Ocultar itens lidos",
       "allRead": "Tudo em dia!",

package/locales/sr.json

@@ -4,6 +4,9 @@
       "title": "Читач",
       "empty": "Нема ставки за приказ",
       "markAllRead": "Означи све као прочитано",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Прикажи прочитано ({{count}})",
       "hideRead": "Сакриј прочитане ставке",
       "allRead": "Све ажурирано!",

package/locales/sv.json

@@ -4,6 +4,9 @@
       "title": "Läsare",
       "empty": "Inga objekt att visa",
       "markAllRead": "Markera allt som läst",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "Visa lästa ({{count}})",
       "hideRead": "Dölj lästa objekt",
       "allRead": "Allt är uppdaterat!",

package/locales/zh-Hans-CN.json

@@ -4,6 +4,9 @@
       "title": "阅读器",
       "empty": "没有可显示的项目",
       "markAllRead": "全部标记为已读",
+      "markViewRead": "Mark current view as read",
+      "filterChannels": "Filter channels",
+      "apply": "Apply",
       "showRead": "显示已读 ({{count}})",
       "hideRead": "隐藏已读项目",
       "allRead": "全部已读！",

package/package.json

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

package/views/channel.njk

@@ -96,352 +96,5 @@
     {% endif %}
   </div>
 
-  <script type="module">
-    // CSRF token for AJAX requests
-    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content || '';
-
-    // Keyboard navigation (j/k for items, o to open)
-    const timeline = document.getElementById('timeline');
-    if (timeline) {
-      const items = Array.from(timeline.querySelectorAll('.ms-item-card'));
-      let currentIndex = -1;
-
-      function focusItem(index) {
-        if (items[currentIndex]) {
-          items[currentIndex].classList.remove('ms-item-card--focused');
-        }
-        currentIndex = Math.max(0, Math.min(index, items.length - 1));
-        if (items[currentIndex]) {
-          items[currentIndex].classList.add('ms-item-card--focused');
-          items[currentIndex].scrollIntoView({ behavior: 'smooth', block: 'center' });
-        }
-      }
-
-      document.addEventListener('keydown', (e) => {
-        if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') return;
-
-        switch(e.key) {
-          case 'j':
-            e.preventDefault();
-            focusItem(currentIndex + 1);
-            break;
-          case 'k':
-            e.preventDefault();
-            focusItem(currentIndex - 1);
-            break;
-          case 'o':
-          case 'Enter':
-            e.preventDefault();
-            if (items[currentIndex]) {
-              const link = items[currentIndex].querySelector('.ms-item-card__link');
-              if (link) link.click();
-            }
-            break;
-        }
-      });
-
-      // Handle individual mark-read buttons
-      const channelUid = timeline.dataset.channel;
-      // Microsub API is at the parent of /reader (e.g., /microsub not /microsub/reader)
-      const microsubApiUrl = '{{ baseUrl }}'.replace(/\/reader$/, '');
-
-      timeline.addEventListener('click', async (e) => {
-        const button = e.target.closest('.ms-item-actions__mark-read');
-        if (!button) return;
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        const itemId = button.dataset.itemId;
-        if (!itemId) return;
-
-        // Disable button while processing
-        button.disabled = true;
-
-        try {
-          const formData = new URLSearchParams();
-          formData.append('action', 'timeline');
-          formData.append('method', 'mark_read');
-          formData.append('channel', channelUid);
-          formData.append('entry', itemId);
-
-          const response = await fetch(microsubApiUrl, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/x-www-form-urlencoded',
-              'X-CSRF-Token': csrfToken,
-            },
-            body: formData.toString(),
-            credentials: 'same-origin'
-          });
-
-          if (response.ok) {
-            // Hide the item with animation
-            const card = button.closest('.ms-item-card');
-            if (card) {
-              card.style.transition = 'opacity 0.3s ease, transform 0.3s ease';
-              card.style.opacity = '0';
-              card.style.transform = 'translateX(-20px)';
-              setTimeout(() => {
-                card.remove();
-                // Check if timeline is now empty
-                if (timeline.querySelectorAll('.ms-item-card').length === 0) {
-                  location.reload();
-                }
-              }, 300);
-            }
-          } else {
-            console.error('Failed to mark item as read');
-            button.disabled = false;
-          }
-        } catch (error) {
-          console.error('Error marking item as read:', error);
-          button.disabled = false;
-        }
-      });
-
-      // Handle caret toggle for mark-source-read popover
-      timeline.addEventListener('click', (e) => {
-        const caret = e.target.closest('.ms-item-actions__mark-read-caret');
-        if (!caret) return;
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        // Close other open popovers
-        for (const p of timeline.querySelectorAll('.ms-item-actions__mark-read-popover:not([hidden])')) {
-          if (p !== caret.nextElementSibling) p.hidden = true;
-        }
-
-        const popover = caret.nextElementSibling;
-        if (popover) popover.hidden = !popover.hidden;
-      });
-
-      // Handle mark-source-read button
-      timeline.addEventListener('click', async (e) => {
-        const button = e.target.closest('.ms-item-actions__mark-source-read');
-        if (!button) return;
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        const feedId = button.dataset.feedId;
-        if (!feedId) return;
-
-        button.disabled = true;
-
-        try {
-          const formData = new URLSearchParams();
-          formData.append('action', 'timeline');
-          formData.append('method', 'mark_read_source');
-          formData.append('channel', channelUid);
-          formData.append('feed', feedId);
-
-          const response = await fetch(microsubApiUrl, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'X-CSRF-Token': csrfToken },
-            body: formData.toString(),
-            credentials: 'same-origin'
-          });
-
-          if (response.ok) {
-            // Animate out all cards from this feed
-            const cards = timeline.querySelectorAll(`.ms-item-card[data-feed-id="${feedId}"]`);
-            for (const card of cards) {
-              card.style.transition = 'opacity 0.3s ease, transform 0.3s ease';
-              card.style.opacity = '0';
-              card.style.transform = 'translateX(-20px)';
-            }
-            setTimeout(() => {
-              for (const card of [...cards]) {
-                card.remove();
-              }
-              if (timeline.querySelectorAll('.ms-item-card').length === 0) {
-                location.reload();
-              }
-            }, 300);
-          } else {
-            button.disabled = false;
-          }
-        } catch (error) {
-          console.error('Error marking source as read:', error);
-          button.disabled = false;
-        }
-      });
-
-      // Close popovers on outside click
-      document.addEventListener('click', (e) => {
-        if (!e.target.closest('.ms-item-actions__mark-read-group')) {
-          for (const p of timeline.querySelectorAll('.ms-item-actions__mark-read-popover:not([hidden])')) {
-            p.hidden = true;
-          }
-        }
-      });
-
-      // Handle save-for-later buttons
-      timeline.addEventListener('click', async (e) => {
-        const button = e.target.closest('.ms-item-actions__save-later');
-        if (!button) return;
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        const url = button.dataset.url;
-        const title = button.dataset.title;
-        if (!url) return;
-
-        button.disabled = true;
-
-        try {
-          const response = await fetch('/readlater/save', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': csrfToken },
-            body: JSON.stringify({ url, title: title || url, source: 'microsub' }),
-            credentials: 'same-origin'
-          });
-
-          if (response.ok) {
-            button.classList.add('ms-item-actions__save-later--saved');
-            button.title = 'Saved';
-          } else {
-            button.disabled = false;
-          }
-        } catch {
-          button.disabled = false;
-        }
-      });
-    }
-
-    // === Infinite scroll ===
-    const loader = document.getElementById('timeline-loader');
-    if (loader && timeline) {
-      const spinner = loader.querySelector('.ms-timeline__spinner');
-      const loadMoreLink = loader.querySelector('.ms-timeline__load-more');
-      const endMessage = loader.querySelector('.ms-timeline__end');
-      let cursor = loader.dataset.cursor;
-      let loading = false;
-      let hasMore = true;
-      const apiUrl = loader.dataset.apiUrl;
-      const showReadParam = loader.dataset.showRead;
-
-      async function loadMore() {
-        if (loading || !hasMore) return;
-        loading = true;
-        if (spinner) spinner.style.display = '';
-        if (loadMoreLink) loadMoreLink.style.display = 'none';
-
-        try {
-          const params = new URLSearchParams({ after: cursor });
-          if (showReadParam === 'true') params.append('showRead', 'true');
-
-          const response = await fetch(`${apiUrl}?${params}`, {
-            credentials: 'same-origin'
-          });
-
-          if (!response.ok) throw new Error('Failed to load');
-
-          const data = await response.json();
-
-          if (data.html && data.count > 0) {
-            timeline.insertAdjacentHTML('beforeend', data.html);
-          }
-
-          if (data.paging?.after) {
-            cursor = data.paging.after;
-            if (loadMoreLink) {
-              loadMoreLink.href = `?after=${cursor}${showReadParam === 'true' ? '&showRead=true' : ''}`;
-              loadMoreLink.style.display = '';
-            }
-          } else {
-            hasMore = false;
-            if (loadMoreLink) loadMoreLink.style.display = 'none';
-            if (endMessage) endMessage.style.display = '';
-          }
-        } catch (error) {
-          console.error('Infinite scroll error:', error);
-          hasMore = false;
-          if (loadMoreLink) loadMoreLink.style.display = '';
-        } finally {
-          loading = false;
-          if (spinner) spinner.style.display = 'none';
-        }
-      }
-
-      // IntersectionObserver auto-loads when sentinel is visible
-      const observer = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && hasMore && !loading) {
-          loadMore();
-        }
-      }, { rootMargin: '200px' });
-      observer.observe(loader);
-
-      // Click handler for fallback link
-      if (loadMoreLink) {
-        loadMoreLink.addEventListener('click', (e) => {
-          e.preventDefault();
-          loadMore();
-        });
-      }
-
-      // Expose loadMore for mark-view-as-read to trigger
-      window.__microsubLoadMore = loadMore;
-    }
-
-    // === 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)');
-        const itemIds = [...unreadCards].map((card) => card.dataset.itemId).filter(Boolean);
-
-        if (itemIds.length === 0) return;
-
-        markViewBtn.disabled = true;
-
-        const formData = new URLSearchParams();
-        formData.append('action', 'timeline');
-        formData.append('method', 'mark_read');
-        formData.append('channel', markViewBtn.dataset.channel);
-        for (const id of itemIds) {
-          formData.append('entry', id);
-        }
-
-        try {
-          const response = await fetch(markViewApiUrl, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'X-CSRF-Token': csrfToken },
-            body: formData.toString(),
-            credentials: 'same-origin'
-          });
-
-          if (response.ok) {
-            for (const card of unreadCards) {
-              card.style.transition = 'opacity 0.3s ease, transform 0.3s ease';
-              card.style.opacity = '0';
-              card.style.transform = 'translateX(-20px)';
-            }
-            setTimeout(() => {
-              for (const card of [...unreadCards]) card.remove();
-              markViewBtn.disabled = false;
-
-              // Trigger infinite scroll to load next batch
-              if (typeof window.__microsubLoadMore === 'function') {
-                window.__microsubLoadMore();
-              } else if (timeline.querySelectorAll('.ms-item-card').length === 0) {
-                location.reload();
-              }
-            }, 300);
-          } else {
-            markViewBtn.disabled = false;
-          }
-        } catch (error) {
-          console.error('Error marking current view as read:', error);
-          markViewBtn.disabled = false;
-        }
-      });
-    }
-  </script>
+  <script type="module" src="/assets/@rmdes-indiekit-endpoint-microsub/reader.js"></script>
 {% endblock %}