From 13a2595482ee210203c7b85183a84415654e1508 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Mon, 6 Jun 2022 12:16:33 -0700
Subject: [PATCH] Add combined Atom feed

---
 content/_index.md              |  1 +
 layouts/_default/list.atom.xml | 17 +++++++++++------
 layouts/partials/head.html     | 14 +++++++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/content/_index.md b/content/_index.md
index 2fb63f3..9cf8a6d 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -2,6 +2,7 @@
 outputs:
     - html
     - gemtext
+    - atom
 title: Seirdy's Home
 description: "Seirdy's Home: personal website and blog for Rohan Kumar, A.K.A. Seirdy. I write about and develop software to promote user autonomy."
 sitemap:
diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index 1d8ffed..e770f69 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -1,11 +1,12 @@
 {{- $pages := (where site.RegularPages "Section" .Section) -}}
-{{- if .IsHome }}
-  {{- $pages = .Site.RegularPages -}}
-{{ end -}}
-{{- $type := "article" -}}
 {{- $period := "daily" -}}
+{{- $title := .Section | humanize -}}
+{{- if .IsHome }}
+	{{- $title = "All content" -}}
+  {{- $pages = .Site.RegularPages -}}
+	{{- $period = "hourly" -}}
+{{ end -}}
 {{- if eq .Section "notes" -}}
-	{{- $type = "note" -}}
 	{{- $period = "hourly" -}}
 {{- end -}}
 {{- $icon_svg := resources.Get "/favicon.svg" | resources.Fingerprint "md5" -}}
@@ -20,7 +21,7 @@
 	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
 	xmlns:thr="http://purl.org/syndication/thread/1.0"
 	xml:lang="{{ .Site.LanguageCode }}">
-	<title>{{ .Section | humanize}} on {{ .Site.Title }}</title>
+	<title>{{ $title }} on {{ .Site.Title }}</title>
 	<link rel="self" type="application/atom+xml" href="{{ .Permalink }}atom.xml" />
 	<logo>{{ $icon_png.Permalink }}</logo>
   <icon>{{ .Site.Params.icon | absURL }}</icon>
@@ -62,6 +63,10 @@
 					{{ partial "processed-content.html" . | replaceRE `(?: )?(?:item(type|scope|prop|id|ref)="[^"]*"|class="language-figure")` "" | safeHTML }}
 			</div>
 		</content>
+		{{- $type := "article" -}}
+		{{- if eq .Section "notes" -}}
+			{{- $type = "note" -}}
+		{{- end -}}
 		<activity:object-type>http://activitystrea.ms/schema/1.0/{{ $type }}</activity:object-type>
 		<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
   </entry>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 50d4c06..1b00d6d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -21,14 +21,18 @@
 	{{ $webmanifest := resources.Get "/manifest.webmanifest" | resources.ExecuteAsTemplate "manifest.webmanifest" . | resources.Minify | resources.Fingerprint "md5" -}}
 	{{- printf `<link href="%s" rel="manifest" />` $webmanifest.RelPermalink | safeHTML -}}
 	<!--Feeds for both notes and posts; posts come first unless we're in the notes section.-->
-	{{- $isNotes := false -}}
 	{{- if or (eq .Section "notes") (eq .Title "Notes") -}}
-	{{- $isNotes = true -}}
 	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}notes/atom.xml" title="Notes" />
-	{{- end }}
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}atom.xml" title="All content" />
 	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}posts/atom.xml" title="Posts" />
-	{{ if not $isNotes -}}
-	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}/notes/atom.xml" title="Notes" />
+	{{- else if or (eq .Section "posts") (eq .Title "Posts") -}}
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}posts/atom.xml" title="Posts" />
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}atom.xml" title="All content" />
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}notes/atom.xml" title="Notes" />
+	{{- else -}}
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}atom.xml" title="All content" />
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}posts/atom.xml" title="Posts" />
+	<link rel="alternate" type="application/atom+xml" href="{{ site.BaseURL }}notes/atom.xml" title="Notes" />
 	{{- end }}
 	<title>{{ .Title }}{{ if and (lt (len .Title) 54) (ne $canonicalRelPermalink "/") }} - Seirdy{{ end }}</title>
 	{{ $description := .Site.Params.Description -}}