@rmdes/indiekit-endpoint-microsub 1.0.0-beta.5 → 1.0.0-beta.7

package/index.js

@@ -78,6 +78,12 @@ export default class MicrosubEndpoint {
       "/channels/:uid/settings",
       readerController.updateSettings,
     );
+    readerRouter.get("/channels/:uid/feeds", readerController.feeds);
+    readerRouter.post("/channels/:uid/feeds", readerController.addFeed);
+    readerRouter.post(
+      "/channels/:uid/feeds/remove",
+      readerController.removeFeed,
+    );
     readerRouter.get("/item/:id", readerController.item);
     readerRouter.get("/compose", readerController.compose);
     readerRouter.post("/compose", readerController.submitCompose);

package/lib/controllers/reader.js

@@ -3,12 +3,18 @@
  * @module controllers/reader
  */
 
+import { refreshFeedNow } from "../polling/scheduler.js";
 import {
   getChannels,
   getChannel,
   createChannel,
   updateChannelSettings,
 } from "../storage/channels.js";
+import {
+  getFeedsForChannel,
+  createFeed,
+  deleteFeed,
+} from "../storage/feeds.js";
 import { getTimelineItems, getItemById } from "../storage/items.js";
 import {
   validateChannelName,
@@ -76,6 +82,7 @@ export async function createChannelAction(request, response) {
  * View channel timeline
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function channel(request, response) {
   const { application } = request.app.locals;
@@ -107,6 +114,7 @@ export async function channel(request, response) {
  * Channel settings form
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function settings(request, response) {
   const { application } = request.app.locals;
@@ -131,6 +139,7 @@ export async function settings(request, response) {
  * Update channel settings
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function updateSettings(request, response) {
   const { application } = request.app.locals;
@@ -161,10 +170,92 @@ export async function updateSettings(request, response) {
   response.redirect(`${request.baseUrl}/channels/${uid}`);
 }
 
+/**
+ * View feeds for a channel
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function feeds(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { uid } = request.params;
+
+  const channelDocument = await getChannel(application, uid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  const feedList = await getFeedsForChannel(application, channelDocument._id);
+
+  response.render("feeds", {
+    title: request.__("microsub.feeds.title"),
+    channel: channelDocument,
+    feeds: feedList,
+    baseUrl: request.baseUrl,
+  });
+}
+
+/**
+ * Add feed to channel
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function addFeed(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { uid } = request.params;
+  const { url } = request.body;
+
+  const channelDocument = await getChannel(application, uid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  // Create feed subscription
+  const feed = await createFeed(application, {
+    channelId: channelDocument._id,
+    url,
+    title: undefined,
+    photo: undefined,
+  });
+
+  // Trigger immediate fetch in background
+  refreshFeedNow(application, feed._id).catch((error) => {
+    console.error(`[Microsub] Error fetching new feed ${url}:`, error.message);
+  });
+
+  response.redirect(`${request.baseUrl}/channels/${uid}/feeds`);
+}
+
+/**
+ * Remove feed from channel
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function removeFeed(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { uid } = request.params;
+  const { url } = request.body;
+
+  const channelDocument = await getChannel(application, uid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  await deleteFeed(application, channelDocument._id, url);
+
+  response.redirect(`${request.baseUrl}/channels/${uid}/feeds`);
+}
+
 /**
  * View single item
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function item(request, response) {
   const { application } = request.app.locals;
@@ -187,6 +278,7 @@ export async function item(request, response) {
  * Compose response form
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function compose(request, response) {
   const { replyTo, likeOf, repostOf } = request.query;
@@ -218,6 +310,9 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  feeds,
+  addFeed,
+  removeFeed,
   item,
   compose,
   submitCompose,

package/locales/en.json

@@ -28,7 +28,9 @@
       "title": "Feeds",
       "follow": "Follow",
       "unfollow": "Unfollow",
-      "empty": "No feeds followed in this channel"
+      "empty": "No feeds followed in this channel",
+      "url": "Feed URL",
+      "urlPlaceholder": "https://example.com/feed.xml"
     },
     "item": {
       "reply": "Reply",
@@ -47,7 +49,7 @@
       "repostOf": "Reposting"
     },
     "settings": {
-      "title": "%{channel} settings",
+      "title": "{{channel}} settings",
       "excludeTypes": "Exclude interaction types",
       "excludeTypesHelp": "Select types of posts to hide from this channel",
       "excludeRegex": "Exclude pattern",

package/package.json

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

package/views/channel-new.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <div class="channel-new">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+      {{ icon("previous") }} {{ __("microsub.channels.title") }}
     </a>
 
     <form method="post" action="{{ baseUrl }}/channels/new">

package/views/channel.njk

@@ -4,11 +4,14 @@
   <div class="channel">
     <header class="channel__header">
       <a href="{{ baseUrl }}/channels" class="back-link">
-        {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+        {{ icon("previous") }} {{ __("microsub.channels.title") }}
       </a>
       <div class="channel__actions">
+        <a href="{{ baseUrl }}/channels/{{ channel.uid }}/feeds" class="button button--secondary button--small">
+          {{ icon("syndicate") }} {{ __("microsub.feeds.title") }}
+        </a>
         <a href="{{ baseUrl }}/channels/{{ channel.uid }}/settings" class="button button--secondary button--small">
-          {{ icon("settings") }} {{ __("microsub.channels.settings") }}
+          {{ icon("updatePost") }} {{ __("microsub.channels.settings") }}
         </a>
       </div>
     </header>
@@ -24,12 +27,12 @@
     <nav class="timeline__paging" aria-label="Pagination">
       {% if paging.before %}
       <a href="?before={{ paging.before }}" class="button button--secondary">
-        {{ icon("arrow-left") }} {{ __("microsub.reader.newer") }}
+        {{ icon("previous") }} {{ __("microsub.reader.newer") }}
       </a>
       {% endif %}
       {% if paging.after %}
       <a href="?after={{ paging.after }}" class="button button--secondary">
-        {{ __("microsub.reader.older") }} {{ icon("arrow-right") }}
+        {{ __("microsub.reader.older") }} {{ icon("next") }}
       </a>
       {% endif %}
     </nav>

package/views/compose.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <div class="compose">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+      {{ icon("previous") }} {{ __("Back") }}
     </a>
 
     {% if replyTo %}
@@ -14,7 +14,7 @@
 
     {% if likeOf %}
     <div class="compose__context">
-      {{ icon("heart") }} {{ __("microsub.compose.likeOf") }}: <a href="{{ likeOf }}">{{ likeOf }}</a>
+      {{ icon("like") }} {{ __("microsub.compose.likeOf") }}: <a href="{{ likeOf }}">{{ likeOf }}</a>
     </div>
     {% endif %}
 

package/views/feeds.njk

@@ -0,0 +1,58 @@
+{% extends "document.njk" %}
+
+{% block content %}
+  <div class="feeds">
+    <header class="feeds__header">
+      <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="back-link">
+        {{ icon("previous") }} {{ channel.name }}
+      </a>
+    </header>
+
+    <h2>{{ __("microsub.feeds.title") }}</h2>
+
+    {% if feeds.length > 0 %}
+    <ul class="feeds__list">
+      {% for feed in feeds %}
+      <li class="feeds__item">
+        <div class="feeds__info">
+          {% if feed.photo %}
+          <img src="{{ feed.photo }}" alt="" class="feeds__photo" width="32" height="32" loading="lazy">
+          {% endif %}
+          <div class="feeds__details">
+            <span class="feeds__name">{{ feed.title or feed.url }}</span>
+            <a href="{{ feed.url }}" class="feeds__url" target="_blank" rel="noopener">{{ feed.url }}</a>
+          </div>
+        </div>
+        <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/feeds/remove" class="feeds__actions">
+          <input type="hidden" name="url" value="{{ feed.url }}">
+          {{ button({
+            text: __("microsub.feeds.unfollow"),
+            classes: "button--secondary button--small"
+          }) }}
+        </form>
+      </li>
+      {% endfor %}
+    </ul>
+    {% else %}
+    {{ prose({ text: __("microsub.feeds.empty") }) }}
+    {% endif %}
+
+    <div class="feeds__add">
+      <h3>{{ __("microsub.feeds.follow") }}</h3>
+      <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/feeds" class="feeds__form">
+        {{ input({
+          id: "url",
+          name: "url",
+          label: __("microsub.feeds.url"),
+          type: "url",
+          required: true,
+          placeholder: __("microsub.feeds.urlPlaceholder"),
+          autocomplete: "off"
+        }) }}
+        <div class="button-group">
+          {{ button({ text: __("microsub.feeds.follow") }) }}
+        </div>
+      </form>
+    </div>
+  </div>
+{% endblock %}

package/views/item.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <article class="item">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+      {{ icon("previous") }} {{ __("Back") }}
     </a>
 
     {% if item.author %}
@@ -56,7 +56,7 @@
       <p>{{ icon("reply") }} {{ __("Reply to") }}: <a href="{{ item.inReplyTo[0] }}">{{ item.inReplyTo[0] }}</a></p>
       {% endif %}
       {% if item.likeOf %}
-      <p>{{ icon("heart") }} {{ __("Liked") }}: <a href="{{ item.likeOf[0] }}">{{ item.likeOf[0] }}</a></p>
+      <p>{{ icon("like") }} {{ __("Liked") }}: <a href="{{ item.likeOf[0] }}">{{ item.likeOf[0] }}</a></p>
       {% endif %}
       {% if item.repostOf %}
       <p>{{ icon("repost") }} {{ __("Reposted") }}: <a href="{{ item.repostOf[0] }}">{{ item.repostOf[0] }}</a></p>
@@ -72,13 +72,13 @@
         {{ icon("reply") }} {{ __("microsub.item.reply") }}
       </a>
       <a href="{{ baseUrl }}/compose?likeOf={{ item.url | urlencode }}" class="button button--secondary button--small">
-        {{ icon("heart") }} {{ __("microsub.item.like") }}
+        {{ icon("like") }} {{ __("microsub.item.like") }}
       </a>
       <a href="{{ baseUrl }}/compose?repostOf={{ item.url | urlencode }}" class="button button--secondary button--small">
         {{ icon("repost") }} {{ __("microsub.item.repost") }}
       </a>
       <a href="{{ item.url }}" class="button button--secondary button--small" target="_blank" rel="noopener">
-        {{ icon("external") }} {{ __("microsub.item.viewOriginal") }}
+        {{ icon("public") }} {{ __("microsub.item.viewOriginal") }}
       </a>
     </footer>
   </article>

package/views/partials/actions.njk

@@ -4,12 +4,12 @@
     {{ icon("reply") }}
   </a>
   <a href="{{ baseUrl }}/compose?likeOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.like') }}">
-    {{ icon("heart") }}
+    {{ icon("like") }}
   </a>
   <a href="{{ baseUrl }}/compose?repostOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.repost') }}">
     {{ icon("repost") }}
   </a>
   <a href="{{ itemUrl }}" class="item-actions__button" target="_blank" rel="noopener" title="{{ __('microsub.item.viewOriginal') }}">
-    {{ icon("external") }}
+    {{ icon("public") }}
   </a>
 </div>

package/views/partials/item-card.njk

@@ -18,7 +18,7 @@
     {% if item._type and item._type !== "entry" %}
     <div class="item-card__type">
       {% if item._type === "like" %}
-      {{ icon("heart") }} Liked
+      {{ icon("like") }} Liked
       {% elif item._type === "repost" %}
       {{ icon("repost") }} Reposted
       {% elif item._type === "reply" %}
@@ -58,7 +58,7 @@
       </time>
       {% endif %}
       {% if not item._is_read %}
-      <span class="item-card__unread">{{ icon("dot") }}</span>
+      <span class="item-card__unread" aria-label="Unread">●</span>
       {% endif %}
     </footer>
   </a>

package/views/reader.njk

@@ -9,7 +9,7 @@
         <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="reader__channel-link">
           <span class="reader__channel-name">
             {% if channel.uid === "notifications" %}
-            {{ icon("bell") }}
+            {{ icon("mention") }}
             {% endif %}
             {{ channel.name }}
           </span>
@@ -22,7 +22,7 @@
     </ul>
     <p class="reader__actions">
       <a href="{{ baseUrl }}/channels/new" class="button button--secondary">
-        {{ icon("plus") }} {{ __("microsub.channels.new") }}
+        {{ icon("createPost") }} {{ __("microsub.channels.new") }}
       </a>
     </p>
     {% else %}

package/views/settings.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <div class="settings">
     <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="back-link">
-      {{ icon("arrow-left") }} {{ channel.name }}
+      {{ icon("previous") }} {{ channel.name }}
     </a>
 
     <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/settings">