From c1e82ffb2c6f47a9b917774bf9312c5ad9df14e2 Mon Sep 17 00:00:00 2001
From: Joseph Montanaro <jfmonty2@gmail.com>
Date: Tue, 5 Sep 2023 17:16:39 -0700
Subject: [PATCH] finish feed

---
 src/lib/xml.js                                       |  4 ++--
 src/routes/_posts/all.js                             | 12 ------------
 .../exposing-docker-containers-to-your-lan.svx       |  1 -
 src/routes/_posts/hitchikers-guide-to-mesh-vpns.svx  |  1 -
 .../_posts/imagining-a-passwordless-future.svx       |  1 -
 src/routes/_posts/languages-high-and-low.svx         |  1 -
 src/routes/_posts/sidenotes.svx                      |  1 -
 src/routes/_posts/simpler-socketio.svx               |  1 -
 .../sufficiently-advanced-technology-magic.svx       |  1 -
 src/routes/_posts/vue-vs-svelte.svx                  |  1 -
 src/routes/feed/+server.js                           | 12 +++++++-----
 11 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/lib/xml.js b/src/lib/xml.js
index 260bfc4..7d4c19e 100644
--- a/src/lib/xml.js
+++ b/src/lib/xml.js
@@ -89,6 +89,6 @@ function escape(text) {
     // we aren't going to bother with escaping attributes, so we won't worry about quotes
     return text
         .replaceAll('&', '&amp;')
-        .replaceAll('<', '&gt;')
-        .replaceAll('>', '&lt;');
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;');
 }
diff --git a/src/routes/_posts/all.js b/src/routes/_posts/all.js
index d1f8925..d58cca7 100644
--- a/src/routes/_posts/all.js
+++ b/src/routes/_posts/all.js
@@ -16,18 +16,6 @@ for (const path in posts) {
 }
 
 
