fix(endpoint-posts): resolve item photo

paulrobertlloyd · paulrobertlloyd · commit 605a8d06cbd7 · 2024-04-10T23:44:17.000+01:00
diff --git a/packages/endpoint-posts/lib/controllers/posts.js b/packages/endpoint-posts/lib/controllers/posts.js
@@ -3,7 +3,7 @@ import { checkScope } from "@indiekit/endpoint-micropub/lib/scope.js";
 import { mf2tojf2 } from "@paulrobertlloyd/mf2tojf2";
 import { endpoint } from "../endpoint.js";
 import { statusTypes } from "../status-types.js";
-import { getPostStatusBadges, getPostName } from "../utils.js";
+import { getPostStatusBadges, getPostName, getPhotoUrl } from "../utils.js";
 
 /**
  * List published posts
@@ -39,7 +39,7 @@ export const postsController = async (request, response, next) => {
         item.id = item.uid;
         item.icon = item["post-type"];
         item.locale = application.locale;
-        item.photo = item.photo ? item.photo[0] : false;
+        item.photo = getPhotoUrl(publication, item);
         item.description = item.summary || item.content?.text;
         item.title = getPostName(publication, item);
         item.url = path.join(request.baseUrl, request.path, item.uid);
diff --git a/packages/endpoint-posts/lib/utils.js b/packages/endpoint-posts/lib/utils.js
@@ -64,6 +64,28 @@ export const getLocationProperty = (values) => {
   return sanitise(location);
 };
 
+/**
+ * Get photo URL
+ * @param {object} publication - Publication configuration
+ * @param {object} properties - JF2 properties
+ * @returns {object|boolean} Photo object, with URL
+ */
+export const getPhotoUrl = (publication, properties) => {
+  const photo = Array.isArray(properties.photo)
+    ? properties.photo[0]
+    : properties.photo;
+
+  if (!photo) {
+    return false;
+  } else if (URL.canParse(photo.url)) {
+    return photo;
+  } else {
+    return {
+      url: new URL(photo.url, publication.me).href,
+    };
+  }
+};
+
 /**
  * Get post status badges
  * @param {object} post - Post
diff --git a/packages/endpoint-posts/test/unit/utils.js b/packages/endpoint-posts/test/unit/utils.js
@@ -5,13 +5,15 @@ import {
   getGeoProperty,
   getGeoValue,
   getLocationProperty,
+  getPhotoUrl,
   getPostName,
   getPostStatusBadges,
   getPostUrl,
   getSyndicateToItems,
 } from "../../lib/utils.js";
 
 const publication = {
+  me: "https://website.example",
   postTypes: {
     article: {
       name: "Journal entry",
@@ -193,6 +195,19 @@ describe("endpoint-posts/lib/utils", () => {
     );
   });
 
+  it("Gets photo URL", () => {
+    const photo = { url: "https://external.example/foo.jpg" };
+    const photos = [{ url: "/path/to/foo.jpg" }, { url: "/path/to/bar.jpg" }];
+
+    assert.equal(getPhotoUrl(publication, { name: "foo" }), false);
+    assert.deepEqual(getPhotoUrl(publication, { photo }), {
+      url: "https://external.example/foo.jpg",
+    });
+    assert.deepEqual(getPhotoUrl(publication, { photo: photos }), {
+      url: "https://website.example/path/to/foo.jpg",
+    });
+  });
+
   it("Gets post name", () => {
     const post = { name: "My favourite sandwich" };
 
