From 600f8fb054cf3fbbde23758b711cff682b29365b Mon Sep 17 00:00:00 2001
From: Devin Haska <wonderfulfrog@noreply.git.wonderfulfrog.com>
Date: Tue, 15 Apr 2025 22:06:04 -0700
Subject: [PATCH 1/3] 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) %}
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
-        <title>![CDATA[{% if feedTitle %}{{ feedTitle }} • {% endif %}{{ meta.siteName }}]]</title>
+        <title><![CDATA[{% if feedTitle %}{{ feedTitle }} • {% endif %}{{ meta.siteName }}]]></title>
         <link>{{ meta.url }}</link>
         <atom:link href="{{ meta.url }}{{ feedPath }}" rel="self" type="application/rss+xml" />
-        <description>![CDATA[{{ meta.siteDescription }}]]</description>
+        <description><![CDATA[{{ meta.siteDescription }}]]></description>
         <language>en-ca</language>
         <pubDate>{{ buildTime | formatAsUTCString }}</pubDate>
         <lastBuildDate>{{ buildTime | formatAsUTCString }}</lastBuildDate>
         {% for item in items | reverse %}
         <item>
-            <title>![CDATA[{{ item.data.title }}]]</title>
+            <title><![CDATA[{{ item.data.title }}]]></title>
             <guid>{{ meta.url }}{{ item.url }}</guid>
             <pubDate>{{ item.date | formatAsUTCString }}</pubDate>
             <link>{{ meta.url }}{{ item.url }}</link>
@@ -18,9 +18,9 @@
             <category>{{ tag }}</category>
             {% endfor %}
             {% if item.content %}
-            <description>![CDATA[{{ item.content | convertRelativeLinks(meta.url) | escape }}]]</description>
+            <description><![CDATA[{{ item.content | convertRelativeLinks(meta.url) | escape }}]]></description>
             {% elseif item.data.excerpt %}
-            <description>![CDATA[{{ item.excerpt }}]]</description>
+            <description><![CDATA[{{ item.excerpt }}]]></description>
             {% endif %}
         </item>
         {% endfor %}
-- 
2.47.2


From 8245fa2d4712195a833b96f54f258293661fcef5 Mon Sep 17 00:00:00 2001
From: Devin Haska <wonderfulfrog@noreply.git.wonderfulfrog.com>
Date: Tue, 15 Apr 2025 22:13:17 -0700
Subject: [PATCH 2/3] 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 @@
             <category>{{ tag }}</category>
             {% endfor %}
             {% if item.content %}
-            <description><![CDATA[{{ item.content | convertRelativeLinks(meta.url) | escape }}]]></description>
+            <description><![CDATA[{{ item.content | convertRelativeLinks(meta.url) | safe }}]]></description>
             {% elseif item.data.excerpt %}
             <description><![CDATA[{{ item.excerpt }}]]></description>
             {% endif %}
-- 
2.47.2


From 073869e5e287d6f73843bbd841a52b4fba041950 Mon Sep 17 00:00:00 2001
From: Devin Haska <wonderfulfrog@noreply.git.wonderfulfrog.com>
Date: Tue, 15 Apr 2025 22:25:32 -0700
Subject: [PATCH 3/3] 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 @@
         <lastBuildDate>{{ buildTime | formatAsUTCString }}</lastBuildDate>
         {% for item in items | reverse %}
         <item>
-            <title><![CDATA[{{ item.data.title }}]]></title>
+            <title><![CDATA[{{ item.data.title | safe }}]]></title>
             <guid>{{ meta.url }}{{ item.url }}</guid>
             <pubDate>{{ item.date | formatAsUTCString }}</pubDate>
             <link>{{ meta.url }}{{ item.url }}</link>
@@ -20,7 +20,7 @@
             {% if item.content %}
             <description><![CDATA[{{ item.content | convertRelativeLinks(meta.url) | safe }}]]></description>
             {% elseif item.data.excerpt %}
-            <description><![CDATA[{{ item.excerpt }}]]></description>
+            <description><![CDATA[{{ item.excerpt | safe }}]]></description>
             {% endif %}
         </item>
         {% endfor %}
-- 
2.47.2