From 9dbc0a4f38b7afc81925cd15006287deb2e6ca41 Mon Sep 17 00:00:00 2001 From: Allen Guan Date: Thu, 3 Mar 2022 12:38:47 +0800 Subject: fix(RSS): page context selection --- layouts/_default/rss.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 178f997..4934bd0 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -1,5 +1,13 @@ -{{- $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections -}} -{{- $notHidden := where .Site.RegularPages "Params.hidden" "!=" true -}} +{{- $pctx := . -}} +{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} +{{- $pages := slice -}} +{{- if or $.IsHome $.IsSection -}} +{{- $pages = $pctx.RegularPages -}} +{{- else -}} +{{- $pages = $pctx.Pages -}} +{{- end -}} +{{- $pages := where $pages "Type" "in" .Site.Params.mainSections -}} +{{- $notHidden := where $pages "Params.hidden" "!=" true -}} {{- $filtered := ($pages | intersect $notHidden) -}} {{- $limit := .Site.Config.Services.RSS.Limit -}} {{- if ge $limit 1 -}} -- cgit v1.2.3 From d455336d579da37139ef4efe3f9060871a62b94d Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 18:11:48 +0100 Subject: fix: remove section filter in rss.xml --- layouts/_default/rss.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 4934bd0..e9f3f1a 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -6,12 +6,10 @@ {{- else -}} {{- $pages = $pctx.Pages -}} {{- end -}} -{{- $pages := where $pages "Type" "in" .Site.Params.mainSections -}} -{{- $notHidden := where $pages "Params.hidden" "!=" true -}} -{{- $filtered := ($pages | intersect $notHidden) -}} +{{- $pages := where $pages "Params.hidden" "!=" true -}} {{- $limit := .Site.Config.Services.RSS.Limit -}} {{- if ge $limit 1 -}} -{{- $filtered = $filtered | first $limit -}} +{{- $pages = $pages | first $limit -}} {{- end -}} {{- printf "" | safeHTML }} @@ -28,7 +26,7 @@ {{- with .OutputFormats.Get "RSS" -}} {{ printf "" .Permalink .MediaType | safeHTML }} {{- end -}} - {{ range $filtered }} + {{ range $pages }} {{- $content := safeHTML (.Summary | html) -}} {{- if .Site.Params.rssFullContent -}} {{- $content = safeHTML (.Content | html) -}} -- cgit v1.2.3