@rmdes/indiekit-endpoint-microsub 1.0.6 → 1.0.8

package/lib/controllers/reader.js

@@ -303,6 +303,18 @@ export async function item(request, response) {
   });
 }
 
+/**
+ * Ensure value is a string URL
+ * @param {string|object|undefined} value - Value to check
+ * @returns {string|undefined} String value or undefined
+ */
+function ensureString(value) {
+  if (!value) return;
+  if (typeof value === "string") return value;
+  if (typeof value === "object" && value.url) return value.url;
+  return String(value);
+}
+
 /**
  * Compose response form
  * @param {object} request - Express request
@@ -324,10 +336,10 @@ export async function compose(request, response) {
 
   response.render("compose", {
     title: request.__("microsub.compose.title"),
-    replyTo: replyTo || reply,
-    likeOf: likeOf || like,
-    repostOf: repostOf || repost,
-    bookmarkOf: bookmarkOf || bookmark,
+    replyTo: ensureString(replyTo || reply),
+    likeOf: ensureString(likeOf || like),
+    repostOf: ensureString(repostOf || repost),
+    bookmarkOf: ensureString(bookmarkOf || bookmark),
     baseUrl: request.baseUrl,
   });
 }
@@ -364,7 +376,7 @@ export async function submitCompose(request, response) {
   if (!micropubEndpoint) {
     return response.status(500).render("error", {
       title: "Error",
-      error: { message: "Micropub endpoint not configured" },
+      content: "Micropub endpoint not configured",
     });
   }
 
@@ -438,20 +450,34 @@ export async function submitCompose(request, response) {
 
     // Handle error
     const errorBody = await micropubResponse.text();
+    const statusText = micropubResponse.statusText || "Unknown error";
     console.error(
       `[Microsub] Micropub error: ${micropubResponse.status} ${errorBody}`,
     );
 
+    // Parse error message from response body if JSON
+    let errorMessage = `Micropub error: ${statusText}`;
+    try {
+      const errorJson = JSON.parse(errorBody);
+      if (errorJson.error_description) {
+        errorMessage = String(errorJson.error_description);
+      } else if (errorJson.error) {
+        errorMessage = String(errorJson.error);
+      }
+    } catch {
+      // Not JSON, use status text
+    }
+
     return response.status(micropubResponse.status).render("error", {
       title: "Error",
-      error: { message: `Micropub error: ${micropubResponse.statusText}` },
+      content: errorMessage,
     });
   } catch (error) {
     console.error(`[Microsub] Micropub request failed: ${error.message}`);
 
     return response.status(500).render("error", {
       title: "Error",
-      error: { message: `Failed to create post: ${error.message}` },
+      content: `Failed to create post: ${error.message}`,
     });
   }
 }

package/lib/feeds/normalizer.js

@@ -536,18 +536,18 @@ export function normalizeHfeedItem(entry, feedUrl) {
     );
   }
 
-  // Interaction types
+  // Interaction types - normalize to string URLs
   if (properties["like-of"]) {
-    normalized["like-of"] = properties["like-of"];
+    normalized["like-of"] = normalizeUrlArray(properties["like-of"]);
   }
   if (properties["repost-of"]) {
-    normalized["repost-of"] = properties["repost-of"];
+    normalized["repost-of"] = normalizeUrlArray(properties["repost-of"]);
   }
   if (properties["bookmark-of"]) {
-    normalized["bookmark-of"] = properties["bookmark-of"];
+    normalized["bookmark-of"] = normalizeUrlArray(properties["bookmark-of"]);
   }
   if (properties["in-reply-to"]) {
-    normalized["in-reply-to"] = properties["in-reply-to"];
+    normalized["in-reply-to"] = normalizeUrlArray(properties["in-reply-to"]);
   }
 
   // RSVP
@@ -617,6 +617,36 @@ function extractPhotoUrl(photo) {
   return;
 }
 
+/**
+ * Extract URL string from a value that may be string or object
+ * @param {object|string} value - URL string or object with url/value property
+ * @returns {string|undefined} URL string
+ */
+function extractUrl(value) {
+  if (!value) {
+    return;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "object") {
+    return value.value || value.url || value.href;
+  }
+  return;
+}
+
+/**
+ * Normalize an array of URLs that may contain strings or objects
+ * @param {Array} urls - Array of URL strings or objects
+ * @returns {Array<string>} Array of URL strings
+ */
+function normalizeUrlArray(urls) {
+  if (!urls || !Array.isArray(urls)) {
+    return [];
+  }
+  return urls.map((u) => extractUrl(u)).filter(Boolean);
+}
+
 /**
  * Normalize h-card author
  * @param {object|string} hcard - h-card or author name string

package/package.json

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

package/views/compose.njk

@@ -8,7 +8,7 @@
 
     <h2>{{ __("microsub.compose.title") }}</h2>
 
-    {% if replyTo %}
+    {% if replyTo and replyTo is string %}
     <div class="compose__context">
       {{ icon("reply") }} {{ __("microsub.compose.replyTo") }}:
       <a href="{{ replyTo }}" target="_blank" rel="noopener">
@@ -17,7 +17,7 @@
     </div>
     {% endif %}
 
-    {% if likeOf %}
+    {% if likeOf and likeOf is string %}
     <div class="compose__context">
       {{ icon("like") }} {{ __("microsub.compose.likeOf") }}:
       <a href="{{ likeOf }}" target="_blank" rel="noopener">
@@ -26,7 +26,7 @@
     </div>
     {% endif %}
 
-    {% if repostOf %}
+    {% if repostOf and repostOf is string %}
     <div class="compose__context">
       {{ icon("repost") }} {{ __("microsub.compose.repostOf") }}:
       <a href="{{ repostOf }}" target="_blank" rel="noopener">
@@ -35,7 +35,7 @@
     </div>
     {% endif %}
 
-    {% if bookmarkOf %}
+    {% if bookmarkOf and bookmarkOf is string %}
     <div class="compose__context">
       {{ icon("bookmark") }} {{ __("microsub.compose.bookmarkOf") }}:
       <a href="{{ bookmarkOf }}" target="_blank" rel="noopener">

package/views/partials/item-card.njk

@@ -7,36 +7,43 @@
          data-is-read="{{ item._is_read | default(false) }}">
 
   {# Context bar for interactions (Aperture pattern) #}
+  {# Helper to extract URL from value that may be string or object #}
+  {% macro getUrl(val) %}{{ val.url or val.value or val if val is string else val }}{% endmacro %}
+
   {% if item["like-of"] and item["like-of"].length > 0 %}
+  {% set contextUrl = item['like-of'][0].url or item['like-of'][0].value or item['like-of'][0] %}
   <div class="item-card__context">
     {{ icon("like") }}
     <span>Liked</span>
-    <a href="{{ item['like-of'][0] }}" target="_blank" rel="noopener">
-      {{ item['like-of'][0] | replace("https://", "") | replace("http://", "") | truncate(50) }}
+    <a href="{{ contextUrl }}" target="_blank" rel="noopener">
+      {{ contextUrl | replace("https://", "") | replace("http://", "") | truncate(50) }}
     </a>
   </div>
   {% elif item["repost-of"] and item["repost-of"].length > 0 %}
+  {% set contextUrl = item['repost-of'][0].url or item['repost-of'][0].value or item['repost-of'][0] %}
   <div class="item-card__context">
     {{ icon("repost") }}
     <span>Reposted</span>
-    <a href="{{ item['repost-of'][0] }}" target="_blank" rel="noopener">
-      {{ item['repost-of'][0] | replace("https://", "") | replace("http://", "") | truncate(50) }}
+    <a href="{{ contextUrl }}" target="_blank" rel="noopener">
+      {{ contextUrl | replace("https://", "") | replace("http://", "") | truncate(50) }}
     </a>
   </div>
   {% elif item["in-reply-to"] and item["in-reply-to"].length > 0 %}
+  {% set contextUrl = item['in-reply-to'][0].url or item['in-reply-to'][0].value or item['in-reply-to'][0] %}
   <div class="item-card__context">
     {{ icon("reply") }}
     <span>Reply to</span>
-    <a href="{{ item['in-reply-to'][0] }}" target="_blank" rel="noopener">
-      {{ item['in-reply-to'][0] | replace("https://", "") | replace("http://", "") | truncate(50) }}
+    <a href="{{ contextUrl }}" target="_blank" rel="noopener">
+      {{ contextUrl | replace("https://", "") | replace("http://", "") | truncate(50) }}
     </a>
   </div>
   {% elif item["bookmark-of"] and item["bookmark-of"].length > 0 %}
+  {% set contextUrl = item['bookmark-of'][0].url or item['bookmark-of'][0].value or item['bookmark-of'][0] %}
   <div class="item-card__context">
     {{ icon("bookmark") }}
     <span>Bookmarked</span>
-    <a href="{{ item['bookmark-of'][0] }}" target="_blank" rel="noopener">
-      {{ item['bookmark-of'][0] | replace("https://", "") | replace("http://", "") | truncate(50) }}
+    <a href="{{ contextUrl }}" target="_blank" rel="noopener">
+      {{ contextUrl | replace("https://", "") | replace("http://", "") | truncate(50) }}
     </a>
   </div>
   {% endif %}