@chrisburnell/eleventy-cache-webmentions 0.1.0 → 0.1.4

package/README.md

@@ -1,6 +1,6 @@
 # eleventy-cache-assets
 
-> Work-in-progress! ⚠️ Cache webmentions using eleventy-cache-assets and make them available to use in collections, templates, pages, etc.
+> Cache webmentions using eleventy-cache-assets and make them available to use in collections, templates, pages, etc.
 
 ## Installation
 

package/eleventy-cache-webmentions.js

@@ -41,7 +41,7 @@ const epoch = (value) => {
 	return new Date(value).getTime()
 }
 
-module.exports = (config, options = {}) => {
+module.exports = (, options = {}) => {
 	options = Object.assign(
 		{
 			duration: "23h",
@@ -79,18 +79,22 @@ module.exports = (config, options = {}) => {
 		if (!asset.isCacheValid(options.duration)) {
 			const since = asset._cache.getKey(options.key) ? asset._cache.getKey(options.key).cachedAt : false
 			const url = `https://webmention.io/api/mentions.jf2?domain=${hostname(options.domain)}&token=${TOKEN}&per-page=9001${since ? `&since=${since}` : ``}`
-			const response = await fetch(url)
-			if (response.ok) {
-				const feed = await response.json()
-				if (feed.children.length) {
-					console.log(`[${hostname(options.domain)}] ${feed.children.length} new Webmentions fetched into cache.`)
-				}
-				webmentions.children = [...feed.children, ...webmentions.children].sort((a, b) => {
-					return epoch(b.published || b["wm-received"]) - epoch(a.published || a["wm-received"])
+			await fetch(url)
+				.then(async (response) => {
+					if (response.ok) {
+						const feed = await response.json()
+						if (feed.children.length) {
+							console.log(`[${hostname(options.domain)}] ${feed.children.length} new Webmentions fetched into cache.`)
+						}
+						webmentions.children = [...feed.children, ...webmentions.children]
+						await asset.save(webmentions, "json")
+						return webmentions
+					}
+					return Promise.reject(response)
+				})
+				.catch((error) => {
+					console.log("[${hostname(options.domain)}] Something went wrong with your request to webmention.io!", error)
 				})
-				await asset.save(webmentions, "json")
-				return webmentions
-			}
 		}
 
 		return webmentions
@@ -122,7 +126,7 @@ module.exports = (config, options = {}) => {
 		return webmentions
 	}
 
-	const getWebmentions = async (url, allowedTypes) => {
+	const getWebmentions = async (url, allowedTypes = {}) => {
 		const webmentions = await filteredWebmentions()
 		url = absoluteURL(url, options.domain)
 
@@ -131,9 +135,9 @@ module.exports = (config, options = {}) => {
 		}
 
 		const results = webmentions[url]
-			// filter webmentions by allowedTypes only if passed
+			// filter webmentions by allowed response post types
 			.filter((entry) => {
-				return Array.isArray(allowedTypes) ? allowedTypes.includes(entry["wm-property"]) : true
+				return typeof allowedTypes === "object" && Object.keys(allowedTypes).length ? allowedTypes.includes(entry["wm-property"]) : true
 			})
 			// remove webmentions without an author name
 			.filter((entry) => {
@@ -148,8 +152,10 @@ module.exports = (config, options = {}) => {
 				const { html, text } = entry.content
 				if (html && html.length > options.maximumHtmlLength) {
 					entry.content.value = `${options.maximumHtmlText} <a href="${entry["wm-source"]}">${entry["wm-source"]}</a>`
-				} else {
+				} else if (Object.keys(options.allowedHTML).length) {
 					entry.content.value = sanitizeHTML(html || text, options.allowedHTML)
+				} else {
+					entry.content.value = html || text
 				}
 				return entry
 			})
@@ -162,22 +168,22 @@ module.exports = (config, options = {}) => {
 	}
 
 	const getWebmentionsFilter = async (url, allowedTypes, callback) => {
-		const webmentions = await getWebmentions(url, allowedTypes)
-		if (typeof callback === "function") {
-			callback(null, webmentions)
-		} else {
-			return webmentions
+		if (typeof callback !== "function") {
+			callback = allowedTypes
+			allowedTypes = {}
 		}
+		const webmentions = await getWebmentions(url, allowedTypes)
+		callback(null, webmentions)
 	}
 
-	if (config && options) {
+	if (eleventyConfig && options) {
 		if (!options.domain) {
-			throw new Error("domain is a required option to be passed when adding the plugin to your config using addPlugin.")
+			throw new Error("domain is a required option to be passed when adding the plugin to your eleventyConfig using addPlugin.")
 		}
 
-		config.addLiquidFilter("getWebmentions", getWebmentionsFilter)
-		config.addNunjucksAsyncFilter("getWebmentions", getWebmentionsFilter)
+		eleventyConfig.addLiquidFilter("getWebmentions", getWebmentionsFilter)
+		eleventyConfig.addNunjucksAsyncFilter("getWebmentions", getWebmentionsFilter)
 	} else {
-		return filteredWebmentions()
+		return filteredWebmentions
 	}
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@chrisburnell/eleventy-cache-webmentions",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Cache webmentions from webmention.io using eleventy-cache-assets.",
   "main": "eleventy-cache-webmentions.js",
   "author": "Chris Burnell <me@chrisburnell.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git@github.com:chrisburnell/chrisburnell.com.git"
+    "url": "git@github.com:chrisburnell/eleventy-cache-webmentions.git"
   },
   "bugs": {
-    "url": "https://github.com/chrisburnell/chrisburnell.com/issues"
+    "url": "https://github.com/chrisburnell/eleventy-cache-webmentions/issues"
   },
   "engines": {
     "node": ">=10"