Move feed subpage filters to main loops

layouts/_default/list.atom.xml

@@ -8,17 +8,11 @@
 {{ $limit := site.Config.Services.RSS.Limit }}
 {{ $logo := $page.Param "paige.feeds.atom.logo" | absLangURL }}
 {{ $rights := site.Copyright | markdownify }}
-{{ $subpages := slice }}
+{{ $subpages := $page.RegularPagesRecursive.ByPublishDate.Reverse }}
 {{ $subtitle := $page.Description | markdownify }}
 
 {{ $lastmod := site.Lastmod.Format $date }}
 
-{{ range $page.RegularPagesRecursive.ByPublishDate.Reverse }}
-    {{ if not (.Param "paige.exclude_feeds") }}
-        {{ $subpages = $subpages | append . }}
-    {{ end }}
-{{ end }}
-
 {{ if gt $limit 0 }}
     {{ $subpages = first $limit $subpages }}
 {{ end }}
@@ -99,6 +93,7 @@
     <updated>{{ $lastmod }}</updated>
 
     {{ range $subpage := $subpages }}
+        {{ if not (.Param "paige.exclude_feeds") }}
             <entry>
                 {{ $content := .Content }}
                 {{ $external := and .Params.link (not (.Param "paige.feeds.disable_link")) | not | not }}
@@ -189,4 +184,5 @@
                 <updated>{{ $lastmod }}</updated>
             </entry>
         {{ end }}
+    {{ end }}
 </feed>

layouts/_default/list.rss.xml

@@ -8,16 +8,10 @@
 {{ $limit := site.Config.Services.RSS.Limit }}
 {{ $link := ($page.AlternativeOutputFormats.Get "html").Permalink }}
 {{ $master := $page.Param "paige.feeds.rss.web_master" }}
-{{ $subpages := slice }}
+{{ $subpages := $page.RegularPagesRecursive.ByPublishDate.Reverse }}
 
 {{ $lastmod := site.Lastmod.Format $date }}
 
-{{ range $page.RegularPagesRecursive.ByPublishDate.Reverse }}
-    {{ if not (.Param "paige.exclude_feeds") }}
-        {{ $subpages = $subpages | append . }}
-    {{ end }}
-{{ end }}
-
 {{ if gt $limit 0 }}
     {{ $subpages = $subpages | first $limit }}
 {{ end }}
@@ -87,6 +81,7 @@
         {{ end }}
 
         {{ range $subpages }}
+            {{ if not (.Param "paige.exclude_feeds") }}
                 <item>
                     {{ $author := "" }}
                     {{ $authors := partial "paige/func-authors.html" . }}
@@ -150,5 +145,6 @@
                     {{ end }}
                 </item>
             {{ end }}
+        {{ end }}
     </channel>
 </rss>