From e453714d427815e2d3d8b10a214fda3dafdfee60 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Tue, 31 May 2022 20:35:14 -0700
Subject: [PATCH] Atom: directly include un-escaped XHTML

---
 config.toml                                   | 2 +-
 layouts/_default/_markup/render-link.atom.xml | 2 +-
 layouts/_default/list.atom.xml                | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.toml b/config.toml
index 5f3ad6d..8321a18 100644
--- a/config.toml
+++ b/config.toml
@@ -150,5 +150,5 @@ disableKinds = ["taxonomy", "term"]
 # don't minify html but minify other resources, esp the fulltext rss/atom feeds
 [minify]
 	minifyOutput = true
-	disableXML = false
+	disableXML = true
 	disableHTML = true
diff --git a/layouts/_default/_markup/render-link.atom.xml b/layouts/_default/_markup/render-link.atom.xml
index e81c9ea..ce4dadc 100644
--- a/layouts/_default/_markup/render-link.atom.xml
+++ b/layouts/_default/_markup/render-link.atom.xml
@@ -8,5 +8,5 @@
 	{{- $href := printf "%s%s%s" $baseURL $parsedDest.Path $fragment | absURL -}}
 	<a href="{{ $href }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- else -}}
-	<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+	<a href="{{ .Destination | htmlEscape }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- end -}}
diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index c284bff..196b50e 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -16,7 +16,7 @@
   <id>{{ .Permalink }}</id>
   {{ range $pages }}
   <entry>
-    <title type="html"><![CDATA[{{ .Title | safeHTML }}]]></title>
+		<title type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml">{{ .Title | safeHTML }}</div></title>
     <link href="{{ .Permalink }}" />
     <published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
     <updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
@@ -26,7 +26,11 @@
     </author>
     <id>{{ .Permalink }}</id>
     <rights>CC-BY-SA 4.0 by Rohan Kumar</rights>
-    <content type="html"><![CDATA[{{ .Content | safeHTML }}]]></content>
+		<content type="xhtml">
+			<div xmlns="http://www.w3.org/1999/xhtml">
+					{{ partial "processed-content.html" . | safeHTML }}
+			</div>
+		</content>
 		<object-type xmlns="http://activitystrea.ms/spec/1.0/">
 			{{- if eq .Section "notes" -}}
 				note