@chrisburnell/eleventy-cache-webmentions 2.1.3-beta.2 → 2.1.3

package/README.md

@@ -82,6 +82,12 @@ Make sure you get the correct values for this configuration. Check below for bot
             <td>See <a href="https://www.11ty.dev/docs/plugins/cache/#cache-directory">Eleventy Fetch’s Cache Directory</a> for more information.</td>
             <td>1.1.2</td>
         </tr>
+        <tr>
+            <td><code>refresh</code></td>
+            <td><code>false</code></td>
+            <td>Forces fresh results from the Webmention endpoint every time.</td>
+            <td>2.1.3</td>
+        </tr>
         <tr>
             <td><code>duration</code></td>
             <td><code>"1d"</code> <em>or</em> 1 day</td>

package/eleventy-cache-webmentions.js

@@ -55,8 +55,8 @@ const getReceived = (webmention) => {
 	return (
 		webmention["wm-received"] ||
 		webmention["verified_date"] ||
-		webmention?.["data"]?.["published"] ||
-		webmention["published"]
+		webmention["published"] ||
+		webmention?.["data"]?.["published"]
 	);
 };
 
@@ -94,7 +94,7 @@ const getType = (webmention) => {
 
 const getByType = (webmentions, allowedType) => {
 	return webmentions.filter((webmention) => {
-		return allowedTypes === getType(webmention);
+		return allowedType === getType(webmention);
 	});
 };
 
@@ -105,6 +105,7 @@ const getByTypes = (webmentions, allowedTypes) => {
 };
 
 const defaults = {
+	refresh: false,
 	duration: "1d",
 	uniqueKey: "webmentions",
 	allowedHTML: {
@@ -219,8 +220,9 @@ const fetchWebmentions = async (options) => {
 
 	let webmentions = [];
 
-	// If there is a cached file at all, grab its contents now
-	if (asset.isCacheValid("9001y")) {
+	// Unless specifically getting fresh Webmentions, if there is a cached file
+	// at all, grab its contents now
+	if (asset.isCacheValid("9001y") && !options.refresh) {
 		webmentions = await asset.getCachedValue();
 	}
 
@@ -230,7 +232,7 @@ const fetchWebmentions = async (options) => {
 
 	// If there is a cached file but it is outside of expiry, fetch fresh
 	// results since the most recent Webmention
-	if (!asset.isCacheValid("1s")) {
+	if (!asset.isCacheValid(options.refresh ? "0s" : options.duration)) {
 		// Get the received date of the most recent Webmention, if it exists
 		const since = webmentions.length ? getReceived(webmentions[0]) : false;
 		// Build the URL for the fetch request
@@ -242,13 +244,16 @@ const fetchWebmentions = async (options) => {
 
 		// If using webmention.io, loop through pages until no results found
 		if (url.includes("https://webmention.io")) {
+			const urlObject = new URL(url);
+			const perPage =
+				Number(urlObject.searchParams.get("per-page")) || 1000;
+			urlObject.searchParams.delete("per-page");
 			// Start on page 0, to increment per subsequent request
 			let page = 0;
 			// Loop until a break condition is hit
 			while (true) {
-				const perPage =
-					Number(new URL(url).searchParams.get("per-page")) || 1000;
-				const urlPaginated = url + `&per-page=${perPage}&page=${page}`;
+				const urlPaginated =
+					urlObject.href + `&per-page=${perPage}&page=${page}`;
 				const fetched = await performFetch(
 					options,
 					webmentions,

package/package.json

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