From 62f6268651710e973505080a290d0a185c68a41a Mon Sep 17 00:00:00 2001 From: Nathan Upchurch Date: Tue, 16 Jul 2024 18:34:31 -0500 Subject: [PATCH] Fix mastodon comment author URL --- _includes/mastodonComments.njk | 3 +-- eleventy.config.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_includes/mastodonComments.njk b/_includes/mastodonComments.njk index c0254ee..ae3bb30 100644 --- a/_includes/mastodonComments.njk +++ b/_includes/mastodonComments.njk @@ -38,8 +38,7 @@ const renderComment = (comment, target, parentIdm) => { const dateTime = `${dateObj.getDate()}${dateSuffixAdder(dateObj.getDate())} of ${monthMap[dateObj.getMonth()]}, ${dateObj.getFullYear()}, at ${timeFormatter(dateObj.getHours(), dateObj.getMinutes())}`; node.querySelector("wc-comment").setAttribute("author_name", comment.account.display_name); - node.querySelector("wc-comment").setAttribute("author_url", - `${comment.account.acct == "{{ metadata.mastodonUser }}" ? "https://{{ metadata.mastodonHost }}/@{{ metadata.mastodonUser }}" : comment.account.acct}`); + node.querySelector("wc-comment").setAttribute("author_url", comment.url.replace(/\/[0-9]+/, "")); node.querySelector("wc-comment").setAttribute("avatar_url", comment.account.avatar_static); node.querySelector("wc-comment").setAttribute("comment_content", comment.content); node.querySelector("wc-comment").setAttribute("publish_date", dateTime); diff --git a/eleventy.config.js b/eleventy.config.js index f4611fb..7c254d3 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -60,6 +60,8 @@ export default async function(eleventyConfig) { }); // Shortcodes + + // Cowsay eleventyConfig.addNunjucksFilter("cowsay", cowText => { const cowCaptionReplacementTable = [ [` @@ -89,6 +91,7 @@ export default async function(eleventyConfig) { `; }); + // Embed a toot eleventyConfig.addAsyncShortcode("toot", async function(instance, ID) { const tootData = await fetch( `https://${instance}/api/v1/statuses/${ID}`