@chrisburnell/eleventy-cache-webmentions 2.3.3 → 2.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrisburnell/eleventy-cache-webmentions",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "Cache webmentions using eleventy-fetch and make them available to use in collections, layouts, pages, etc. in Eleventy.",
   "license": "MIT",
   "repository": {

package/src/core.cjs

@@ -16,6 +16,7 @@
  * @property {{[key: string]: string}} urlReplacements
  * @property {number} maximumHtmlLength
  * @property {string} maximumHtmlText
+ * @property {boolean} paginate
  */
 
 /**
@@ -39,6 +40,7 @@
  * @property {object} [content]
  * @property {string} [content.html]
  * @property {string} [content.value]
+ * @property {string} [content.text]
  * @property {object} [data]
  * @property {string} [data.title]
  * @property {string} [data.url]
@@ -74,7 +76,6 @@ module.exports = ({ AssetCache, styleText, sanitizeHTML }) => {
 		refresh: false,
 		duration: "1d",
 		uniqueKey: "webmentions",
-		cacheDirectory: undefined,
 		allowedHTML: {
 			allowedTags: ["a", "b", "em", "i", "strong"],
 			allowedAttributes: {
@@ -86,6 +87,7 @@ module.exports = ({ AssetCache, styleText, sanitizeHTML }) => {
 		urlReplacements: {},
 		maximumHtmlLength: 1000,
 		maximumHtmlText: "mentioned this in",
+		paginate: false,
 	};
 
 	/**
@@ -211,7 +213,8 @@ module.exports = ({ AssetCache, styleText, sanitizeHTML }) => {
 			webmention?.["contentSanitized"] ||
 			webmention?.["content"]?.["html"] ||
 			webmention?.["content"]?.["value"] ||
-			webmention?.["content"] ||
+			webmention?.["content"]?.["text"] ||
+			(typeof webmention?.["content"] === "string" && webmention["content"]) ||
 			webmention?.["data"]?.["content"] ||
 			""
 		);
@@ -542,34 +545,52 @@ module.exports = ({ AssetCache, styleText, sanitizeHTML }) => {
 		return webmentions;
 	};
 
+	const webmentionsByURLCache = new Map();
+
 	/**
 	 * @param {Options} options
 	 * @returns {Promise<{[key: string]: Array<Webmention>}>}
 	 */
 	const webmentionsByURL = async (options) => {
-		let rawWebmentions = await retrieveWebmentions(options);
-
-		// Fix local URLs based on urlReplacements and sort Webmentions into groups
-		// by target base URL
-		const webmentions = {};
-		rawWebmentions.forEach((webmention) => {
-			const target = getTarget(webmention);
-			if (!target) {
-				return;
-			}
+		const cacheKey = JSON.stringify([
+			options.domain,
+			options.feed,
+			options.key,
+			options.uniqueKey,
+			options.refresh,
+		]);
+
+		if (webmentionsByURLCache.has(cacheKey)) {
+			return webmentionsByURLCache.get(cacheKey);
+		}
 
-			let url = baseURL(
-				fixURL(target.replace(/\/?$/, "/"), options.urlReplacements),
-			);
+		const promise = retrieveWebmentions(options).then((rawWebmentions) => {
+			// Fix local URLs based on urlReplacements and sort Webmentions into
+			// groups by target base URL
+			const webmentions = {};
+			rawWebmentions.forEach((webmention) => {
+				const target = getTarget(webmention);
+				if (!target) {
+					return;
+				}
 
-			if (!webmentions[url]) {
-				webmentions[url] = [];
-			}
+				let url = baseURL(
+					fixURL(target.replace(/\/?$/, "/"), options.urlReplacements),
+				);
 
-			webmentions[url].push(webmention);
+				if (!webmentions[url]) {
+					webmentions[url] = [];
+				}
+
+				webmentions[url].push(webmention);
+			});
+
+			return webmentions;
 		});
 
-		return webmentions;
+		webmentionsByURLCache.set(cacheKey, promise);
+
+		return promise;
 	};
 	const webmentionsByUrl = webmentionsByURL;
 	const filteredWebmentions = webmentionsByURL;