@rmdes/indiekit-endpoint-microsub 1.0.1 → 1.0.2

package/lib/feeds/normalizer.js

@@ -154,6 +154,7 @@ export function normalizeItem(item, feedUrl, feedType) {
     published: toISOStringSafe(item.pubdate),
     updated: toISOStringSafe(item.date),
     _source: {
+      url: feedUrl,
       feedUrl,
       feedType,
       originalId: item.guid,
@@ -310,6 +311,7 @@ export function normalizeJsonFeedItem(item, feedUrl) {
       ? new Date(item.date_modified).toISOString()
       : undefined,
     _source: {
+      url: feedUrl,
       feedUrl,
       feedType: "jsonfeed",
       originalId: item.id,
@@ -451,6 +453,7 @@ export function normalizeHfeedItem(entry, feedUrl) {
     uid,
     url,
     _source: {
+      url: feedUrl,
       feedUrl,
       feedType: "hfeed",
       originalId: getFirst(properties.uid),
@@ -596,6 +599,24 @@ export function normalizeHfeedMeta(hfeed, feedUrl) {
   return normalized;
 }
 
+/**
+ * Extract URL string from a photo value
+ * @param {object|string} photo - Photo value (can be string URL or object with value/url)
+ * @returns {string|undefined} Photo URL string
+ */
+function extractPhotoUrl(photo) {
+  if (!photo) {
+    return;
+  }
+  if (typeof photo === "string") {
+    return photo;
+  }
+  if (typeof photo === "object") {
+    return photo.value || photo.url || photo.src;
+  }
+  return;
+}
+
 /**
  * Normalize h-card author
  * @param {object|string} hcard - h-card or author name string
@@ -616,7 +637,7 @@ function normalizeHcard(hcard) {
     type: "card",
     name: getFirst(properties.name),
     url: getFirst(properties.url),
-    photo: getFirst(properties.photo),
+    photo: extractPhotoUrl(getFirst(properties.photo)),
   };
 }
 

package/lib/polling/processor.js

@@ -73,6 +73,11 @@ export async function processFeed(application, feed) {
         continue;
       }
 
+      // Enrich item source with feed metadata
+      if (item._source) {
+        item._source.name = feed.title || parsed.name;
+      }
+
       // Store the item
       const stored = await addItem(application, {
         channelId: feed.channelId,

package/lib/storage/items.js

@@ -121,6 +121,50 @@ export async function getTimelineItems(application, channelId, options = {}) {
   };
 }
 
+/**
+ * Extract URL string from a media value
+ * @param {object|string} media - Media value (can be string URL or object)
+ * @returns {string|undefined} URL string
+ */
+function extractMediaUrl(media) {
+  if (!media) {
+    return;
+  }
+  if (typeof media === "string") {
+    return media;
+  }
+  if (typeof media === "object") {
+    return media.value || media.url || media.src;
+  }
+}
+
+/**
+ * Normalize media array to URL strings
+ * @param {Array} mediaArray - Array of media items
+ * @returns {Array} Array of URL strings
+ */
+function normalizeMediaArray(mediaArray) {
+  if (!mediaArray || !Array.isArray(mediaArray)) {
+    return [];
+  }
+  return mediaArray.map((media) => extractMediaUrl(media)).filter(Boolean);
+}
+
+/**
+ * Normalize author object to ensure photo is a URL string
+ * @param {object} author - Author object
+ * @returns {object} Normalized author
+ */
+function normalizeAuthor(author) {
+  if (!author) {
+    return;
+  }
+  return {
+    ...author,
+    photo: extractMediaUrl(author.photo),
+  };
+}
+
 /**
  * Transform database item to jf2 format
  * @param {object} item - Database item
@@ -142,11 +186,17 @@ function transformToJf2(item, userId) {
   if (item.content) jf2.content = item.content;
   if (item.summary) jf2.summary = item.summary;
   if (item.updated) jf2.updated = item.updated.toISOString();
-  if (item.author) jf2.author = item.author;
+  if (item.author) jf2.author = normalizeAuthor(item.author);
   if (item.category?.length > 0) jf2.category = item.category;
-  if (item.photo?.length > 0) jf2.photo = item.photo;
-  if (item.video?.length > 0) jf2.video = item.video;
-  if (item.audio?.length > 0) jf2.audio = item.audio;
+
+  // Normalize media arrays to ensure they contain URL strings
+  const photos = normalizeMediaArray(item.photo);
+  const videos = normalizeMediaArray(item.video);
+  const audios = normalizeMediaArray(item.audio);
+
+  if (photos.length > 0) jf2.photo = photos;
+  if (videos.length > 0) jf2.video = videos;
+  if (audios.length > 0) jf2.audio = audios;
 
   // Interaction types
   if (item.likeOf?.length > 0) jf2["like-of"] = item.likeOf;
@@ -161,18 +211,33 @@ function transformToJf2(item, userId) {
 }
 
 /**
- * Get an item by ID
+ * Get an item by ID (MongoDB _id or uid)
  * @param {object} application - Indiekit application
- * @param {ObjectId|string} id - Item ObjectId
+ * @param {ObjectId|string} id - Item ObjectId or uid string
  * @param {string} [userId] - User ID for read state
- * @returns {Promise<object|null>} jf2 item or null
+ * @returns {Promise<object|undefined>} jf2 item or undefined
  */
 export async function getItemById(application, id, userId) {
   const collection = getCollection(application);
-  const objectId = typeof id === "string" ? new ObjectId(id) : id;
 
-  const item = await collection.findOne({ _id: objectId });
-  if (!item) return;
+  let item;
+
+  // Try MongoDB ObjectId first
+  try {
+    const objectId = typeof id === "string" ? new ObjectId(id) : id;
+    item = await collection.findOne({ _id: objectId });
+  } catch {
+    // Invalid ObjectId format, will try uid lookup
+  }
+
+  // If not found by _id, try uid
+  if (!item) {
+    item = await collection.findOne({ uid: id });
+  }
+
+  if (!item) {
+    return;
+  }
 
   return transformToJf2(item, userId);
 }

package/package.json

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

package/views/404.njk

@@ -0,0 +1,17 @@
+{% extends "document.njk" %}
+
+{% block main %}
+<article class="main__container -!-container">
+  <header class="heading">
+    <h1 class="heading__title">
+      {{ __("microsub.error.notFound.title") | default("Not found") }}
+    </h1>
+  </header>
+  {{ prose({ text: __("microsub.error.notFound.description") | default("The item you're looking for could not be found.") }) }}
+  <p>
+    <a href="{{ baseUrl }}/channels" class="button button--secondary">
+      {{ __("microsub.reader.backToChannels") | default("Back to channels") }}
+    </a>
+  </p>
+</article>
+{% endblock %}

package/views/item.njk

@@ -50,19 +50,19 @@
     </div>
     {% endif %}
 
-    {% if item.inReplyTo or item.likeOf or item.repostOf or item.bookmarkOf %}
+    {% if item["in-reply-to"] or item["like-of"] or item["repost-of"] or item["bookmark-of"] %}
     <div class="item__context">
-      {% if item.inReplyTo %}
-      <p>{{ icon("reply") }} {{ __("Reply to") }}: <a href="{{ item.inReplyTo[0] }}">{{ item.inReplyTo[0] }}</a></p>
+      {% if item["in-reply-to"] %}
+      <p>{{ icon("reply") }} {{ __("Reply to") }}: <a href="{{ item["in-reply-to"][0] }}">{{ item["in-reply-to"][0] }}</a></p>
       {% endif %}
-      {% if item.likeOf %}
-      <p>{{ icon("like") }} {{ __("Liked") }}: <a href="{{ item.likeOf[0] }}">{{ item.likeOf[0] }}</a></p>
+      {% if item["like-of"] %}
+      <p>{{ icon("like") }} {{ __("Liked") }}: <a href="{{ item["like-of"][0] }}">{{ item["like-of"][0] }}</a></p>
       {% endif %}
-      {% if item.repostOf %}
-      <p>{{ icon("repost") }} {{ __("Reposted") }}: <a href="{{ item.repostOf[0] }}">{{ item.repostOf[0] }}</a></p>
+      {% if item["repost-of"] %}
+      <p>{{ icon("repost") }} {{ __("Reposted") }}: <a href="{{ item["repost-of"][0] }}">{{ item["repost-of"][0] }}</a></p>
       {% endif %}
-      {% if item.bookmarkOf %}
-      <p>{{ icon("bookmark") }} {{ __("Bookmarked") }}: <a href="{{ item.bookmarkOf[0] }}">{{ item.bookmarkOf[0] }}</a></p>
+      {% if item["bookmark-of"] %}
+      <p>{{ icon("bookmark") }} {{ __("Bookmarked") }}: <a href="{{ item["bookmark-of"][0] }}">{{ item["bookmark-of"][0] }}</a></p>
       {% endif %}
     </div>
     {% endif %}

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="{{ baseUrl }}/item/{{ item.uid }}" class="item-card__link">
+  <a href="{{ baseUrl }}/item/{{ item._id }}" class="item-card__link">
     {% if item.author %}
     <div class="item-card__author">
       {% if item.author.photo %}