aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThedro Neely <thedroneely@gmail.com>2021-06-19 01:35:07 -0400
committerThedro Neely <thedroneely@gmail.com>2021-06-19 01:35:07 -0400
commit1ea82e754a8567f397915933ecaa24d1f32ab19a (patch)
treed5d50f2092716258be51c99651356e762526d5af
parent46ebc59aa8b4f7800f702ebbdfd12845f5534517 (diff)
downloadthedroneely.com-1ea82e754a8567f397915933ecaa24d1f32ab19a.tar.gz
thedroneely.com-1ea82e754a8567f397915933ecaa24d1f32ab19a.tar.bz2
thedroneely.com-1ea82e754a8567f397915933ecaa24d1f32ab19a.zip
generators/hugo/layouts/_default/rss: Fix and normalize RSS feeds
Use layout mechanism to hide some short codes on RSS output format.
-rw-r--r--generators/hugo/config.yaml12
-rw-r--r--generators/hugo/themes/tdro/layouts/_default/rss.xml20
-rw-r--r--generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml14
-rw-r--r--generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml1
-rw-r--r--generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml1
-rw-r--r--generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml1
-rw-r--r--generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml1
7 files changed, 32 insertions, 18 deletions
diff --git a/generators/hugo/config.yaml b/generators/hugo/config.yaml
index 90d6cf6..8773343 100644
--- a/generators/hugo/config.yaml
+++ b/generators/hugo/config.yaml
@@ -31,16 +31,12 @@ pygmentsCodeFences: true
pygmentsUseClasses: true
pygmentsCodeFencesGuessSyntax: true
-# RSS
-mediaTypes:
- application/atom:
- suffixes: xml
-
+# Output formats
outputFormats:
- RSS:
- mediaType: application/rss
+ rss:
baseName: rss
+ mediaType: application/xml
outputs:
home:
- - RSS
+ - rss
diff --git a/generators/hugo/themes/tdro/layouts/_default/rss.xml b/generators/hugo/themes/tdro/layouts/_default/rss.xml
index 2bd93b9..9d223a4 100644
--- a/generators/hugo/themes/tdro/layouts/_default/rss.xml
+++ b/generators/hugo/themes/tdro/layouts/_default/rss.xml
@@ -8,17 +8,17 @@
{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
- <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+ <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} from {{ end }}{{ .Site.Title }}{{ end }}</title>
<link>{{ .Permalink }}</link>
- <description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
- <generator>Hugo</generator>{{ with .Site.LanguageCode }}
- <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
- <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
- <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
- <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+ <description>Recent {{ if ne .Title .Site.Title }}{{ with .Title }}{{ . }} {{ end }}{{ end }}from {{ .Site.Title }}</description>
+ <generator>Hugo</generator>
+ <language>{{ .Site.LanguageCode }}</language>
+ <managingEditor>{{ $.Site.Author.name }}</managingEditor>
+ <webMaster>{{ $.Site.Author.name }}</webMaster>
+ <copyright>{{ $.Site.Author.name }}</copyright>{{ if not .Date.IsZero }}
<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
{{ with .OutputFormats.Get "RSS" }}
- {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+ {{- printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML -}}
{{ end }}
{{ range $pages }}
{{ if (ne .Params.hidden true) }}
@@ -26,9 +26,9 @@
<title>{{ .Title }}</title>
<link>{{ .Permalink }}</link>
<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
- {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+ <author>{{ $.Site.Author.name }}</author>
<guid>{{ .Permalink }}</guid>
- <description>{{ .Content | replaceRE `<\?php(.*?\n?)*?\?>` "" | html }}</description>
+ <description>{{ .Content | html }}</description>
</item>
{{ end }}
{{ end }}
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml
new file mode 100644
index 0000000..69a4202
--- /dev/null
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/image.rss.xml
@@ -0,0 +1,14 @@
+{{ $imageFile := print "public" (.Get `source`) }}
+{{ $image := imageConfig $imageFile }}
+
+{{ $ratio := 0 }}
+{{ if lt (mul (div (float $image.Height) $image.Width) 100) 100 }}
+{{ $ratio = mul (div (float $image.Height) $image.Width) 100 }}
+{{ end }}
+
+<figure>
+ <a href="{{ .Get `source` }}">
+ <img data-image-zoom src="{{ .Get `source` }}" alt="{{ .Get `title` }}" title="{{ .Get `title` }}" width="{{ $image.Width }}" height="{{ $image.Height }}"/>
+ </a>
+ <figcaption class="has-text-centered has-text-grey-dark">{{ .Inner }}</figcaption>
+</figure>
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml
new file mode 100644
index 0000000..b4020b5
--- /dev/null
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.rss.xml
@@ -0,0 +1 @@
+<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml
new file mode 100644
index 0000000..b4020b5
--- /dev/null
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.rss.xml
@@ -0,0 +1 @@
+<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml
new file mode 100644
index 0000000..b4020b5
--- /dev/null
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.rss.xml
@@ -0,0 +1 @@
+<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml
new file mode 100644
index 0000000..b4020b5
--- /dev/null
+++ b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.rss.xml
@@ -0,0 +1 @@
+<!-- Hide shortcode {{ .Inner }} for RSS feeds. -->