@rmdes/indiekit-endpoint-microsub 1.0.13 → 1.0.16

package/index.js

@@ -96,6 +96,7 @@ export default class MicrosubEndpoint {
     readerRouter.get("/search", readerController.searchPage);
     readerRouter.post("/search", readerController.searchFeeds);
     readerRouter.post("/subscribe", readerController.subscribe);
+    readerRouter.post("/api/mark-read", readerController.markAllRead);
     router.use("/reader", readerRouter);
 
     return router;

package/lib/controllers/reader.js

@@ -17,7 +17,11 @@ import {
   createFeed,
   deleteFeed,
 } from "../storage/feeds.js";
-import { getTimelineItems, getItemById } from "../storage/items.js";
+import {
+  getTimelineItems,
+  getItemById,
+  markItemsRead,
+} from "../storage/items.js";
 import { getUserId } from "../utils/auth.js";
 import {
   validateChannelName,
@@ -315,6 +319,38 @@ function ensureString(value) {
   return String(value);
 }
 
+/**
+ * Fetch syndication targets from Micropub config
+ * @param {object} application - Indiekit application
+ * @param {string} token - Auth token
+ * @returns {Promise<Array>} Syndication targets
+ */
+async function getSyndicationTargets(application, token) {
+  try {
+    const micropubEndpoint = application.micropubEndpoint;
+    if (!micropubEndpoint) return [];
+
+    const micropubUrl = micropubEndpoint.startsWith("http")
+      ? micropubEndpoint
+      : new URL(micropubEndpoint, application.url).href;
+
+    const configUrl = `${micropubUrl}?q=config`;
+    const configResponse = await fetch(configUrl, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: "application/json",
+      },
+    });
+
+    if (!configResponse.ok) return [];
+
+    const config = await configResponse.json();
+    return config["syndicate-to"] || [];
+  } catch {
+    return [];
+  }
+}
+
 /**
  * Compose response form
  * @param {object} request - Express request
@@ -322,6 +358,8 @@ function ensureString(value) {
  * @returns {Promise<void>}
  */
 export async function compose(request, response) {
+  const { application } = request.app.locals;
+
   // Support both long-form (replyTo) and short-form (reply) query params
   const {
     replyTo,
@@ -334,12 +372,19 @@ export async function compose(request, response) {
     bookmark,
   } = request.query;
 
+  // Fetch syndication targets if user is authenticated
+  const token = request.session?.access_token;
+  const syndicationTargets = token
+    ? await getSyndicationTargets(application, token)
+    : [];
+
   response.render("compose", {
     title: request.__("microsub.compose.title"),
     replyTo: ensureString(replyTo || reply),
     likeOf: ensureString(likeOf || like),
     repostOf: ensureString(repostOf || repost),
     bookmarkOf: ensureString(bookmarkOf || bookmark),
+    syndicationTargets,
     baseUrl: request.baseUrl,
   });
 }
@@ -357,6 +402,7 @@ export async function submitCompose(request, response) {
   const likeOf = request.body["like-of"];
   const repostOf = request.body["repost-of"];
   const bookmarkOf = request.body["bookmark-of"];
+  const syndicateTo = request.body["mp-syndicate-to"];
 
   // Debug logging
   console.info(
@@ -369,6 +415,7 @@ export async function submitCompose(request, response) {
     likeOf,
     repostOf,
     bookmarkOf,
+    syndicateTo,
   });
 
   // Get Micropub endpoint
@@ -396,16 +443,22 @@ export async function submitCompose(request, response) {
   micropubData.append("h", "entry");
 
   if (likeOf) {
-    // Like post (no content needed)
+    // Like post - content is optional comment
     micropubData.append("like-of", likeOf);
+    if (content && content.trim()) {
+      micropubData.append("content", content.trim());
+    }
   } else if (repostOf) {
-    // Repost (no content needed)
+    // Repost - content is optional comment
     micropubData.append("repost-of", repostOf);
+    if (content && content.trim()) {
+      micropubData.append("content", content.trim());
+    }
   } else if (bookmarkOf) {
-    // Bookmark (content optional)
+    // Bookmark - content is optional comment
     micropubData.append("bookmark-of", bookmarkOf);
-    if (content) {
-      micropubData.append("content", content);
+    if (content && content.trim()) {
+      micropubData.append("content", content.trim());
     }
   } else if (inReplyTo) {
     // Reply
@@ -416,6 +469,14 @@ export async function submitCompose(request, response) {
     micropubData.append("content", content || "");
   }
 
+  // Add syndication targets
+  if (syndicateTo) {
+    const targets = Array.isArray(syndicateTo) ? syndicateTo : [syndicateTo];
+    for (const target of targets) {
+      micropubData.append("mp-syndicate-to", target);
+    }
+  }
+
   // Debug: log what we're sending
   console.info("[Microsub] Sending to Micropub:", {
     url: micropubUrl,
@@ -565,6 +626,33 @@ export async function subscribe(request, response) {
   response.redirect(`${request.baseUrl}/channels/${channelUid}/feeds`);
 }
 
+/**
+ * Mark all items in channel as read
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function markAllRead(request, response) {
+  const { application } = request.app.locals;
+  const userId = getUserId(request);
+  const { channel: channelUid } = request.body;
+
+  const channelDocument = await getChannel(application, channelUid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  // Mark all items as read using the special "last-read-entry" value
+  await markItemsRead(
+    application,
+    channelDocument._id,
+    ["last-read-entry"],
+    userId,
+  );
+
+  response.redirect(`${request.baseUrl}/channels/${channelUid}`);
+}
+
 export const readerController = {
   index,
   channels,
@@ -573,6 +661,7 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  markAllRead,
   deleteChannel: deleteChannelAction,
   feeds,
   addFeed,

package/locales/en.json

@@ -43,6 +43,10 @@
     "compose": {
       "title": "Compose",
       "content": "What's on your mind?",
+      "comment": "Add a comment (optional)",
+      "commentHint": "Your comment will be included when this is syndicated",
+      "syndicateTo": "Syndicate to",
+      "syndicateHint": "Select where to cross-post this",
       "submit": "Post",
       "cancel": "Cancel",
       "replyTo": "Replying to",

package/package.json

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

package/views/compose.njk

@@ -60,17 +60,30 @@
 
       {% set isAction = likeOf or repostOf or bookmarkOf %}
 
-      {% if not isAction %}
       {{ textarea({
-        label: __("microsub.compose.content"),
+        label: __("microsub.compose.content") if not isAction else __("microsub.compose.comment"),
         id: "content",
         name: "content",
-        rows: 5,
-        attributes: { autofocus: true }
+        rows: 5 if not isAction else 3,
+        attributes: { autofocus: true },
+        hint: __("microsub.compose.commentHint") if isAction else false
       }) }}
       <div class="compose__counter">
         <span id="char-count">0</span> characters
       </div>
+
+      {# Syndication targets #}
+      {% if syndicationTargets and syndicationTargets.length %}
+      <fieldset class="compose__syndication">
+        <legend>{{ __("microsub.compose.syndicateTo") }}</legend>
+        <p class="hint">{{ __("microsub.compose.syndicateHint") }}</p>
+        {% for target in syndicationTargets %}
+        <label class="syndication-target">
+          <input type="checkbox" name="mp-syndicate-to" value="{{ target.uid }}"{% if target.checked %} checked{% endif %}>
+          <span class="syndication-target__name">{{ target.name }}</span>
+        </label>
+        {% endfor %}
+      </fieldset>
       {% endif %}
 
       <div class="button-group">
@@ -84,7 +97,6 @@
     </form>
   </div>
 
-  {% if not isAction %}
   <script type="module">
     const textarea = document.getElementById('content');
     const counter = document.getElementById('char-count');
@@ -94,5 +106,4 @@
       });
     }
   </script>
-  {% endif %}
 {% endblock %}

package/views/partials/actions.njk

@@ -9,6 +9,9 @@
   <a href="{{ baseUrl }}/compose?repostOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.repost') }}">
     {{ icon("repost") }}
   </a>
+  <a href="{{ baseUrl }}/compose?bookmarkOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.bookmark') }}">
+    {{ icon("bookmark") }}
+  </a>
   <a href="{{ itemUrl }}" class="item-actions__button" target="_blank" rel="noopener" title="{{ __('microsub.item.viewOriginal') }}">
     {{ icon("public") }}
   </a>