vowel 0.1.41 → 0.1.42

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.1.42](https://github.com/samlfair/vowel/compare/v0.1.41...v0.1.42) (2024-10-18)
+
+
+### Bug Fixes
+
+* un-hardcode webmention urls ([3421a69](https://github.com/samlfair/vowel/commit/3421a6998aa4ba20613b84c707e62fe273ddf327))
+
 ## [0.1.41](https://github.com/samlfair/vowel/compare/v0.1.40...v0.1.41) (2024-10-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vowel",
-	"version": "0.1.41",
+	"version": "0.1.42",
 	"homepage": "https://vowel.cc",
 	"author": "Sam Littlefair (https://littlefair.ca)",
 	"repository": {

package/src/lib/utilities/mutateMarkdownAST.js

@@ -10,7 +10,7 @@ function isURL(string) {
 	}
 }
 
-export default async function mutateMarkdownAST(ast, cache, webmentions) {
+export default async function mutateMarkdownAST(ast, cache, webmentions, pageURL) {
 
 	const promises = ast.map(async (node) => {
 		// TODO: Improve this URL regex
@@ -34,19 +34,19 @@ export default async function mutateMarkdownAST(ast, cache, webmentions) {
 						});
 
 						console.log(!!webmentions)
-						console.log({webmentions})
+						console.log({ webmentions })
 						console.log(webmentions.find(webmention => webmention.target === url))
 
-						
-						if(webmentions && !webmentions.find(webmention => webmention.target === url)) {
+
+						if (webmentions && !webmentions.find(webmention => webmention.target === url)) {
 							webmentions.push({
 								target: url,
 								status: "new"
 							})
 						} else if (webmentions) {
 							const webmention = webmentions.find(webmention => webmention.target === url)
-							if(webmention.status === "new") {
-								webmention.status = await sendWebmention(response.responseBody)
+							if (webmention.status === "new") {
+								webmention.status = await sendWebmention({ body: response.responseBody, target: webmention.target, source: pageURL })
 							}
 						}
 

package/src/lib/utilities/mutateMarkdownFrontmatter.js

@@ -24,7 +24,7 @@ function imputeType(value) {
 	return 'other';
 }
 
-export default async function mutateMarkdownFrontmatter(frontmatter, cache, webmentions) {
+export default async function mutateMarkdownFrontmatter(frontmatter, cache, webmentions, pageURL) {
 	const keys = Object.keys(frontmatter);
 
 	const promises = keys.map(async (key) => {
@@ -96,15 +96,15 @@ export default async function mutateMarkdownFrontmatter(frontmatter, cache, webm
 							og_image: url['og:image']
 						};
 
-						if(webmentions && !webmentions.find(webmention => webmention.target === input)) {
+						if (webmentions && !webmentions.find(webmention => webmention.target === input)) {
 							webmentions.push({
 								target: input,
 								status: "new"
 							})
 						} else if (webmentions) {
 							const webmention = webmentions.find(webmention => webmention.target === input)
-							if(webmention.status === "new") {
-								webmention.status = await sendWebmention(metadata.responseBody)
+							if (webmention.status === "new") {
+								webmention.status = await sendWebmention({ body: metadata.responseBody, target: webmention.target, source: pageURL })
 							}
 						}
 

package/src/lib/utilities/processMarkdownFiles.js

@@ -147,7 +147,7 @@ async function readFile(file, parents, cache, folderPath, hidden, publishedData)
 			filePublishedData = publishedData.at(-1)
 		}
 		
-		const { ast, frontmatter, imputedProperties } = await readMarkdownFile(filePath, cache, filePublishedData);
+		const { ast, frontmatter, imputedProperties } = await readMarkdownFile(filePath, cache, filePublishedData, url);
 
 		const loadTime = (performance.now() - startLoad).toFixed(2);
 		// console.log(`📄 ${shortPath} (${loadTime}ms)`);

package/src/lib/utilities/readMarkdownFile.js

@@ -110,7 +110,7 @@ function imputeTitleFromAST(ast) {
  * @returns {Promise<ParsedMarkdown>}
  * @throws {Error} Will throw an error if the file cannot be read or parsed.
  */
-export default async function readMarkdownFile(filePath, cache, publishedData) {
+export default async function readMarkdownFile(filePath, cache, publishedData, url) {
 	const fileName = path.basename(filePath.slice(0, -3));
 
 	const fileContent = await fs.readFile(filePath, 'utf8');
@@ -170,7 +170,7 @@ export default async function readMarkdownFile(filePath, cache, publishedData) {
 
 	const webmentions = publishedData?.webmentions
 
-	const promises = [mutateMarkdownAST(ast.children, cache, webmentions)];
+	const promises = [mutateMarkdownAST(ast.children, cache, webmentions, url)];
 
 	// Don't mutate frontmatter on the settings pages
 	if (!filePath.endsWith('settings.md'))

package/src/lib/utilities/sendWebmention.js

@@ -1,7 +1,7 @@
 import { XMLParser } from "fast-xml-parser"
 
 
-export default async function sendWebmention(body) {
+export default async function sendWebmention({ body, source, target }) {
     try {
         const parser = new XMLParser({
             unpairedTags: ["!doctype", "meta", "link", "hr", "br", "img"],
@@ -18,8 +18,8 @@ export default async function sendWebmention(body) {
 
         if (webmentionEndpoint) {
             const params = new URLSearchParams()
-            params.append('source', "https://www.littlefair.ca")
-            params.append('target', 'https://www.vowel.cc')
+            params.append('source', source)
+            params.append('target', target)
 
 
             const response = await fetch(webmentionEndpoint, {