From 1e4a8c57204d06779a26ffbf3c72cd00285da21f Mon Sep 17 00:00:00 2001
From: yosh <yosh@unix.dog>
Date: Fri, 19 Apr 2024 15:46:54 -0400
Subject: [PATCH] make atom feeds valid

---
 src/articles/feed.sh        | 12 +++++++-----
 src/blog/feed.sh            |  5 +++--
 src/blog/i-love-this-mix.md |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/articles/feed.sh b/src/articles/feed.sh
index 0048457..6a80029 100644
--- a/src/articles/feed.sh
+++ b/src/articles/feed.sh
@@ -13,13 +13,15 @@ feed="$_BUILDDIR/articles/feed.atom"
 while read -r time hash subject; do
 	date=$(date -u -d "@$time" +"%Y-%m-%dT%TZ")
 	desc="" files=""
+	uuid=$(uuidgen --sha1 -n @url -N "$hash")
 
 	# print header (only on first one)
 	if [ -z "$flag" ]; then
 		printf '%s\n' '<?xml version="1.0" encoding="UTF-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
+	<link rel="self" type="application/atom+xml" href="https://unix.dog/~yosh/articles/feed.atom" />
+	<link rel="alternate" type="text/html" href="https://unix.dog/~yosh/articles" />
 	<title>yosh'\''s articles</title>
-	<link href="https://unix.dog/~yosh/articles/"/>
 	<author><name>yosh</name></author>
 	<updated>'"$date"'</updated>
 	<id>urn:uuid:'"$articles_uuid"'</id>'
@@ -37,7 +39,7 @@ while read -r time hash subject; do
 			s/\.md	/\.html	/
 			s/	/ --> /
 			s/^/<li><p>/
-			s/$/<\/li><\/p>/
+			s/$/<\/p><\/li>/
 			p
 		}
 		')
@@ -45,11 +47,11 @@ while read -r time hash subject; do
 
 	printf '<entry>
 	<title>%s</title>
-	<link rel="alternate" href="/~yosh/articles"/>
-	<id>%s</id>
+	<link rel="alternate" href="/~yosh/articles" />
+	<id>urn:uuid:%s</id>
 	<updated>%s</updated>
 	<content type="html">%s</content>
-</entry>\n' "$(escape "$subject")" "$hash" "$date" "$(escapepipe <<-EOF
+</entry>\n' "$(escape "$subject")" "$uuid" "$date" "$(escapepipe <<-EOF
 		<ul>
 		${desc:+"<p>$desc</p>$_NL"}$files
 		</ul>
diff --git a/src/blog/feed.sh b/src/blog/feed.sh
index 5a4d3d8..5e3e9ef 100644
--- a/src/blog/feed.sh
+++ b/src/blog/feed.sh
@@ -37,7 +37,7 @@ while IFS= read -r _entry; do
 		entries="$entries"'
 		<entry>
 			<title>'"$title"'</title>
-			<link rel="alternate" href="'"/~yosh/blog/${_entry%.md}.html"'"/>
+			<link rel="alternate" href="'"/~yosh/blog/${_entry%.md}.html"'" />
 			<id>urn:uuid:'"$uuid"'</id>
 			<published>'"$ctime"'</published>
 			<updated>'"$mtime"'</updated>
@@ -50,8 +50,9 @@ EOF
 
 header='<?xml version="1.0" encoding="UTF-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
+	<link rel="self" type="application/atom+xml" href="https://unix.dog/~yosh/blog/feed.atom" />
+	<link rel="alternate" type="text/html" href="https://unix.dog/~yosh/blog" />
 	<title>yosh'\''s blog</title>
-	<link href="https://unix.dog/~yosh/blog/"/>
 	<author><name>yosh</name></author>
 	<updated>'"$(echo "$all_mtimes" | sort -r | head -n 1)"'</updated>
 	<id>urn:uuid:'"$blog_uuid"'</id>'
diff --git a/src/blog/i-love-this-mix.md b/src/blog/i-love-this-mix.md
index 4128229..3aa8403 100644
--- a/src/blog/i-love-this-mix.md
+++ b/src/blog/i-love-this-mix.md
@@ -1,6 +1,7 @@
 ---
 title = I love this mix so fucking much
 ctime = 2024-04-03T06:32:23Z
+uuid = a49e70b4-5b92-404e-96a2-c66aaeb857f7
 TB_TITLE = INFINITE MP
 ---