@chrisburnell/eleventy-cache-webmentions 0.1.9 → 0.1.12

package/.prettierrc

@@ -0,0 +1,4 @@
+# .prettierrc
+semi: false
+printWidth: 9999
+tabWidth: 4

package/README.md

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

package/eleventy-cache-webmentions.js

@@ -1,7 +1,7 @@
 const fetch = require("node-fetch")
 const sanitizeHTML = require("sanitize-html")
 const uniqBy = require("lodash/uniqBy")
-const { AssetCache } = require("@11ty/eleventy-cache-assets")
+const { AssetCache } = require("@11ty/eleventy-fetch")
 
 // Load .env variables with dotenv
 require("dotenv").config()
@@ -77,7 +77,7 @@ module.exports = (eleventyConfig, options = {}) => {
 		// If there is a cached file but it is outside of expiry, fetch fresh
 		// results since the most recent
 		if (!asset.isCacheValid(options.duration)) {
-			const since = asset._cache.getKey(options.uniqueKey || options.key) ? asset._cache.getKey(options.uniqueKey || options.key).cachedAt : false
+			const since = webmentions.children.length ? webmentions.children[0]["wm-received"] : false
 			const url = `https://webmention.io/api/mentions.jf2?domain=${hostname(options.domain)}&token=${TOKEN}&per-page=9001${since ? `&since=${since}` : ``}`
 			await fetch(url)
 				.then(async (response) => {
@@ -104,7 +104,7 @@ module.exports = (eleventyConfig, options = {}) => {
 		const rawWebmentions = await fetchWebmentions()
 		let webmentions = {}
 
-		// Sort Webmentions into groups by target
+		// Sort Webmentions into groups by `wm-target`
 		rawWebmentions.children.forEach((webmention) => {
 			// Get the target of the Webmention and fix it up
 			let url = baseUrl(fixUrl(webmention["wm-target"].replace(/\/?$/, "/"), options.urlReplacements))
@@ -116,10 +116,10 @@ module.exports = (eleventyConfig, options = {}) => {
 			webmentions[url].push(webmention)
 		})
 
-		// Sort Webmentions in groups by url and remove duplicates by wm-id
+		// Sort Webmentions in groups by url and remove duplicates by `url`
 		for (let url in webmentions) {
 			webmentions[url] = uniqBy(webmentions[url], (item) => {
-				return item["wm-id"]
+				return item["url"]
 			})
 		}
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chrisburnell/eleventy-cache-webmentions",
-  "version": "0.1.9",
-  "description": "Cache webmentions from webmention.io using eleventy-cache-assets.",
+  "version": "0.1.12",
+  "description": "Cache webmentions from webmention.io using eleventy-fetch.",
   "main": "eleventy-cache-webmentions.js",
   "author": "Chris Burnell <me@chrisburnell.com>",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@11ty/eleventy-cache-assets": "^2.3.0",
+    "@11ty/eleventy-fetch": "^3.0.0",
     "dotenv": "^10.0.0",
     "lodash": "^4.17.21",
     "node-fetch": "2.6.5",