@rmdes/indiekit-endpoint-microsub 1.0.18 → 1.0.21

package/assets/styles.css

@@ -373,6 +373,7 @@
 .item-actions {
   border-top: 1px solid var(--color-offset);
   display: flex;
+  flex-wrap: wrap;
   gap: var(--space-s);
   padding-top: var(--space-s);
 }

package/lib/controllers/reader.js

@@ -314,9 +314,17 @@ export async function item(request, response) {
     return response.status(404).render("404");
   }
 
+  // Get the channel for this item (needed for mark-read)
+  let channel = null;
+  if (itemDocument.channelId) {
+    const channelsCollection = application.collections.get("microsub_channels");
+    channel = await channelsCollection.findOne({ _id: itemDocument.channelId });
+  }
+
   response.render("item", {
     title: itemDocument.name || "Item",
     item: itemDocument,
+    channel,
     baseUrl: request.baseUrl,
   });
 }

package/lib/storage/items.js

@@ -288,6 +288,46 @@ export async function countReadItems(application, channelId, userId) {
  * @param {string} userId - User ID
  * @returns {Promise<number>} Number of items updated
  */
+// Maximum number of read items to keep per channel
+const MAX_READ_ITEMS = 30;
+
+/**
+ * Cleanup old read items, keeping only the most recent MAX_READ_ITEMS
+ * @param {object} collection - MongoDB collection
+ * @param {ObjectId} channelObjectId - Channel ObjectId
+ * @param {string} userId - User ID
+ */
+async function cleanupOldReadItems(collection, channelObjectId, userId) {
+  // Count read items in this channel
+  const readCount = await collection.countDocuments({
+    channelId: channelObjectId,
+    readBy: userId,
+  });
+
+  if (readCount > MAX_READ_ITEMS) {
+    // Find the oldest read items to delete
+    const itemsToDelete = await collection
+      .find({
+        channelId: channelObjectId,
+        readBy: userId,
+      })
+      .sort({ published: -1, _id: -1 }) // Newest first
+      .skip(MAX_READ_ITEMS) // Skip the ones we want to keep
+      .project({ _id: 1 })
+      .toArray();
+
+    if (itemsToDelete.length > 0) {
+      const idsToDelete = itemsToDelete.map((item) => item._id);
+      const deleteResult = await collection.deleteMany({
+        _id: { $in: idsToDelete },
+      });
+      console.info(
+        `[Microsub] Cleaned up ${deleteResult.deletedCount} old read items (keeping ${MAX_READ_ITEMS})`,
+      );
+    }
+  }
+}
+
 export async function markItemsRead(application, channelId, entryIds, userId) {
   const collection = getCollection(application);
   const channelObjectId =
@@ -309,6 +349,10 @@ export async function markItemsRead(application, channelId, entryIds, userId) {
     console.info(
       `[Microsub] Marked all items as read: ${result.modifiedCount} updated`,
     );
+
+    // Cleanup old read items, keeping only the most recent
+    await cleanupOldReadItems(collection, channelObjectId, userId);
+
     return result.modifiedCount;
   }
 
@@ -339,6 +383,10 @@ export async function markItemsRead(application, channelId, entryIds, userId) {
   console.info(
     `[Microsub] markItemsRead result: ${result.modifiedCount} items updated`,
   );
+
+  // Cleanup old read items, keeping only the most recent
+  await cleanupOldReadItems(collection, channelObjectId, userId);
+
   return result.modifiedCount;
 }
 

package/package.json

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

package/views/item.njk

@@ -146,6 +146,61 @@
       <a href="{{ baseUrl }}/compose?bookmark={{ item.url | urlencode }}" class="button button--secondary button--small">
         {{ icon("bookmark") }} {{ __("microsub.item.bookmark") }}
       </a>
+      {% if not item._is_read %}
+      <button type="button"
+              class="button button--secondary button--small item__mark-read"
+              data-item-id="{{ item._id }}"
+              data-channel="{{ channel.uid }}">
+        {{ icon("checkboxChecked") }} {{ __("microsub.timeline.markRead") }}
+      </button>
+      {% endif %}
     </footer>
   </article>
+
+  <script type="module">
+    // Handle mark-read button
+    const markReadBtn = document.querySelector('.item__mark-read');
+    if (markReadBtn) {
+      markReadBtn.addEventListener('click', async () => {
+        const itemId = markReadBtn.dataset.itemId;
+        const channelUid = markReadBtn.dataset.channel;
+        const microsubApiUrl = '{{ baseUrl }}'.replace(/\/reader.*$/, '');
+
+        markReadBtn.disabled = true;
+        markReadBtn.textContent = 'Marking...';
+
+        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',
+            },
+            body: formData.toString(),
+            credentials: 'same-origin'
+          });
+
+          if (response.ok) {
+            markReadBtn.textContent = 'Marked as read';
+            markReadBtn.classList.add('button--success');
+            setTimeout(() => {
+              markReadBtn.remove();
+            }, 1500);
+          } else {
+            markReadBtn.textContent = 'Failed';
+            markReadBtn.disabled = false;
+          }
+        } catch (error) {
+          console.error('Error:', error);
+          markReadBtn.textContent = 'Error';
+          markReadBtn.disabled = false;
+        }
+      });
+    }
+  </script>
 {% endblock %}

package/views/partials/item-card.njk

@@ -165,6 +165,10 @@
       {{ icon("repost") }}
       <span class="visually-hidden">Repost</span>
     </a>
+    <a href="{{ baseUrl }}/compose?bookmark={{ item.url | urlencode }}" class="item-actions__button" title="Bookmark">
+      {{ icon("bookmark") }}
+      <span class="visually-hidden">Bookmark</span>
+    </a>
     {% if not item._is_read %}
     <button type="button"
             class="item-actions__button item-actions__mark-read"