From 8e36d4aa9f83e3fe9ef5d160eb7c461edc4a3a75 Mon Sep 17 00:00:00 2001
From: Nick <git@mailship.org>
Date: Fri, 29 Jul 2022 16:10:16 -0400
Subject: [PATCH 1/4] Add some JSON-LD data to articles.

---
 src/components/ArticleHeader.vue | 41 +++++++++++++++++++++++++++++++-
 src/lib/utils.js                 | 21 ++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/components/ArticleHeader.vue b/src/components/ArticleHeader.vue
index e47e866079..0b179b7a80 100644
--- a/src/components/ArticleHeader.vue
+++ b/src/components/ArticleHeader.vue
@@ -46,7 +46,7 @@
 
 <script>
 import Redirect from "@/components/Redirect";
-import { ensureDomain, humanDateSpan } from "~/lib/utils.js";
+import { isEmpty, ensureDomain, humanDateSpan } from "~/lib/utils.js";
 import { getImage } from "~/lib/pages.mjs";
 import CONFIG from "~/../config.json";
 import * as dayjs from "dayjs";
@@ -55,6 +55,37 @@ const SOCIAL_TAGS_METADATA = [
     ["tease", "description", 200],
     ["image", "image", null],
 ];
+function makeJsonLd(meta) {
+    let json = {
+        "@context": "http://schema.org/",
+    };
+    if (meta.category === "events") {
+        json["@type"] = "Event";
+    }
+    if (meta.title) {
+        json.name = meta.title;
+    }
+    if (meta.date) {
+        json.startDate = meta.date;
+    }
+    if (meta.end) {
+        json.endDate = meta.end;
+    }
+    let contact;
+    if (meta.contacts) {
+        contact = meta.contacts.map((c) => c.name).join(", ");
+    } else if (meta.contact) {
+        contact = meta.contact;
+    }
+    if (contact) {
+        json.contact = {
+            "@type": "person",
+            name: contact,
+        };
+    }
+    json.url = `https://${CONFIG.host}${meta.path}`;
+    return json;
+}
 export default {
     components: {
         Redirect,
@@ -86,6 +117,14 @@ export default {
         if (info.meta !== undefined) {
             info.meta.push({ property: "og:type", content: "article" });
             info.meta.push({ property: "twitter:card", content: "summary_large_image" });
+        }
+        // Add JSON-LD.
+        if (info.script === undefined) {
+            info.script = [];
+        }
+        info.script.push({ json: makeJsonLd(this.article), type: "application/ld+json" });
+        // Return the metaInfo, if any.
+        if (!isEmpty(info)) {
             return info;
         }
     },
diff --git a/src/lib/utils.js b/src/lib/utils.js
index b2cee3ab6e..12b7523c9b 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -36,6 +36,27 @@ function repr(strParts, ...values) {
 }
 module.exports.repr = repr;
 
+/** Is the object or array empty?
+ * This accepts an Object or Array (actually anything with a `length` property). For values with a `length` property,
+ * this returns `true` if its value is 0.
+ * For Objects, it returns `true` if the number of keys (via `Object.keys()`) is 0.
+ * @param {(Array|Object)} value The value whose emptiness is being tested.
+ * @returns {Boolean} `true` or `false` according to the rules above, or `undefined` if it has no `length` property and
+ *     is not an Object.
+ */
+function isEmpty(value) {
+    if (value.length !== undefined) {
+        return value.length === 0;
+    }
+    let type = getType(value);
+    if (type === "Object") {
+        return Object.keys(value).length === 0;
+    } else {
+        return undefined;
+    }
+}
+module.exports.isEmpty = isEmpty;
+
 /** Truncate long strings with an ellipsis, and leave alone strings that are already short enough.
  */
 function trunc(str, maxLen, endChar = "…") {

From c49b6629644b4013709121e45393d26f4ff2b21a Mon Sep 17 00:00:00 2001
From: Nick <git@mailship.org>
Date: Fri, 29 Jul 2022 16:23:58 -0400
Subject: [PATCH 2/4] Improve `contact` JSON-LD property to conform to
 bioschema standard.

---
 src/components/ArticleHeader.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/ArticleHeader.vue b/src/components/ArticleHeader.vue
index 0b179b7a80..da30f7b181 100644
--- a/src/components/ArticleHeader.vue
+++ b/src/components/ArticleHeader.vue
@@ -71,17 +71,10 @@ function makeJsonLd(meta) {
     if (meta.end) {
         json.endDate = meta.end;
     }
-    let contact;
     if (meta.contacts) {
-        contact = meta.contacts.map((c) => c.name).join(", ");
+        json.contact = meta.contacts.map((c) => ({ "@type": "Person", name: c.name }));
     } else if (meta.contact) {
-        contact = meta.contact;
-    }
-    if (contact) {
-        json.contact = {
-            "@type": "person",
-            name: contact,
-        };
+        json.contact = [{ "@type": "Person", name: meta.contact }];
     }
     json.url = `https://${CONFIG.host}${meta.path}`;
     return json;

From bd82e98051dd64ee0e2eaf759a7f5fb91845580b Mon Sep 17 00:00:00 2001
From: Nick <git@mailship.org>
Date: Fri, 29 Jul 2022 18:21:06 -0400
Subject: [PATCH 3/4] Add BlogPosting and NewsArticle types, better handle raw
 string contacts/authors.

---
 src/components/ArticleHeader.vue | 41 +++++++++++++++++++++++++-------
 src/lib/utils.js                 |  4 ++--
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/components/ArticleHeader.vue b/src/components/ArticleHeader.vue
index da30f7b181..4a42a9cf05 100644
--- a/src/components/ArticleHeader.vue
+++ b/src/components/ArticleHeader.vue
@@ -46,7 +46,7 @@
 
 <script>
 import Redirect from "@/components/Redirect";
-import { isEmpty, ensureDomain, humanDateSpan } from "~/lib/utils.js";
+import { isEmpty, getType, ensureDomain, humanDateSpan } from "~/lib/utils.js";
 import { getImage } from "~/lib/pages.mjs";
 import CONFIG from "~/../config.json";
 import * as dayjs from "dayjs";
@@ -59,22 +59,47 @@ function makeJsonLd(meta) {
     let json = {
         "@context": "http://schema.org/",
     };
-    if (meta.category === "events") {
-        json["@type"] = "Event";
+    switch (meta.category) {
+        case "events":
+            json["@type"] = "Event";
+            break;
+        case "news":
+            json["@type"] = "NewsArticle";
+            break;
+        case "blog":
+            json["@type"] = "BlogPosting";
+            break;
     }
     if (meta.title) {
         json.name = meta.title;
     }
     if (meta.date) {
-        json.startDate = meta.date;
+        if (json["@type"] === "Event") {
+            json.startDate = meta.date;
+        } else if (json["@type"] === "BlogPosting" || json["@type"] === "NewsArticle") {
+            json.datePublished = meta.date;
+        }
     }
-    if (meta.end) {
+    if (meta.end && json["@type"] === "Event") {
         json.endDate = meta.end;
     }
-    if (meta.contacts) {
-        json.contact = meta.contacts.map((c) => ({ "@type": "Person", name: c.name }));
+    let contactNames;
+    if (meta.contacts && meta.contacts.length > 0) {
+        contactNames = meta.contacts.map((c) => c.name);
     } else if (meta.contact) {
-        json.contact = [{ "@type": "Person", name: meta.contact }];
+        contactNames = meta.contact.split(",").map((rawName) => rawName.trim());
+    }
+    if (contactNames) {
+        json.contact = contactNames.map((name) => ({ "@type": "Person", name }));
+    }
+    let authorNames;
+    if (getType(meta.authors) === "Array" && meta.authors.length > 0) {
+        authorNames = meta.authors.map((a) => a.name);
+    } else if (getType(meta.authors) === "String" && meta.authors) {
+        authorNames = meta.authors.split(",").map((rawName) => rawName.trim());
+    }
+    if (authorNames) {
+        json.author = authorNames.map((name) => ({ "@type": "Person", name }));
     }
     json.url = `https://${CONFIG.host}${meta.path}`;
     return json;
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 12b7523c9b..9f0c266747 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -37,10 +37,10 @@ function repr(strParts, ...values) {
 module.exports.repr = repr;
 
 /** Is the object or array empty?
- * This accepts an Object or Array (actually anything with a `length` property). For values with a `length` property,
+ * This accepts an Object, String, or Array (or anything with a `length` property). For values with a `length` property,
  * this returns `true` if its value is 0.
  * For Objects, it returns `true` if the number of keys (via `Object.keys()`) is 0.
- * @param {(Array|Object)} value The value whose emptiness is being tested.
+ * @param {(Array|String|Object)} value The value whose emptiness is being tested.
  * @returns {Boolean} `true` or `false` according to the rules above, or `undefined` if it has no `length` property and
  *     is not an Object.
  */

From 400bb42222454fb2cac08d4a30cbb8dcd39ecc23 Mon Sep 17 00:00:00 2001
From: Nick <git@mailship.org>
Date: Fri, 29 Jul 2022 18:23:44 -0400
Subject: [PATCH 4/4] Use datePublished by default.

---
 src/components/ArticleHeader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ArticleHeader.vue b/src/components/ArticleHeader.vue
index 4a42a9cf05..2b6f95821b 100644
--- a/src/components/ArticleHeader.vue
+++ b/src/components/ArticleHeader.vue
@@ -76,7 +76,7 @@ function makeJsonLd(meta) {
     if (meta.date) {
         if (json["@type"] === "Event") {
             json.startDate = meta.date;
-        } else if (json["@type"] === "BlogPosting" || json["@type"] === "NewsArticle") {
+        } else {
             json.datePublished = meta.date;
         }
     }