-let ids = new Set();
-for (const postMeta of postData) {
-    if (postMeta.uuid === undefined) {
-        throw(`Missing UUID for post: ${postMeta.title}`);
-    }
-    if (ids.has(postMeta.uuid)) {
-        throw(`Duplicate UUID in post: ${postMeta.title}`);
-    }
-    ids.add(postMeta.uuid);
-}
-
-
 postData.sort((a, b) => {
     // sorting in reverse, so we flip the intuitive order
     if (a.date > b.date) return -1;
diff --git a/src/routes/_posts/exposing-docker-containers-to-your-lan.svx b/src/routes/_posts/exposing-docker-containers-to-your-lan.svx
index f19dc46..7f3de8d 100644
--- a/src/routes/_posts/exposing-docker-containers-to-your-lan.svx
+++ b/src/routes/_posts/exposing-docker-containers-to-your-lan.svx
@@ -2,7 +2,6 @@
 title: Exposing Docker Containers to your LAN
 description: If, for some strange reason, you should want to do such a thing.
 date: 2022-03-21
-uuid: 81715fb3-990e-487e-9662-fed7b7d02943
 ---
 <script>
     import Sidenote from '$lib/Sidenote.svelte';
diff --git a/src/routes/_posts/hitchikers-guide-to-mesh-vpns.svx b/src/routes/_posts/hitchikers-guide-to-mesh-vpns.svx
index 209b539..d84d2d8 100644
--- a/src/routes/_posts/hitchikers-guide-to-mesh-vpns.svx
+++ b/src/routes/_posts/hitchikers-guide-to-mesh-vpns.svx
@@ -2,7 +2,6 @@
 title: The Hitchiker's Guide to Mesh VPNs
 description: The golden age of VPNery is upon us.
 date: 2022-03-17
-uuid: fc6930ef-979c-4851-bc5a-c0e1b1698061
 ---
 <script>
     import Sidenote from '$lib/Sidenote.svelte';
diff --git a/src/routes/_posts/imagining-a-passwordless-future.svx b/src/routes/_posts/imagining-a-passwordless-future.svx
index ed574e4..f77a9d6 100644
--- a/src/routes/_posts/imagining-a-passwordless-future.svx
+++ b/src/routes/_posts/imagining-a-passwordless-future.svx
@@ -4,7 +4,6 @@ description: Can we replace passwords with something more user-friendly?
 date: 2021-04-30
 draft: true
 dropcap: false
-uuid: 696020b3-1513-42a8-b346-634d40f0e9d9
 ---
 <script>
     import Sidenote from '$lib/Sidenote.svelte';
diff --git a/src/routes/_posts/languages-high-and-low.svx b/src/routes/_posts/languages-high-and-low.svx
index 236378c..6db7e60 100644
--- a/src/routes/_posts/languages-high-and-low.svx
+++ b/src/routes/_posts/languages-high-and-low.svx
@@ -2,7 +2,6 @@
 title: 'Languages: High and Low'
 description: How high is up?
 date: 2022-08-19
-uuid: 89ae4194-7785-4fac-a841-8bcf5a5a3a2e
 draft: true
 ---
 
diff --git a/src/routes/_posts/sidenotes.svx b/src/routes/_posts/sidenotes.svx
index f3092ae..914e4a9 100644
--- a/src/routes/_posts/sidenotes.svx
+++ b/src/routes/_posts/sidenotes.svx
@@ -2,7 +2,6 @@
 title: Sidenotes
 description: An entirely-too-detailed dive into how I implemented sidenotes for this blog.
 date: 2023-08-14
-uuid: c514c46e-92f3-4078-a76b-e1dafd5f7e07
 ---
 <script>
     import Sidenote from '$lib/Sidenote.svelte';
diff --git a/src/routes/_posts/simpler-socketio.svx b/src/routes/_posts/simpler-socketio.svx
index d272241..bb592ad 100644
--- a/src/routes/_posts/simpler-socketio.svx
+++ b/src/routes/_posts/simpler-socketio.svx
@@ -2,7 +2,6 @@
 title: Let's Design A Simpler SocketIO
 date: 2021-10-16
 description: SocketIO is packed with features. But do we really need all of them all the time?
-uuid: 95cde7e7-9293-4fab-a0b4-fc6ab7da08c8
 draft: true
 ---
 
diff --git a/src/routes/_posts/sufficiently-advanced-technology-magic.svx b/src/routes/_posts/sufficiently-advanced-technology-magic.svx
index f072148..2699c21 100644
--- a/src/routes/_posts/sufficiently-advanced-technology-magic.svx
+++ b/src/routes/_posts/sufficiently-advanced-technology-magic.svx
@@ -2,7 +2,6 @@
 title: Sufficiently Advanced Technology Is Often Distinguishable From Magic
 description: I see what Arthur C. Clarke was getting at, but I don't think I agree.
 date: 2022-05-14
-uuid: 84636766-eb78-4060-a98d-593d8d5b55c9
 draft: true
 ---
 <script>
diff --git a/src/routes/_posts/vue-vs-svelte.svx b/src/routes/_posts/vue-vs-svelte.svx
index 580fc45..b19dd62 100644
--- a/src/routes/_posts/vue-vs-svelte.svx
+++ b/src/routes/_posts/vue-vs-svelte.svx
@@ -2,7 +2,6 @@
 title: Thoughts on Vue vs Svelte
 description: They're more similar than they are different, but they say the most bitter enemies are those who have the fewest differences.
 date: 2023-06-29
-uuid: 8280f0e0-6bf5-43a2-9eac-b8c2508cca29
 ---
 <script>
     import Sidenote from '$lib/Sidenote.svelte';
diff --git a/src/routes/feed/+server.js b/src/routes/feed/+server.js
index 536106e..ca578df 100644
--- a/src/routes/feed/+server.js
+++ b/src/routes/feed/+server.js
@@ -4,7 +4,7 @@ import { postData } from '../_posts/all.js';
 
 export function GET() {
     return new Response(renderFeed(), {
-        headers: {'Content-Type': 'text/xml'}
+        headers: {'Content-Type': 'application/atom+xml'}
     });
 }
 
@@ -12,9 +12,10 @@ export function GET() {
 function renderFeed() {
     const feed = tag('feed', {xmlns: 'http://www.w3.org/2005/Atom'});
 
-    feed.addTag('id', {}, [text('https://blog.jfmonty2.com')])
+    feed.addTag('id', {}, [text('https://blog.jfmonty2.com/')])
     feed.addTag('title', {}, [text("Joe's Blog")]);
-    feed.addTag('link', {href: 'https://blog.jfmonty2.com/'});
+    feed.addTag('link', {rel: 'alternate', href: 'https://blog.jfmonty2.com/'});
+    feed.addTag('link', {rel: 'self', href: 'https://blog.jfmonty2.com/feed/'});
 
     const lastUpdate = iso(postData[0].updated || postData[0].date);
     feed.addTag('updated', {}, [text(lastUpdate)]);
@@ -23,10 +24,11 @@ function renderFeed() {
     author.addTag('name', {}, [text('Joseph Montanaro')]);
 
     for (const post of postData) {
+        const url = `https://blog.jfmonty2.com/${post.slug}`
         const entry = feed.addTag('entry');
         entry.addTag('title', {}, [text(post.title)]);
-        entry.addTag('link', {rel: 'alternate', href: `https://blog.jfmonty2.com/${post.slug}`});
-        entry.addTag('id', {}, [text(post.uuid)]);
+        entry.addTag('link', {rel: 'alternate', href: url});
+        entry.addTag('id', {}, [text(url)]);
 
         const publishedDate = iso(post.date);
         entry.addTag('published', {}, [text(publishedDate)])