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

package/index.js

@@ -87,6 +87,9 @@ export default class MicrosubEndpoint {
     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;
@@ -114,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");
@@ -122,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);
 
@@ -133,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/controllers/reader.js

@@ -3,6 +3,7 @@
  * @module controllers/reader
  */
 
+import { discoverFeedsFromUrl } from "../feeds/fetcher.js";
 import { refreshFeedNow } from "../polling/scheduler.js";
 import {
   getChannels,
@@ -302,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,
@@ -316,4 +400,7 @@ export const readerController = {
   item,
   compose,
   submitCompose,
+  searchPage,
+  searchFeeds,
+  subscribe,
 };

package/package.json

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

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