@rmdes/indiekit-endpoint-microsub 1.0.0-beta.1 → 1.0.0-beta.10

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;
@@ -108,6 +117,8 @@ export default class MicrosubEndpoint {
    * @param {object} indiekit - Indiekit instance
    */
   init(indiekit) {
+    console.info("[Microsub] Initializing endpoint-microsub plugin");
+
     // Register MongoDB collections
     indiekit.addCollection("microsub_channels");
     indiekit.addCollection("microsub_feeds");
@@ -116,6 +127,8 @@ export default class MicrosubEndpoint {
     indiekit.addCollection("microsub_muted");
     indiekit.addCollection("microsub_blocked");
 
+    console.info("[Microsub] Registered MongoDB collections");
+
     // Register endpoint
     indiekit.addEndpoint(this);
 
@@ -127,7 +140,12 @@ export default class MicrosubEndpoint {
     // Start feed polling scheduler when server starts
     // This will be called after the server is ready
     if (indiekit.database) {
+      console.info("[Microsub] Database available, starting scheduler");
       startScheduler(indiekit);
+    } else {
+      console.warn(
+        "[Microsub] Database not available at init, scheduler not started",
+      );
     }
   }
 

package/lib/cache/redis.js

@@ -3,22 +3,56 @@
  * @module cache/redis
  */
 
+import Redis from "ioredis";
+
+let redisClient;
+
 /**
  * Get Redis client from application
  * @param {object} application - Indiekit application
  * @returns {object|undefined} Redis client or undefined
  */
 export function getRedisClient(application) {
-  // Check if Redis is configured
+  // Check if Redis is already initialized on the application
   if (application.redis) {
     return application.redis;
   }
 
+  // Check if we already created a client
+  if (redisClient) {
+    return redisClient;
+  }
+
   // Check for Redis URL in config
-  if (application.config?.application?.redisUrl) {
-    // Lazily create Redis connection
-    // This will be implemented when Redis support is added to Indiekit core
-    return;
+  const redisUrl = application.config?.application?.redisUrl;
+  if (redisUrl) {
+    try {
+      redisClient = new Redis(redisUrl, {
+        maxRetriesPerRequest: 3,
+        retryStrategy(times) {
+          const delay = Math.min(times * 50, 2000);
+          return delay;
+        },
+        lazyConnect: true,
+      });
+
+      redisClient.on("error", (error) => {
+        console.error("[Microsub] Redis error:", error.message);
+      });
+
+      redisClient.on("connect", () => {
+        console.info("[Microsub] Redis connected");
+      });
+
+      // Connect asynchronously
+      redisClient.connect().catch((error) => {
+        console.warn("[Microsub] Redis connection failed:", error.message);
+      });
+
+      return redisClient;
+    } catch (error) {
+      console.warn("[Microsub] Failed to initialize Redis:", error.message);
+    }
   }
 }
 
@@ -131,3 +165,17 @@ export async function subscribeToChannel(redis, channel, callback) {
     // Ignore subscription errors
   }
 }
+
+/**
+ * Cleanup Redis connection on shutdown
+ */
+export async function closeRedis() {
+  if (redisClient) {
+    try {
+      await redisClient.quit();
+      redisClient = undefined;
+    } catch {
+      // Ignore cleanup errors
+    }
+  }
+}

package/lib/controllers/microsub.js

@@ -25,6 +25,12 @@ import { get as getTimeline, action as timelineAction } from "./timeline.js";
 export async function get(request, response, next) {
   try {
     const { action } = request.query;
+
+    // If no action provided, redirect to reader UI
+    if (!action) {
+      return response.redirect(request.baseUrl + "/reader");
+    }
+
     validateAction(action);
 
     switch (action) {

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,
@@ -39,6 +46,7 @@ export async function channels(request, response) {
   response.render("reader", {
     title: request.__("microsub.reader.title"),
     channels: channelList,
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -50,6 +58,7 @@ export async function channels(request, response) {
 export async function newChannel(request, response) {
   response.render("channel-new", {
     title: request.__("microsub.channels.new"),
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -74,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;
@@ -97,6 +107,7 @@ export async function channel(request, response) {
     channel: channelDocument,
     items: timeline.items,
     paging: timeline.paging,
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -104,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;
@@ -120,6 +132,7 @@ export async function settings(request, response) {
       channel: channelDocument.name,
     }),
     channel: channelDocument,
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -127,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;
@@ -157,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;
@@ -175,6 +271,7 @@ export async function item(request, response) {
   response.render("item", {
     title: itemDocument.name || "Item",
     item: itemDocument,
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -182,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;
@@ -191,6 +289,7 @@ export async function compose(request, response) {
     replyTo,
     likeOf,
     repostOf,
+    baseUrl: request.baseUrl,
   });
 }
 
@@ -204,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,
@@ -212,7 +394,13 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  feeds,
+  addFeed,
+  removeFeed,
   item,
   compose,
   submitCompose,
+  searchPage,
+  searchFeeds,
+  subscribe,
 };

package/lib/search/query.js

@@ -94,7 +94,8 @@ export async function searchItemsRegex(
         { "author.name": regex },
       ],
     })
-    .toSorted({ published: -1 })
+    // eslint-disable-next-line unicorn/no-array-sort -- MongoDB cursor method, not Array#sort
+    .sort({ published: -1 })
     .limit(limit)
     .toArray();
 

package/lib/storage/channels.js

@@ -55,7 +55,8 @@ export async function createChannel(application, { name, userId }) {
   // Get max order for user
   const maxOrderResult = await collection
     .find({ userId })
-    .toSorted({ order: -1 })
+    // eslint-disable-next-line unicorn/no-array-sort -- MongoDB cursor method, not Array#sort
+    .sort({ order: -1 })
     .limit(1)
     .toArray();
 
@@ -93,7 +94,8 @@ export async function getChannels(application, userId) {
   const channels = await collection
     // eslint-disable-next-line unicorn/no-array-callback-reference -- filter is MongoDB query object
     .find(filter)
-    .toSorted({ order: 1 })
+    // eslint-disable-next-line unicorn/no-array-sort -- MongoDB cursor method, not Array#sort
+    .sort({ order: 1 })
     .toArray();
 
   // Get unread counts for each channel

package/lib/storage/items.js

@@ -99,7 +99,8 @@ export async function getTimelineItems(application, channelId, options = {}) {
   const items = await collection
     // eslint-disable-next-line unicorn/no-array-callback-reference -- query is MongoDB query object
     .find(query)
-    .toSorted(sort)
+    // eslint-disable-next-line unicorn/no-array-sort -- MongoDB cursor method, not Array#sort
+    .sort(sort)
     .limit(limit + 1)
     .toArray();
 
@@ -370,7 +371,8 @@ export async function searchItems(application, channelId, query, limit = 20) {
         { summary: regex },
       ],
     })
-    .toSorted({ published: -1 })
+    // eslint-disable-next-line unicorn/no-array-sort -- MongoDB cursor method, not Array#sort
+    .sort({ published: -1 })
     .limit(limit)
     .toArray();
 

package/lib/webmention/processor.js

@@ -127,13 +127,13 @@ export async function getNotifications(application, userId, options = {}) {
     query.readBy = { $ne: userId };
   }
 
-  /* eslint-disable unicorn/no-array-callback-reference -- query is MongoDB query object */
+  /* eslint-disable unicorn/no-array-callback-reference, unicorn/no-array-sort -- MongoDB cursor methods */
   const notifications = await collection
     .find(query)
-    .toSorted({ published: -1 })
+    .sort({ published: -1 })
     .limit(limit)
     .toArray();
-  /* eslint-enable unicorn/no-array-callback-reference */
+  /* eslint-enable unicorn/no-array-callback-reference, unicorn/no-array-sort */
 
   return notifications.map((n) => transformNotification(n, userId));
 }

package/locales/en.json

@@ -9,6 +9,7 @@
     },
     "channels": {
       "title": "Channels",
+      "name": "Channel name",
       "new": "New channel",
       "create": "Create channel",
       "delete": "Delete channel",
@@ -27,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",
@@ -46,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.1",
+  "version": "1.0.0-beta.10",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/channel-new.njk

@@ -2,29 +2,25 @@
 
 {% block content %}
   <div class="channel-new">
-    <a href="{{ request.baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+    <a href="{{ baseUrl }}/channels" class="back-link">
+      {{ icon("previous") }} {{ __("microsub.channels.title") }}
     </a>
 
-    <form method="post" action="{{ request.baseUrl }}/channels/new">
-      {{ field({
-        label: {
-          text: __("microsub.channels.new")
-        },
-        input: {
-          id: "name",
-          name: "name",
-          required: true,
-          autocomplete: "off",
-          autofocus: true
-        }
+    <form method="post" action="{{ baseUrl }}/channels/new">
+      {{ input({
+        id: "name",
+        name: "name",
+        label: __("microsub.channels.name"),
+        required: true,
+        autocomplete: "off",
+        attributes: { autofocus: true }
       }) }}
 
       <div class="button-group">
         {{ button({
           text: __("microsub.channels.create")
         }) }}
-        <a href="{{ request.baseUrl }}/channels" class="button button--secondary">
+        <a href="{{ baseUrl }}/channels" class="button button--secondary">
           {{ __("Cancel") }}
         </a>
       </div>

package/views/channel.njk

@@ -3,12 +3,15 @@
 {% block content %}
   <div class="channel">
     <header class="channel__header">
-      <a href="{{ request.baseUrl }}/channels" class="back-link">
-        {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+      <a href="{{ baseUrl }}/channels" class="back-link">
+        {{ icon("previous") }} {{ __("microsub.channels.title") }}
       </a>
       <div class="channel__actions">
-        <a href="{{ request.baseUrl }}/channels/{{ channel.uid }}/settings" class="button button--secondary button--small">
-          {{ icon("settings") }} {{ __("microsub.channels.settings") }}
+        <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>
       </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

@@ -2,8 +2,8 @@
 
 {% block content %}
   <div class="compose">
-    <a href="{{ request.headers.referer or request.baseUrl + '/channels' }}" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+    <a href="{{ baseUrl }}/channels" class="back-link">
+      {{ 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 %}
 
@@ -24,7 +24,7 @@
     </div>
     {% endif %}
 
-    <form method="post" action="{{ request.baseUrl }}/compose">
+    <form method="post" action="{{ baseUrl }}/compose">
       {% if replyTo %}
       <input type="hidden" name="in-reply-to" value="{{ replyTo }}">
       {% endif %}
@@ -37,14 +37,11 @@
 
       {% if not likeOf and not repostOf %}
       {{ textarea({
-        label: {
-          text: __("microsub.compose.content"),
-          classes: "label--visuallyhidden"
-        },
+        label: __("microsub.compose.content"),
         id: "content",
         name: "content",
         rows: 5,
-        autofocus: true
+        attributes: { autofocus: true }
       }) }}
       {% endif %}
 
@@ -52,7 +49,7 @@
         {{ button({
           text: __("microsub.compose.submit")
         }) }}
-        <a href="{{ request.headers.referer or request.baseUrl + '/channels' }}" class="button button--secondary">
+        <a href="{{ baseUrl }}/channels" class="button button--secondary">
           {{ __("microsub.compose.cancel") }}
         </a>
       </div>

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

@@ -2,8 +2,8 @@
 
 {% block content %}
   <article class="item">
-    <a href="{{ request.headers.referer or request.baseUrl + '/channels' }}" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+    <a href="{{ baseUrl }}/channels" class="back-link">
+      {{ 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>
@@ -68,17 +68,17 @@
     {% endif %}
 
     <footer class="item__actions">
-      <a href="{{ request.baseUrl }}/compose?replyTo={{ item.url | urlencode }}" class="button button--secondary button--small">
+      <a href="{{ baseUrl }}/compose?replyTo={{ item.url | urlencode }}" class="button button--secondary button--small">
         {{ icon("reply") }} {{ __("microsub.item.reply") }}
       </a>
-      <a href="{{ request.baseUrl }}/compose?likeOf={{ item.url | urlencode }}" class="button button--secondary button--small">
-        {{ icon("heart") }} {{ __("microsub.item.like") }}
+      <a href="{{ baseUrl }}/compose?likeOf={{ item.url | urlencode }}" class="button button--secondary button--small">
+        {{ icon("like") }} {{ __("microsub.item.like") }}
       </a>
-      <a href="{{ request.baseUrl }}/compose?repostOf={{ item.url | urlencode }}" class="button button--secondary button--small">
+      <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

@@ -1,15 +1,15 @@
 {# Item action buttons #}
 <div class="item-actions">
-  <a href="{{ request.baseUrl }}/compose?replyTo={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.reply') }}">
+  <a href="{{ baseUrl }}/compose?replyTo={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.reply') }}">
     {{ icon("reply") }}
   </a>
-  <a href="{{ request.baseUrl }}/compose?likeOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.like') }}">
-    {{ icon("heart") }}
+  <a href="{{ baseUrl }}/compose?likeOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.like') }}">
+    {{ icon("like") }}
   </a>
-  <a href="{{ request.baseUrl }}/compose?repostOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.repost') }}">
+  <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

@@ -1,6 +1,6 @@
 {# Item card for timeline display #}
 <article class="item-card{% if item._is_read %} item-card--read{% endif %}">
-  <a href="{{ request.baseUrl }}/item/{{ item.uid }}" class="item-card__link">
+  <a href="{{ baseUrl }}/item/{{ item.uid }}" class="item-card__link">
     {% if item.author %}
     <div class="item-card__author">
       {% if item.author.photo %}
@@ -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

@@ -6,10 +6,10 @@
     <ul class="reader__channels">
       {% for channel in channels %}
       <li class="reader__channel">
-        <a href="{{ request.baseUrl }}/channels/{{ channel.uid }}" class="reader__channel-link">
+        <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>
@@ -21,14 +21,17 @@
       {% endfor %}
     </ul>
     <p class="reader__actions">
-      <a href="{{ request.baseUrl }}/channels/new" class="button button--secondary">
-        {{ icon("plus") }} {{ __("microsub.channels.new") }}
+      <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>
     </p>
     {% else %}
     {{ prose({ text: __("microsub.channels.empty") }) }}
     <p>
-      <a href="{{ request.baseUrl }}/channels/new" class="button button--primary">
+      <a href="{{ baseUrl }}/channels/new" class="button button--primary">
         {{ __("microsub.channels.new") }}
       </a>
     </p>

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 %}

package/views/settings.njk

@@ -2,77 +2,55 @@
 
 {% block content %}
   <div class="settings">
-    <a href="{{ request.baseUrl }}/channels/{{ channel.uid }}" class="back-link">
-      {{ icon("arrow-left") }} {{ channel.name }}
+    <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="back-link">
+      {{ icon("previous") }} {{ channel.name }}
     </a>
 
-    <form method="post" action="{{ request.baseUrl }}/channels/{{ channel.uid }}/settings">
-      {{ fieldset({
-        legend: {
-          text: __("microsub.settings.excludeTypes"),
-          classes: "fieldset__legend--medium"
-        },
-        hint: {
-          text: __("microsub.settings.excludeTypesHelp")
+    <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/settings">
+      {{ checkboxes({
+        name: "excludeTypes",
+        values: channel.settings.excludeTypes,
+        fieldset: {
+          legend: __("microsub.settings.excludeTypes")
         },
+        hint: __("microsub.settings.excludeTypesHelp"),
         items: [
           {
-            id: "excludeTypes-like",
-            name: "excludeTypes",
-            value: "like",
-            text: __("microsub.settings.types.like"),
-            checked: channel.settings.excludeTypes | includes("like")
+            label: __("microsub.settings.types.like"),
+            value: "like"
           },
           {
-            id: "excludeTypes-repost",
-            name: "excludeTypes",
-            value: "repost",
-            text: __("microsub.settings.types.repost"),
-            checked: channel.settings.excludeTypes | includes("repost")
+            label: __("microsub.settings.types.repost"),
+            value: "repost"
           },
           {
-            id: "excludeTypes-bookmark",
-            name: "excludeTypes",
-            value: "bookmark",
-            text: __("microsub.settings.types.bookmark"),
-            checked: channel.settings.excludeTypes | includes("bookmark")
+            label: __("microsub.settings.types.bookmark"),
+            value: "bookmark"
           },
           {
-            id: "excludeTypes-reply",
-            name: "excludeTypes",
-            value: "reply",
-            text: __("microsub.settings.types.reply"),
-            checked: channel.settings.excludeTypes | includes("reply")
+            label: __("microsub.settings.types.reply"),
+            value: "reply"
           },
           {
-            id: "excludeTypes-checkin",
-            name: "excludeTypes",
-            value: "checkin",
-            text: __("microsub.settings.types.checkin"),
-            checked: channel.settings.excludeTypes | includes("checkin")
+            label: __("microsub.settings.types.checkin"),
+            value: "checkin"
           }
         ]
-      }) | checkboxes }}
+      }) }}
 
-      {{ field({
-        label: {
-          text: __("microsub.settings.excludeRegex")
-        },
-        hint: {
-          text: __("microsub.settings.excludeRegexHelp")
-        },
-        input: {
-          id: "excludeRegex",
-          name: "excludeRegex",
-          value: channel.settings.excludeRegex
-        }
+      {{ input({
+        id: "excludeRegex",
+        name: "excludeRegex",
+        label: __("microsub.settings.excludeRegex"),
+        hint: __("microsub.settings.excludeRegexHelp"),
+        value: channel.settings.excludeRegex
       }) }}
 
       <div class="button-group">
         {{ button({
           text: __("microsub.settings.save")
         }) }}
-        <a href="{{ request.baseUrl }}/channels/{{ channel.uid }}" class="button button--secondary">
+        <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="button button--secondary">
           {{ __("Cancel") }}
         </a>
       </div>