From 42f57108a1336d4b44d31de3700fa491344d76a1 Mon Sep 17 00:00:00 2001 From: Will Faught Date: Fri, 14 Feb 2025 15:44:50 -0800 Subject: [PATCH] Simplify feed link rel logic --- layouts/_default/list.atom.xml | 10 ++-------- layouts/_default/list.rss.xml | 8 +------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml index db828cfa..271031b0 100644 --- a/layouts/_default/list.atom.xml +++ b/layouts/_default/list.atom.xml @@ -63,13 +63,7 @@ {{ $id }} {{ range $page.OutputFormats }} - {{ $rel := .Rel }} - - {{ if eq .Permalink $page.Permalink }} - {{ $rel = "self" }} - {{ else if eq $rel "canonical" }} - {{ $rel = "alternate" }} - {{ end }} + {{ $rel := cond (eq .Rel "canonical") "self" .Rel }} {{ printf `` .Permalink $rel .MediaType | safeHTML }} {{ end }} @@ -146,7 +140,7 @@ {{ $id }} {{ range .OutputFormats }} - {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }} + {{ $rel := cond (eq .Rel "canonical") "self" .Rel }} {{ $href := cond (and (eq $rel "alternate") (eq .MediaType.Type "text/html")) $link .Permalink }} diff --git a/layouts/_default/list.rss.xml b/layouts/_default/list.rss.xml index 530f3a47..1c71f016 100644 --- a/layouts/_default/list.rss.xml +++ b/layouts/_default/list.rss.xml @@ -41,13 +41,7 @@ {{ range $page.OutputFormats }} - {{ $rel := .Rel }} - - {{ if eq .Permalink $page.Permalink }} - {{ $rel = "self" }} - {{ else if eq $rel "canonical" }} - {{ $rel = "alternate" }} - {{ end }} + {{ $rel := cond (eq .Rel "canonical") "self" .Rel }} {{ printf `` .Permalink $rel .MediaType | safeHTML }} {{ end }}