@rmdes/indiekit-endpoint-microsub 1.0.0-beta.9 → 1.0.1

package/lib/storage/items.js

@@ -195,7 +195,7 @@ export async function getItemsByUids(application, uids, userId) {
  * Mark items as read
  * @param {object} application - Indiekit application
  * @param {ObjectId|string} channelId - Channel ObjectId
- * @param {Array} entryIds - Array of entry IDs to mark as read
+ * @param {Array} entryIds - Array of entry IDs to mark as read (can be ObjectId, uid, or URL)
  * @param {string} userId - User ID
  * @returns {Promise<number>} Number of items updated
  */
@@ -204,6 +204,12 @@ export async function markItemsRead(application, channelId, entryIds, userId) {
   const channelObjectId =
     typeof channelId === "string" ? new ObjectId(channelId) : channelId;
 
+  console.info(
+    `[Microsub] markItemsRead called for channel ${channelId}, entries:`,
+    entryIds,
+    `userId: ${userId}`,
+  );
+
   // Handle "last-read-entry" special value
   if (entryIds.includes("last-read-entry")) {
     // Mark all items in channel as read
@@ -211,26 +217,39 @@ export async function markItemsRead(application, channelId, entryIds, userId) {
       { channelId: channelObjectId },
       { $addToSet: { readBy: userId } },
     );
+    console.info(
+      `[Microsub] Marked all items as read: ${result.modifiedCount} updated`,
+    );
     return result.modifiedCount;
   }
 
   // Convert string IDs to ObjectIds where possible
-  const objectIds = entryIds.map((id) => {
-    try {
-      return new ObjectId(id);
-    } catch {
-      return id;
-    }
-  });
+  const objectIds = entryIds
+    .map((id) => {
+      try {
+        return new ObjectId(id);
+      } catch {
+        return;
+      }
+    })
+    .filter(Boolean);
 
+  // Build query to match by _id, uid, or url (Microsub spec uses URLs as entry identifiers)
   const result = await collection.updateMany(
     {
       channelId: channelObjectId,
-      $or: [{ _id: { $in: objectIds } }, { uid: { $in: entryIds } }],
+      $or: [
+        ...(objectIds.length > 0 ? [{ _id: { $in: objectIds } }] : []),
+        { uid: { $in: entryIds } },
+        { url: { $in: entryIds } },
+      ],
     },
     { $addToSet: { readBy: userId } },
   );
 
+  console.info(
+    `[Microsub] markItemsRead result: ${result.modifiedCount} items updated`,
+  );
   return result.modifiedCount;
 }
 
@@ -238,7 +257,7 @@ export async function markItemsRead(application, channelId, entryIds, userId) {
  * Mark items as unread
  * @param {object} application - Indiekit application
  * @param {ObjectId|string} channelId - Channel ObjectId
- * @param {Array} entryIds - Array of entry IDs to mark as unread
+ * @param {Array} entryIds - Array of entry IDs to mark as unread (can be ObjectId, uid, or URL)
  * @param {string} userId - User ID
  * @returns {Promise<number>} Number of items updated
  */
@@ -252,18 +271,26 @@ export async function markItemsUnread(
   const channelObjectId =
     typeof channelId === "string" ? new ObjectId(channelId) : channelId;
 
-  const objectIds = entryIds.map((id) => {
-    try {
-      return new ObjectId(id);
-    } catch {
-      return id;
-    }
-  });
+  // Convert string IDs to ObjectIds where possible
+  const objectIds = entryIds
+    .map((id) => {
+      try {
+        return new ObjectId(id);
+      } catch {
+        return;
+      }
+    })
+    .filter(Boolean);
 
+  // Match by _id, uid, or url
   const result = await collection.updateMany(
     {
       channelId: channelObjectId,
-      $or: [{ _id: { $in: objectIds } }, { uid: { $in: entryIds } }],
+      $or: [
+        ...(objectIds.length > 0 ? [{ _id: { $in: objectIds } }] : []),
+        { uid: { $in: entryIds } },
+        { url: { $in: entryIds } },
+      ],
     },
     { $pull: { readBy: userId } },
   );
@@ -275,7 +302,7 @@ export async function markItemsUnread(
  * Remove items from channel
  * @param {object} application - Indiekit application
  * @param {ObjectId|string} channelId - Channel ObjectId
- * @param {Array} entryIds - Array of entry IDs to remove
+ * @param {Array} entryIds - Array of entry IDs to remove (can be ObjectId, uid, or URL)
  * @returns {Promise<number>} Number of items removed
  */
 export async function removeItems(application, channelId, entryIds) {
@@ -283,17 +310,25 @@ export async function removeItems(application, channelId, entryIds) {
   const channelObjectId =
     typeof channelId === "string" ? new ObjectId(channelId) : channelId;
 
-  const objectIds = entryIds.map((id) => {
-    try {
-      return new ObjectId(id);
-    } catch {
-      return id;
-    }
-  });
+  // Convert string IDs to ObjectIds where possible
+  const objectIds = entryIds
+    .map((id) => {
+      try {
+        return new ObjectId(id);
+      } catch {
+        return;
+      }
+    })
+    .filter(Boolean);
 
+  // Match by _id, uid, or url
   const result = await collection.deleteMany({
     channelId: channelObjectId,
-    $or: [{ _id: { $in: objectIds } }, { uid: { $in: entryIds } }],
+    $or: [
+      ...(objectIds.length > 0 ? [{ _id: { $in: objectIds } }] : []),
+      { uid: { $in: entryIds } },
+      { url: { $in: entryIds } },
+    ],
   });
 
   return result.deletedCount;
@@ -411,11 +446,34 @@ export async function deleteItemsByAuthorUrl(application, userId, authorUrl) {
 export async function createIndexes(application) {
   const collection = getCollection(application);
 
+  // Primary query indexes
   await collection.createIndex({ channelId: 1, published: -1 });
   await collection.createIndex({ channelId: 1, uid: 1 }, { unique: true });
   await collection.createIndex({ feedId: 1 });
+
+  // URL matching index for mark_read operations
+  await collection.createIndex({ channelId: 1, url: 1 });
+
+  // Full-text search index with weights
+  // Higher weight = more importance in relevance scoring
   await collection.createIndex(
-    { name: "text", "content.text": "text", summary: "text" },
-    { name: "text_search" },
+    {
+      name: "text",
+      "content.text": "text",
+      "content.html": "text",
+      summary: "text",
+      "author.name": "text",
+    },
+    {
+      name: "text_search",
+      weights: {
+        name: 10, // Titles most important
+        summary: 5, // Summaries second
+        "content.text": 3, // Content third
+        "content.html": 2, // HTML content lower
+        "author.name": 1, // Author names lowest
+      },
+      default_language: "english",
+    },
   );
 }

package/lib/utils/auth.js

@@ -0,0 +1,36 @@
+/**
+ * Authentication utilities for Microsub
+ * @module utils/auth
+ */
+
+/**
+ * Get the user ID from request context
+ *
+ * In Indiekit, the userId can come from:
+ * 1. request.session.userId (if explicitly set)
+ * 2. request.session.me (from token introspection)
+ * 3. application.publication.me (single-user fallback)
+ * @param {object} request - Express request
+ * @returns {string|undefined} User ID
+ */
+export function getUserId(request) {
+  // Check session for explicit userId
+  if (request.session?.userId) {
+    return request.session.userId;
+  }
+
+  // Check session for me URL from token introspection
+  if (request.session?.me) {
+    return request.session.me;
+  }
+
+  // Fall back to publication me URL (single-user mode)
+  const { application } = request.app.locals;
+  if (application?.publication?.me) {
+    return application.publication.me;
+  }
+
+  // Final fallback: use "default" as user ID for single-user instances
+  // This ensures read state is tracked even without explicit user identity
+  return "default";
+}

package/lib/webmention/receiver.js

@@ -3,6 +3,8 @@
  * @module webmention/receiver
  */
 
+import { getUserId } from "../utils/auth.js";
+
 import { processWebmention } from "./processor.js";
 
 /**
@@ -33,7 +35,7 @@ export async function receive(request, response) {
   }
 
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   // Return 202 Accepted immediately (processing asynchronously)
   response.status(202).json({

package/locales/en.json

@@ -46,7 +46,8 @@
       "cancel": "Cancel",
       "replyTo": "Replying to",
       "likeOf": "Liking",
-      "repostOf": "Reposting"
+      "repostOf": "Reposting",
+      "bookmarkOf": "Bookmarking"
     },
     "settings": {
       "title": "{{channel}} settings",
@@ -55,6 +56,10 @@
       "excludeRegex": "Exclude pattern",
       "excludeRegexHelp": "Regular expression to filter out matching content",
       "save": "Save settings",
+      "dangerZone": "Danger zone",
+      "deleteWarning": "Deleting this channel will permanently remove all feeds and items. This action cannot be undone.",
+      "deleteConfirm": "Are you sure you want to delete this channel and all its content?",
+      "delete": "Delete channel",
       "types": {
         "like": "Likes",
         "repost": "Reposts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-microsub",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.1",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",
@@ -21,6 +21,9 @@
   },
   "type": "module",
   "main": "index.js",
+  "scripts": {
+    "test": "node --test test/unit/*.js"
+  },
   "files": [
     "lib",
     "locales",

package/views/compose.njk

@@ -24,6 +24,12 @@
     </div>
     {% endif %}
 
+    {% if bookmarkOf %}
+    <div class="compose__context">
+      {{ icon("bookmark") }} {{ __("microsub.compose.bookmarkOf") }}: <a href="{{ bookmarkOf }}">{{ bookmarkOf }}</a>
+    </div>
+    {% endif %}
+
     <form method="post" action="{{ baseUrl }}/compose">
       {% if replyTo %}
       <input type="hidden" name="in-reply-to" value="{{ replyTo }}">
@@ -34,8 +40,11 @@
       {% if repostOf %}
       <input type="hidden" name="repost-of" value="{{ repostOf }}">
       {% endif %}
+      {% if bookmarkOf %}
+      <input type="hidden" name="bookmark-of" value="{{ bookmarkOf }}">
+      {% endif %}
 
-      {% if not likeOf and not repostOf %}
+      {% if not likeOf and not repostOf and not bookmarkOf %}
       {{ textarea({
         label: __("microsub.compose.content"),
         id: "content",

package/views/settings.njk

@@ -55,5 +55,19 @@
         </a>
       </div>
     </form>
+
+    {% if channel.uid !== "notifications" %}
+    <hr class="divider">
+    <div class="danger-zone">
+      <h3>{{ __("microsub.settings.dangerZone") }}</h3>
+      <p class="hint">{{ __("microsub.settings.deleteWarning") }}</p>
+      <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/delete" onsubmit="return confirm('{{ __("microsub.settings.deleteConfirm") }}');">
+        {{ button({
+          text: __("microsub.settings.delete"),
+          classes: "button--danger"
+        }) }}
+      </form>
+    </div>
+    {% endif %}
   </div>
 {% endblock %}