From cb2822333a7864e3f7a5e21fdf135c4c45592e06 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Tue, 23 Jun 2020 20:46:44 +0200
Subject: [PATCH] Update

---
 layouts/_default/_markup/render-link.html | 2 +-
 layouts/_default/list.jsonfeed.json       | 2 +-
 layouts/_default/rss.xml                  | 2 +-
 layouts/_default/section.podcast.xml      | 2 +-
 layouts/partials/cleanedContent.json      | 1 -
 layouts/partials/cleanedContent.xml       | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 layouts/partials/cleanedContent.json
 delete mode 100644 layouts/partials/cleanedContent.xml

diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index e496089..5cb870a 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener"{{ end }}>{{ .Text | markdownify }}</a>
\ No newline at end of file
+<a href="{{ .Destination | absURL | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener"{{ end }}>{{ .Text | markdownify }}</a>
\ No newline at end of file
diff --git a/layouts/_default/list.jsonfeed.json b/layouts/_default/list.jsonfeed.json
index 0afc458..46bf88c 100644
--- a/layouts/_default/list.jsonfeed.json
+++ b/layouts/_default/list.jsonfeed.json
@@ -28,7 +28,7 @@
             "id": "{{ .Permalink }}",
             "url": "{{ .Permalink }}",
             "title": {{ .Title | jsonify }},
-            "content_html": {{ partialCached "cleanedContent.json" . .Permalink }},
+            "content_html": {{ .Content | jsonify }},
             "summary": {{ .Summary | jsonify }},
             "date_published": {{ dateFormat "2006-01-02T15:04:05-07:00" .Date | jsonify }},
             "date_modified": {{ dateFormat "2006-01-02T15:04:05-07:00" .Lastmod | jsonify }},
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 14e7404..401ee20 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -30,7 +30,7 @@
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       <guid>{{ .Permalink }}</guid>
-      <description>{{ partialCached "cleanedContent.xml" . .Permalink }}</description>
+      <description>{{ .Content | html }}</description>
     </item>
     {{ end }}
   </channel>
diff --git a/layouts/_default/section.podcast.xml b/layouts/_default/section.podcast.xml
index 6a8b69f..caf7657 100644
--- a/layouts/_default/section.podcast.xml
+++ b/layouts/_default/section.podcast.xml
@@ -33,7 +33,7 @@
         <itunes:author>{{ .Site.Author.name }}</itunes:author>
         <description>{{ .Summary  | plainify  }}</description>
         <itunes:summary>{{ .Summary | plainify }}</itunes:summary>
-        {{ "<content:encoded><![CDATA[" | safeHTML }}{{ ( htmlUnescape ( partialCached "cleanedContent.xml" . .Permalink ) ) | safeHTML }}{{"]]></content:encoded>" | safeHTML}}
+        {{ "<content:encoded><![CDATA[" | safeHTML }}{{ ( htmlUnescape ( .Content | html ) ) | safeHTML }}{{"]]></content:encoded>" | safeHTML}}
         <enclosure url="{{ .Params.audio }}" {{ with .Params.audioSize }}length="{{ . }}"{{ end }} {{ with .Params.audioMime }}type="{{ . }}"{{ end }}/>
       </item>
     {{ end }}
diff --git a/layouts/partials/cleanedContent.json b/layouts/partials/cleanedContent.json
deleted file mode 100644
index 8653b9a..0000000
--- a/layouts/partials/cleanedContent.json
+++ /dev/null
@@ -1 +0,0 @@
-{{ (( htmlUnescape .Content | safeHTML ) | replaceRE "href=\"/([^\"]*)\"" ( printf "href=\"%s$1\"" ( "" | absURL ) ) ) | jsonify }}
\ No newline at end of file
diff --git a/layouts/partials/cleanedContent.xml b/layouts/partials/cleanedContent.xml
deleted file mode 100644
index f5b5af2..0000000
--- a/layouts/partials/cleanedContent.xml
+++ /dev/null
@@ -1 +0,0 @@
-{{ (( htmlUnescape .Content | safeHTML ) | replaceRE "href=\"/([^\"]*)\"" ( printf "href=\"%s$1\"" ( "" | absURL ) ) ) | html }}
\ No newline at end of file