@chrisburnell/eleventy-cache-webmentions 2.1.3 → 2.1.5

package/eleventy-cache-webmentions.js

@@ -72,6 +72,15 @@ const getContent = (webmention) => {
 };
 
 const getSource = (webmention) => {
+	return (
+		webmention["wm-source"] ||
+		webmention["source"] ||
+		webmention?.["data"]?.["url"] ||
+		webmention["url"]
+	);
+};
+
+const getURL = (webmention) => {
 	return (
 		webmention?.["data"]?.["url"] ||
 		webmention["url"] ||
@@ -153,9 +162,13 @@ const performFetch = async (options, webmentions, url) => {
 			// Process the blocklist, if it has any entries
 			if (options.blocklist.length) {
 				webmentions = webmentions.filter((webmention) => {
-					let sourceUrl = getSource(webmention);
-					for (let url of options.blocklist) {
-						if (sourceUrl.includes(url.replace(/\/?$/, "/"))) {
+					let url = getSource(webmention);
+					let source = getSource(webmention);
+					for (let blocklistURL of options.blocklist) {
+						if (
+							url.includes(blocklistURL.replace(/\/?$/, "/")) ||
+							source.includes(blocklistURL.replace(/\/?$/, "/"))
+						) {
 							return false;
 						}
 					}
@@ -165,9 +178,13 @@ const performFetch = async (options, webmentions, url) => {
 			// Process the allowlist, if it has any entries
 			if (options.allowlist.length) {
 				webmentions = webmentions.filter((webmention) => {
-					let sourceUrl = getSource(webmention);
-					for (let url of options.allowlist) {
-						if (sourceUrl.includes(url.replace(/\/?$/, "/"))) {
+					let url = getSource(webmention);
+					let source = getSource(webmention);
+					for (let allowlistURL of options.allowlist) {
+						if (
+							url.includes(allowlistURL.replace(/\/?$/, "/")) ||
+							source.includes(allowlistURL.replace(/\/?$/, "/"))
+						) {
 							return true;
 						}
 					}
@@ -399,6 +416,7 @@ const eleventyCacheWebmentions = (eleventyConfig, options = {}) => {
 	eleventyConfig.addLiquidFilter("getWebmentionReceived", getReceived);
 	eleventyConfig.addLiquidFilter("getWebmentionContent", getContent);
 	eleventyConfig.addLiquidFilter("getWebmentionSource", getSource);
+	eleventyConfig.addLiquidFilter("getWebmentionURL", getURL);
 	eleventyConfig.addLiquidFilter("getWebmentionTarget", getTarget);
 	eleventyConfig.addLiquidFilter("getWebmentionType", getType);
 
@@ -409,6 +427,7 @@ const eleventyCacheWebmentions = (eleventyConfig, options = {}) => {
 	eleventyConfig.addNunjucksFilter("getWebmentionReceived", getReceived);
 	eleventyConfig.addNunjucksFilter("getWebmentionContent", getContent);
 	eleventyConfig.addNunjucksFilter("getWebmentionSource", getSource);
+	eleventyConfig.addNunjucksFilter("getWebmentionURL", getURL);
 	eleventyConfig.addNunjucksFilter("getWebmentionTarget", getTarget);
 	eleventyConfig.addNunjucksFilter("getWebmentionType", getType);
 };
@@ -431,6 +450,8 @@ module.exports.getContent = getContent;
 module.exports.getWebmentionContent = getContent;
 module.exports.getSource = getSource;
 module.exports.getWebmentionSource = getSource;
+module.exports.getURL = getURL;
+module.exports.getWebmentionURL = getURL;
 module.exports.getTarget = getTarget;
 module.exports.getWebmentionTarget = getTarget;
 module.exports.getType = getType;

package/package.json

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