@rmdes/indiekit-endpoint-microsub 1.0.0-beta.6 → 1.0.0-beta.8

package/index.js

@@ -78,9 +78,18 @@ 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);
+    readerRouter.get("/search", readerController.searchPage);
+    readerRouter.post("/search", readerController.searchFeeds);
+    readerRouter.post("/subscribe", readerController.subscribe);
     router.use("/reader", readerRouter);
 
     return router;

package/lib/controllers/reader.js

@@ -3,12 +3,19 @@
  * @module controllers/reader
  */
 
+import { discoverFeedsFromUrl } from "../feeds/fetcher.js";
+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 +83,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 +115,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 +140,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 +171,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 +279,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;
@@ -210,6 +303,89 @@ export async function submitCompose(request, response) {
   response.redirect(`${request.baseUrl}/channels`);
 }
 
+/**
+ * Search/discover feeds page
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function searchPage(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+
+  const channelList = await getChannels(application, userId);
+
+  response.render("search", {
+    title: request.__("microsub.search.title"),
+    channels: channelList,
+    baseUrl: request.baseUrl,
+  });
+}
+
+/**
+ * Search for feeds from URL
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function searchFeeds(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { query } = request.body;
+
+  const channelList = await getChannels(application, userId);
+
+  let results = [];
+  if (query) {
+    try {
+      results = await discoverFeedsFromUrl(query);
+    } catch {
+      // Ignore discovery errors
+    }
+  }
+
+  response.render("search", {
+    title: request.__("microsub.search.title"),
+    channels: channelList,
+    query,
+    results,
+    searched: true,
+    baseUrl: request.baseUrl,
+  });
+}
+
+/**
+ * Subscribe to a feed from search results
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function subscribe(request, response) {
+  const { application } = request.app.locals;
+  const userId = request.session?.userId;
+  const { url, channel: channelUid } = request.body;
+
+  const channelDocument = await getChannel(application, channelUid, 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/${channelUid}/feeds`);
+}
+
 export const readerController = {
   index,
   channels,
@@ -218,7 +394,13 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  feeds,
+  addFeed,
+  removeFeed,
   item,
   compose,
   submitCompose,
+  searchPage,
+  searchFeeds,
+  subscribe,
 };

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.6",
+  "version": "1.0.0-beta.8",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/channel.njk

@@ -7,6 +7,9 @@
         {{ 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("updatePost") }} {{ __("microsub.channels.settings") }}
         </a>

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/reader.njk

@@ -21,6 +21,9 @@
       {% endfor %}
     </ul>
     <p class="reader__actions">
+      <a href="{{ baseUrl }}/search" class="button button--primary">
+        {{ icon("syndicate") }} {{ __("microsub.feeds.follow") }}
+      </a>
       <a href="{{ baseUrl }}/channels/new" class="button button--secondary">
         {{ icon("createPost") }} {{ __("microsub.channels.new") }}
       </a>

package/views/search.njk

@@ -0,0 +1,58 @@
+{% extends "document.njk" %}
+
+{% block content %}
+  <div class="search">
+    <a href="{{ baseUrl }}/channels" class="back-link">
+      {{ icon("previous") }} {{ __("microsub.channels.title") }}
+    </a>
+
+    <h2>{{ __("microsub.search.title") }}</h2>
+
+    <form method="post" action="{{ baseUrl }}/search" class="search__form">
+      {{ input({
+        id: "query",
+        name: "query",
+        label: __("microsub.search.placeholder"),
+        type: "url",
+        required: true,
+        placeholder: "https://example.com",
+        autocomplete: "off",
+        value: query,
+        attributes: { autofocus: true }
+      }) }}
+      <div class="button-group">
+        {{ button({ text: __("microsub.search.submit") }) }}
+      </div>
+    </form>
+
+    {% if results and results.length > 0 %}
+    <div class="search__results">
+      <h3>{{ __("microsub.search.title") }}</h3>
+      <ul class="search__list">
+        {% for result in results %}
+        <li class="search__item">
+          <div class="search__feed">
+            <span class="search__url">{{ result.url }}</span>
+          </div>
+          <form method="post" action="{{ baseUrl }}/subscribe" class="search__subscribe">
+            <input type="hidden" name="url" value="{{ result.url }}">
+            <label for="channel-{{ loop.index }}" class="visually-hidden">{{ __("microsub.channels.title") }}</label>
+            <select name="channel" id="channel-{{ loop.index }}" class="select select--small">
+              {% for channel in channels %}
+              <option value="{{ channel.uid }}">{{ channel.name }}</option>
+              {% endfor %}
+            </select>
+            {{ button({
+              text: __("microsub.feeds.follow"),
+              classes: "button--small"
+            }) }}
+          </form>
+        </li>
+        {% endfor %}
+      </ul>
+    </div>
+    {% elif searched %}
+    {{ prose({ text: __("microsub.search.noResults") }) }}
+    {% endif %}
+  </div>
+{% endblock %}