@rmdes/indiekit-endpoint-microsub 1.0.65 → 1.0.67

package/assets/styles.css

@@ -1379,6 +1379,14 @@
   white-space: nowrap;
 }
 
+.ms-item-card-compact__favicon {
+  border-radius: 3px;
+  height: 16px;
+  object-fit: cover;
+  vertical-align: -3px;
+  width: 16px;
+}
+
 .ms-item-card-compact__date {
   flex-shrink: 0;
   white-space: nowrap;

package/lib/feeds/normalizer-rss.js

@@ -62,6 +62,19 @@ export function normalizeItem(item, feedUrl, feedType) {
     };
   }
 
+  // Item-level <source> (RSS 2.0) — per-item origin in aggregator feeds
+  // (e.g. a community feed where every item comes from a different user's
+  // feed). Feedparser exposes it as { url, title }.
+  if (item.source && (item.source.url || item.source.title)) {
+    normalized._source.itemSource = {
+      url: item.source.url,
+      title: item.source.title,
+    };
+    if (!normalized.author && item.source.title) {
+      normalized.author = { type: "card", name: item.source.title };
+    }
+  }
+
   // Categories/tags
   if (item.categories && item.categories.length > 0) {
     normalized.category = item.categories;

package/lib/feeds/source-meta.js

@@ -0,0 +1,46 @@
+/**
+ * Resolve metadata (name, photo, site url) of an item-level <source> feed.
+ * Aggregator feeds attribute each item to its originating feed via the
+ * RSS 2.0 <source url="..."> element; fetching that feed's channel image
+ * gives us the author's avatar. Results are cached in memory so each
+ * distinct source feed is fetched at most once per TTL.
+ * @module feeds/source-meta
+ */
+
+import { fetchAndParseFeed } from "./fetcher.js";
+
+const TTL = 24 * 60 * 60 * 1000; // 24h — feed titles/avatars change rarely
+const MAX_CACHE_ENTRIES = 500;
+
+/** @type {Map<string, { promise: Promise<object|undefined>, fetchedAt: number }>} */
+const cache = new Map();
+
+/**
+ * Resolve a source feed's metadata, cached
+ * @param {string} url - Source feed URL
+ * @returns {Promise<object|undefined>} { name, photo, url } or undefined on failure
+ */
+export async function resolveSourceFeedMeta(url) {
+  const now = Date.now();
+  const hit = cache.get(url);
+  if (hit && now - hit.fetchedAt < TTL) {
+    return hit.promise;
+  }
+
+  // ponytail: crude full-clear eviction; LRU if churn ever matters
+  if (cache.size >= MAX_CACHE_ENTRIES) {
+    cache.clear();
+  }
+
+  const promise = fetchAndParseFeed(url, { timeout: 10_000 })
+    .then((parsed) => ({
+      name: parsed.name,
+      photo: parsed.photo,
+      url: parsed.url,
+    }))
+    // Failures are cached too (negative cache) — avoids hammering dead feeds
+    .catch(() => {});
+
+  cache.set(url, { promise, fetchedAt: now });
+  return promise;
+}

package/lib/polling/processor.js

@@ -9,6 +9,7 @@ const MAX_ITEMS_PER_CYCLE = 100; // Max items to process per feed per cycle
 import { getRedisClient, publishEvent } from "../cache/redis.js";
 import { detectCapabilities } from "../feeds/capabilities.js";
 import { fetchAndParseFeed } from "../feeds/fetcher.js";
+import { resolveSourceFeedMeta } from "../feeds/source-meta.js";
 import { getChannelById } from "../storage/channels.js";
 import {
   updateFeed,
@@ -100,6 +101,22 @@ export async function processFeed(application, feed) {
         item._source.source_type = classifyUrl(feed.url).type;
       }
 
+      // Aggregator feeds: item-level <source> names the originating feed.
+      // Resolve its channel image/homepage (cached, one fetch per source
+      // feed per day) so the card shows the actual author's avatar.
+      const itemSource = item._source.itemSource;
+      if (itemSource?.url && !item.author?.photo) {
+        const meta = await resolveSourceFeedMeta(itemSource.url);
+        if (meta) {
+          item.author = {
+            type: "card",
+            name: item.author?.name || itemSource.title || meta.name,
+            url: item.author?.url || meta.url,
+            photo: meta.photo,
+          };
+        }
+      }
+
       // Store the item
       const stored = await addItem(application, {
         channelId: feed.channelId,
@@ -149,6 +166,11 @@ export async function processFeed(application, feed) {
     if (parsed.feedType && !feed.feedType) {
       updateData.feedType = parsed.feedType;
     }
+    // Site homepage URL (parsers set parsed.url from channel <link>,
+    // home_page_url, etc.) — used for source attribution and favicon fallback
+    if (parsed.url && parsed.url !== feed.url && !feed.siteUrl) {
+      updateData.siteUrl = parsed.url;
+    }
 
     await updateFeedAfterFetch(
       application,

package/lib/storage/items.js

@@ -121,6 +121,73 @@ export function transformToJf2(item, userId) {
   return jf2;
 }
 
+/**
+ * Derive a favicon URL from a site or feed URL
+ * @param {string} url - Site or feed URL
+ * @returns {string|undefined} Favicon URL at the site origin
+ */
+function faviconUrl(url) {
+  try {
+    return new URL(url).origin + "/favicon.ico";
+  } catch {
+    return;
+  }
+}
+
+/**
+ * Enrich jf2 items with source identity (name, photo, url) from their feeds.
+ * Read-time join against microsub_feeds so existing items pick up feed
+ * metadata (title, channel image, site URL) without a migration, and stay
+ * fresh when a feed's metadata improves. Falls back to the site favicon
+ * when the feed has no image.
+ * @param {object} application - Indiekit application
+ * @param {Array<object>} items - jf2 items (mutated in place)
+ * @returns {Promise<Array<object>>} The same items, enriched
+ */
+export async function enrichItemsWithFeedSource(application, items) {
+  const feedIds = [
+    ...new Set(items.map((item) => item._feedId).filter(Boolean)),
+  ];
+  if (feedIds.length === 0) {
+    return items;
+  }
+
+  const feeds = await application.collections
+    .get("microsub_feeds")
+    .find({ _id: { $in: feedIds.map((id) => new ObjectId(id)) } })
+    .project({ title: 1, photo: 1, url: 1, siteUrl: 1 })
+    .toArray();
+  const feedsById = new Map(feeds.map((feed) => [feed._id.toString(), feed]));
+
+  for (const item of items) {
+    const feed = feedsById.get(item._feedId);
+    if (!feed) continue;
+
+    const siteUrl = feed.siteUrl || feed.url;
+    item._source = {
+      ...item._source,
+      name: feed.title || item._source?.name || safeHostname(siteUrl),
+      photo: feed.photo || faviconUrl(siteUrl),
+      url: siteUrl,
+    };
+  }
+
+  return items;
+}
+
+/**
+ * Extract hostname from a URL, or return the input on parse failure
+ * @param {string} url - URL string
+ * @returns {string} Hostname
+ */
+function safeHostname(url) {
+  try {
+    return new URL(url).hostname;
+  } catch {
+    return url;
+  }
+}
+
 /**
  * Add an item to a channel
  * @param {object} application - Indiekit application
@@ -218,6 +285,7 @@ export async function getTimelineItems(application, channelId, options = {}) {
 
   // Transform to jf2 format
   const jf2Items = items.map((item) => transformToJf2(item, options.userId));
+  await enrichItemsWithFeedSource(application, jf2Items);
 
   // Generate paging cursors
   const paging = generatePagingCursors(items, limit, hasMore, options.before);
@@ -282,6 +350,7 @@ export async function getAllTimelineItems(application, options = {}) {
   }
 
   const jf2Items = items.map((item) => transformToJf2(item, options.userId));
+  await enrichItemsWithFeedSource(application, jf2Items);
 
   const paging = generatePagingCursors(items, limit, hasMore, options.before);
 
@@ -320,7 +389,9 @@ export async function getItemById(application, id, userId) {
     return;
   }
 
-  return transformToJf2(item, userId);
+  const jf2 = transformToJf2(item, userId);
+  await enrichItemsWithFeedSource(application, [jf2]);
+  return jf2;
 }
 
 /**

package/package.json

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

package/views/partials/item-card-compact.njk

@@ -18,7 +18,10 @@
       {% endif %}
       <div class="ms-item-card-compact__meta">
         {% if item._source %}
-        <span class="ms-item-card-compact__source">{{ item._source.name or item._source.url }}</span>
+        <span class="ms-item-card-compact__source">
+          {%- if item._source.photo %}<img src="{{ item._source.photo }}" alt="" class="ms-item-card-compact__favicon" width="16" height="16" loading="lazy"> {% endif -%}
+          {{- item._source.name or item._source.url -}}
+        </span>
         {% elif item.author %}
         <span class="ms-item-card-compact__source">{{ item.author.name }}</span>
         {% endif %}

package/views/partials/item-card.njk

@@ -50,25 +50,27 @@
   {% endif %}
 
   <a href="{{ baseUrl }}/item/{{ item._id }}" class="ms-item-card__link">
-    {# Author #}
-    {% if item.author %}
+    {# Author / source identity — prefer item author, fall back to feed source #}
+    {% set identityPhoto = item.author.photo or item._source.photo %}
+    {% set identityName = item.author.name or item._source.name %}
+    {% if identityName or identityPhoto %}
     <div class="ms-item-card__author">
       <div class="ms-item-card__avatar-wrap" data-avatar-fallback>
-        {% if item.author.photo %}
-        <img src="{{ item.author.photo }}"
+        {% if identityPhoto %}
+        <img src="{{ identityPhoto }}"
              alt=""
              class="ms-item-card__author-photo"
              width="40"
              height="40"
              loading="lazy">
         {% endif %}
-        <span class="ms-item-card__author-photo ms-item-card__author-photo--default" aria-hidden="true">{{ item.author.name[0] | upper if item.author.name else "?" }}</span>
+        <span class="ms-item-card__author-photo ms-item-card__author-photo--default" aria-hidden="true">{{ identityName[0] | upper if identityName else "?" }}</span>
       </div>
       <div class="ms-item-card__author-info">
-        <span class="ms-item-card__author-name">{{ item.author.name or "Unknown" }}</span>
-        {% if item._source %}
+        <span class="ms-item-card__author-name">{{ identityName or "Unknown" }}</span>
+        {% if item._source and (item._source.name or item._source.url) and item._source.name != identityName %}
         <span class="ms-item-card__source">{{ item._source.name or item._source.url }}</span>
-        {% elif item.author.url %}
+        {% elif item.author.url and item.author.name %}
         <span class="ms-item-card__source">{{ item.author.url | replace("https://", "") | replace("http://", "") }}</span>
         {% endif %}
       </div>