From 600f8fb054cf3fbbde23758b711cff682b29365b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 15 Apr 2025 22:06:04 -0700 Subject: [PATCH 1/4] fix: add missing tags for CDATA inside RSS feeds --- src/includes/macros/feed.njk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/includes/macros/feed.njk b/src/includes/macros/feed.njk index d864fe1..3e865c4 100644 --- a/src/includes/macros/feed.njk +++ b/src/includes/macros/feed.njk @@ -1,16 +1,16 @@ {% macro feed(meta, items, buildTime, feedPath, feedTitle, filterTag) %} - ![CDATA[{% if feedTitle %}{{ feedTitle }} • {% endif %}{{ meta.siteName }}]] + <![CDATA[{% if feedTitle %}{{ feedTitle }} • {% endif %}{{ meta.siteName }}]]> {{ meta.url }} - ![CDATA[{{ meta.siteDescription }}]] + en-ca {{ buildTime | formatAsUTCString }} {{ buildTime | formatAsUTCString }} {% for item in items | reverse %} - ![CDATA[{{ item.data.title }}]] + <![CDATA[{{ item.data.title }}]]> {{ meta.url }}{{ item.url }} {{ item.date | formatAsUTCString }} {{ meta.url }}{{ item.url }} @@ -18,9 +18,9 @@ {{ tag }} {% endfor %} {% if item.content %} - ![CDATA[{{ item.content | convertRelativeLinks(meta.url) | escape }}]] + {% elseif item.data.excerpt %} - ![CDATA[{{ item.excerpt }}]] + {% endif %} {% endfor %} From 8245fa2d4712195a833b96f54f258293661fcef5 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 15 Apr 2025 22:13:17 -0700 Subject: [PATCH 2/4] fix: use safe filter instead of escape for content --- src/includes/macros/feed.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/includes/macros/feed.njk b/src/includes/macros/feed.njk index 3e865c4..27b47c4 100644 --- a/src/includes/macros/feed.njk +++ b/src/includes/macros/feed.njk @@ -18,7 +18,7 @@ {{ tag }} {% endfor %} {% if item.content %} - + {% elseif item.data.excerpt %} {% endif %} From 073869e5e287d6f73843bbd841a52b4fba041950 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 15 Apr 2025 22:25:32 -0700 Subject: [PATCH 3/4] fix: use safe for other fields in RSS --- src/includes/macros/feed.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/includes/macros/feed.njk b/src/includes/macros/feed.njk index 27b47c4..64b5062 100644 --- a/src/includes/macros/feed.njk +++ b/src/includes/macros/feed.njk @@ -10,7 +10,7 @@ {{ buildTime | formatAsUTCString }} {% for item in items | reverse %} - <![CDATA[{{ item.data.title }}]]> + <![CDATA[{{ item.data.title | safe }}]]> {{ meta.url }}{{ item.url }} {{ item.date | formatAsUTCString }} {{ meta.url }}{{ item.url }} @@ -20,7 +20,7 @@ {% if item.content %} {% elseif item.data.excerpt %} - + {% endif %} {% endfor %} From bd2d4efe45946812984478c7d7f65dc044af630e Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Wed, 16 Apr 2025 10:31:08 -0700 Subject: [PATCH 4/4] feat: changelog and colophon update --- src/data/meta.js | 2 +- src/pages/changelog.md | 6 ++++++ src/pages/colophon.md | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/data/meta.js b/src/data/meta.js index 9edfaa3..ef50769 100644 --- a/src/data/meta.js +++ b/src/data/meta.js @@ -6,7 +6,7 @@ export default { locale: "en_EN", lang: "en", author: "Devin Haska", - repoUrl: "https://github.com/wonderfulfrog/wonderfulfrog.com", + repoUrl: "https://git.wonderfulfrog.com/wonderfulfrog/wonderfulfrog.com", email: "devin@wonderfulfrog.com", signal: { name: "wonderfulfrog.64", diff --git a/src/pages/changelog.md b/src/pages/changelog.md index f5cb520..bce1024 100644 --- a/src/pages/changelog.md +++ b/src/pages/changelog.md @@ -10,6 +10,12 @@ All the changes that are fit to read! If preferred, the [commit log is available here][commits]. +## April 15th, 2025 + +- Fix issue with `CDATA` inside the RSS feeds +- Update Colophon page +- Convert development and deployment pipeline to use [Forgejo](https://forgejo.org/) and [Forgejo Runner](https://code.forgejo.org/forgejo/runner)! + ## April 4th, 2025 - Updated the RSS generation scripts. I'm sorry (and in advance) for screwing with your RSS reader. diff --git a/src/pages/colophon.md b/src/pages/colophon.md index 83f95d5..529fb1c 100644 --- a/src/pages/colophon.md +++ b/src/pages/colophon.md @@ -26,7 +26,9 @@ A minimal amount of [PostCSS][postcss] is used as a developer convenience, othwi Responsive images are generated by [eleventy-img][eleventyimg]. -The site (and its accompanying media assets are hosted on [Bunny.net][https://bunny.net]. +The site (and its accompanying media assets are hosted on [Bunny.net](https://bunny.net). + +Source control is managed through a [self-hosted instance](https://git.wonderfulfrog.com) of [Forgejo](https://forgejo.org/). Date formatting uses [dayjs][dayjs].