@chrisburnell/eleventy-cache-webmentions 1.0.0-beta.2 → 1.0.0-beta.5

package/eleventy-cache-webmentions.js

@@ -2,7 +2,6 @@ const fetch = require("node-fetch")
 const sanitizeHTML = require("sanitize-html")
 const uniqBy = require("lodash/uniqBy")
 const { AssetCache } = require("@11ty/eleventy-fetch")
-const { defaultsDeep } = require("lodash")
 
 const absoluteURL = (url, domain) => {
 	try {
@@ -43,7 +42,7 @@ const getPublished = (webmention) => {
 }
 
 const getContent = (webmention) => {
-	return webmention?.["content"]["html"] || webmention["content"] || webmention?.["data"]["content"]
+	return webmention?.["content"]?.["html"] || webmention?.["content"] || webmention?.["data"]?.["content"] || ""
 }
 
 const getSource = (webmention) => {
@@ -67,11 +66,27 @@ const defaults = {
 		},
 	},
 	urlReplacements: {},
-	maximumHtmlLength: 2000,
+	maximumHtmlLength: 1000,
 	maximumHtmlText: "mentioned this in",
 }
 
 const fetchWebmentions = async (options) => {
+	if (!options.domain) {
+		throw new Error("domain is a required field when attempting to retrieve Webmentions. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
+	}
+
+	if (!options.feed) {
+		throw new Error("feed is a required field when attempting to retrieve Webmentions. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
+	}
+
+	if (!options.key) {
+		throw new Error("key is a required field when attempting to retrieve Webmentions. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
+	}
+
+	if (!options.uniqueKey) {
+		throw new Error("uniqueKey is a required field when attempting to retrieve Webmentions. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
+	}
+
 	let asset = new AssetCache(options.uniqueKey)
 	asset.ensureDir()
 
@@ -144,32 +159,30 @@ const getWebmentions = async (options, url, allowedTypes = {}) => {
 		return []
 	}
 
-	const results = webmentions[url]
-		// filter webmentions by allowed response post types
-		.filter((entry) => {
-			return typeof allowedTypes === "object" && Object.keys(allowedTypes).length ? allowedTypes.includes(getType(entry)) : true
-		})
-		// sanitize content of webmentions against HTML limit
-		.map((entry) => {
-			if (!("content" in entry) || !("data" in entry)) {
-				return entry
-			}
-			const html = getContent(entry)
-			if (html && html.length > options.maximumHtmlLength) {
-				entry.content = `${options.maximumHtmlText} <a href="${getSource(entry)}">${getSource(entry)}</a>`
-			} else if (Object.keys(options.allowedHTML).length) {
-				entry.content = sanitizeHTML(html, options.allowedHTML)
-			} else {
-				entry.content = html
-			}
-			return entry
-		})
-		// sort by published
-		.sort((a, b) => {
-			return epoch(getPublished(a)) - epoch(getPublished(b))
-		})
+	return (
+		webmentions[url]
+			// filter webmentions by allowed response post types
+			.filter((entry) => {
+				return typeof allowedTypes === "object" && Object.keys(allowedTypes).length ? allowedTypes.includes(getType(entry)) : true
+			})
+			// sanitize content of webmentions against HTML limit
+			.map((entry) => {
+				const html = getContent(entry)
+
+				if (html.length) {
+					entry.content = sanitizeHTML(html, options.allowedHTML)
+					if (html.length > options.maximumHtmlLength) {
+						entry.content = `${options.maximumHtmlText} <a href="${getSource(entry)}">${getSource(entry)}</a>`
+					}
+				}
 
-	return results
+				return entry
+			})
+			// sort by published
+			.sort((a, b) => {
+				return epoch(getPublished(a)) - epoch(getPublished(b))
+			})
+	)
 }
 
 const getWebmentionsFilter = async (options, url, allowedTypes, callback) => {
@@ -184,18 +197,6 @@ const getWebmentionsFilter = async (options, url, allowedTypes, callback) => {
 module.exports = (eleventyConfig, options = {}) => {
 	options = Object.assign(defaults, options)
 
-	if (!options.domain) {
-		throw new Error("domain is a required field when adding the plugin to your eleventyConfig using addPlugin. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
-	}
-
-	if (!options.feed) {
-		throw new Error("feed is a required field when adding the plugin to your eleventyConfig using addPlugin. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
-	}
-
-	if (!options.key) {
-		throw new Error("key is a required field when adding the plugin to your eleventyConfig using addPlugin. See https://chrisburnell.com/eleventy-cache-webmentions/#installation for more information.")
-	}
-
 	if (eleventyConfig) {
 		// Global Data
 		eleventyConfig.addGlobalData("webmentions", filteredWebmentions(options))
@@ -209,7 +210,6 @@ module.exports = (eleventyConfig, options = {}) => {
 
 	return {
 		defaults: defaults,
-		webmentions: filteredWebmentions(options),
 		fetchWebmentions: fetchWebmentions,
 		filteredWebmentions: filteredWebmentions,
 		getWebmentions: getWebmentions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrisburnell/eleventy-cache-webmentions",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.5",
   "description": "Fetch and cache webmentions using eleventy-fetch.",
   "main": "eleventy-cache-webmentions.js",
   "author": "Chris Burnell <me@chrisburnell.com>",
@@ -18,8 +18,8 @@
   "dependencies": {
     "@11ty/eleventy-fetch": "^3.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "2.6.5",
-    "sanitize-html": "^2.5.2"
+    "node-fetch": "3.2.10",
+    "sanitize-html": "^2.7.1"
   },
   "keywords": [
     "eleventy",