@rmdes/indiekit-endpoint-rss 1.1.0 → 1.1.2

package/assets/styles.css

@@ -83,13 +83,30 @@
 }
 
 .rss-feed-item {
-  align-items: center;
+  align-items: flex-start;
   border-block-end: 1px solid var(--color-border);
   display: flex;
   gap: var(--space-s);
   padding: var(--space-s) 0;
 }
 
+/* The publish disclosure lives inside the feed's own column. As a full-width
+   flex row it turned every feed into three rows and put a bar wider than the
+   feed between each entry, which made the list unscannable. Its summary stays
+   quiet so the feed title remains what the eye lands on. */
+.rss-publish {
+  margin-block-start: var(--space-2xs);
+}
+
+.rss-publish .details__summary {
+  color: var(--color-text-secondary);
+  font-size: var(--step--1);
+}
+
+.rss-publish .details__main {
+  padding-block-start: var(--space-2xs);
+}
+
 .rss-feed-item:last-child {
   border-block-end: none;
 }

package/lib/controllers/feeds.js

@@ -156,13 +156,13 @@ export const feedsController = {
   async toggle(request, response) {
     try {
       const { id } = request.params;
-      const { enabled, publish } = request.body;
+      const { enabled, publish, url } = request.body;
 
       if (!ObjectId.isValid(id)) {
         return response.status(400).json({ error: "Invalid feed ID" });
       }
 
-      if (enabled === undefined && publish === undefined) {
+      if (enabled === undefined && publish === undefined && url === undefined) {
         return response.status(400).json({ error: "Nothing to update" });
       }
 
@@ -191,6 +191,31 @@ export const feedsController = {
         update.enabled = enabled;
       }
 
+      if (url !== undefined) {
+        if (!isValidUrl(url)) {
+          return response.status(400).json({
+            error: response.locals.__("rss.error.invalidUrl"),
+          });
+        }
+
+        const normalizedUrl = normalizeUrl(url);
+        const clash = await feedsCollection.findOne({
+          url: normalizedUrl,
+          _id: { $ne: feedId },
+        });
+
+        if (clash) {
+          return response.status(409).json({
+            error: response.locals.__("rss.error.feedExists"),
+          });
+        }
+
+        update.url = normalizedUrl;
+        // Items key on feedId, so they survive the change. Any error from the
+        // old URL is stale the moment it is corrected.
+        update.lastError = null;
+      }
+
       if (publish !== undefined) {
         const { postTypes } = request.app.locals.publication || {};
 

package/lib/sync.js

@@ -173,7 +173,7 @@ export async function runSync(dbOrIndiekit, options, publishContext) {
       itemsCollection,
       feedsCollection,
       retentionDays,
-      options.minItemsPerFeed ?? 10,
+      retentionFloor(options),
     );
 
     syncState.lastSync = new Date().toISOString();
@@ -310,6 +310,21 @@ async function createIndexes(feedsCollection, itemsCollection) {
   await itemsCollection.createIndex({ fetchedAt: -1 });
 }
 
+/**
+ * Number of newest items per feed that pruning must never touch.
+ *
+ * Pruning an item the feed still serves is a no-op by construction — the next
+ * sync re-inserts it. A sync stores at most `maxItemsPerFeed` items per feed,
+ * so age-based retention below that threshold can only churn: insert, delete,
+ * refetch, forever. The floor is therefore derived from what a sync can store,
+ * not set as an independent constant.
+ * @param {object} options - Plugin options
+ * @returns {number} Items to keep per feed regardless of age
+ */
+export function retentionFloor(options = {}) {
+  return Math.max(options.minItemsPerFeed ?? 10, options.maxItemsPerFeed ?? 50);
+}
+
 /**
  * Rewrite legacy BSON Date values of `addedAt` as ISO 8601 strings.
  *

package/locales/en.json

@@ -40,7 +40,7 @@
       "feedAdded": "Feed added successfully",
       "feedRemoved": "Feed removed",
       "feedUpdated": "Feed updated",
-    "feedEnabled": "Feed enabled",
+      "feedEnabled": "Feed enabled",
       "feedDisabled": "Feed disabled",
       "backfillQueued": "Backfill queued; items will be published as drafts over the next sync cycles",
       "syncComplete": "Sync complete",
@@ -56,9 +56,18 @@
       "enabled": "Create posts from this feed",
       "postType": "Post type",
       "content": "Content template",
+      "contentHint": "Available: title, link, description, content, author, sourceTitle. Write each one in double braces, as shown below.",
       "linkProperty": "Link property",
+      "linkPropertyHint": "Discovery property carrying the item URL, e.g. bookmark-of. Leave empty for a plain note or article.",
       "status": "Post status",
-      "save": "Save publish settings"
+      "draft": "Draft",
+      "published": "Published",
+      "save": "Save settings"
+    },
+    "settings": {
+      "title": "Feed settings",
+      "url": "Feed URL",
+      "urlHint": "Correcting this keeps the cached items; removing and re-adding the feed would lose them."
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-rss",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "RSS feed reader endpoint for Indiekit. Aggregates multiple feeds, caches in MongoDB, displays on frontend.",
   "keywords": [
     "indiekit",

package/views/rss.njk

@@ -100,40 +100,88 @@
             {% if feed.lastError %}
             <div class="rss-feed-error">{{ feed.lastError }}</div>
             {% endif %}
+            {% set typeItems = [] %}
+            {% for type in postTypes %}
+            {% set typeItems = (typeItems.push({
+              text: type,
+              value: type,
+              selected: feed.publish.postType == type
+            }), typeItems) %}
+            {% endfor %}
+            {% set publishSummary %}{{ __("rss.settings.title") }}{% if feed.publish.enabled %} &bull; {{ feed.publish.postType }}{% endif %}{% endset %}
+            {% call details({
+              classes: "rss-publish",
+              summary: publishSummary
+            }) %}
+              <form data-publish-feed="{{ feed.id }}">
+                {{ input({
+                  id: "feed-url-" + feed.id,
+                  name: "url",
+                  type: "url",
+                  label: __("rss.settings.url"),
+                  hint: __("rss.settings.urlHint"),
+                  value: feed.url
+                }) }}
+
+                {{ checkboxes({
+                  idPrefix: "publish-enabled-" + feed.id,
+                  name: "enabled",
+                  items: [{
+                    value: "true",
+                    label: __("rss.publish.enabled"),
+                    checked: feed.publish.enabled
+                  }]
+                }) }}
+
+                {{ select({
+                  id: "publish-post-type-" + feed.id,
+                  name: "postType",
+                  label: __("rss.publish.postType"),
+                  items: typeItems
+                }) }}
+
+                {{ input({
+                  id: "publish-content-" + feed.id,
+                  name: "content",
+                  label: __("rss.publish.content"),
+                  hint: __("rss.publish.contentHint"),
+                  value: feed.publish.content or "{{description}}"
+                }) }}
+
+                {{ input({
+                  id: "publish-link-property-" + feed.id,
+                  name: "linkProperty",
+                  label: __("rss.publish.linkProperty"),
+                  hint: __("rss.publish.linkPropertyHint"),
+                  optional: true,
+                  value: feed.publish.linkProperty
+                }) }}
+
+                {{ select({
+                  id: "publish-status-" + feed.id,
+                  name: "status",
+                  label: __("rss.publish.status"),
+                  items: [
+                    {
+                      text: __("rss.publish.draft"),
+                      value: "draft",
+                      selected: feed.publish.status != "published"
+                    },
+                    {
+                      text: __("rss.publish.published"),
+                      value: "published",
+                      selected: feed.publish.status == "published"
+                    }
+                  ]
+                }) }}
+
+                {{ button({
+                  type: "submit",
+                  text: __("rss.publish.save")
+                }) }}
+              </form>
+            {% endcall %}
           </div>
-          <details class="rss-publish">
-            <summary>{{ __("rss.publish.title") }}{% if feed.publish.enabled %} &bull; {{ feed.publish.postType }}{% endif %}</summary>
-            <form data-publish-feed="{{ feed.id }}">
-              <label>
-                <input type="checkbox" name="enabled" {{ "checked" if feed.publish.enabled }}>
-                {{ __("rss.publish.enabled") }}
-              </label>
-              <label>
-                {{ __("rss.publish.postType") }}
-                <select name="postType">
-                  {% for type in postTypes %}
-                  <option value="{{ type }}" {{ "selected" if feed.publish.postType == type }}>{{ type }}</option>
-                  {% endfor %}
-                </select>
-              </label>
-              <label>
-                {{ __("rss.publish.content") }}
-                <input class="input" type="text" name="content" value="{{ feed.publish.content or '{{description}}' }}">
-              </label>
-              <label>
-                {{ __("rss.publish.linkProperty") }}
-                <input class="input" type="text" name="linkProperty" value="{{ feed.publish.linkProperty or '' }}">
-              </label>
-              <label>
-                {{ __("rss.publish.status") }}
-                <select name="status">
-                  <option value="draft" {{ "selected" if feed.publish.status != "published" }}>draft</option>
-                  <option value="published" {{ "selected" if feed.publish.status == "published" }}>published</option>
-                </select>
-              </label>
-              {{ button({ type: "submit", text: __("rss.publish.save") }) }}
-            </form>
-          </details>
           <div class="rss-feed-actions">
             <label class="rss-toggle">
               <input
@@ -322,7 +370,9 @@
       const data = new FormData(e.target);
 
       const publish = {
-        enabled: data.get('enabled') === 'on',
+        // The checkboxes component sets value="true"; an unchecked box is
+        // omitted from FormData entirely, so presence is the signal.
+        enabled: data.get('enabled') !== null,
         postType: data.get('postType'),
         content: data.get('content'),
         linkProperty: data.get('linkProperty') || null,
@@ -333,7 +383,7 @@
         const response = await fetch(`{{ mountPath }}/api/feeds/${feedId}`, {
           method: 'PATCH',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ publish })
+          body: JSON.stringify({ url: data.get('url'), publish })
         });
 
         if (response.ok) {