From 4e711265ff0a821c4ceb88467c54576b23df17d2 Mon Sep 17 00:00:00 2001
From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com>
Date: Fri, 13 Jun 2025 17:42:02 -0400
Subject: [PATCH] Well I sure botched the feeds.

---
 templates/feed/atom.php | 13 ++++++++-----
 templates/feed/rss.php  |  8 +++++++-
 templates/main.php      | 16 +++++++++++++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/templates/feed/atom.php b/templates/feed/atom.php
index 892af8b..3c92864 100644
--- a/templates/feed/atom.php
+++ b/templates/feed/atom.php
@@ -3,16 +3,19 @@
 <?php
 $siteTitle = htmlspecialchars($config->siteTitle);
 $siteUrl = htmlspecialchars($config->baseUrl);
-$basePath = $siteUrl . htmlspecialchars($config->basePath);
+$basePath = htmlspecialchars($config->basePath);
 $updated = date(DATE_ATOM, strtotime($ticks[0]['timestamp'] ?? 'now'));
 
 header('Content-Type: application/atom+xml; charset=utf-8');
 echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
 ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <title><?= $siteTitle ?></title>
-  <link ref="<?= $siteUrl ?>feed/atom" rel="self"/>
-  <link href="<?= $siteUrl ?>"/>
+  <title><?= "$siteTitle Atom Feed" ?></title>
+  <link rel="self"
+        type="application/atom+xml"
+        title="<?php echo htmlspecialchars($config->siteTitle) ?> Atom Feed"
+        href="<?php echo htmlspecialchars($siteUrl . $basePath) ?>feed/atom" />
+  <link rel="alternate" href="<?= $siteUrl ?>"/>
   <updated><?= $updated ?></updated>
   <id><?= $siteUrl ?></id>
   <author>
@@ -27,7 +30,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     [$hour, $minute, $second] = $timeParts;
 
     $tickPath = "$year/$month/$day/$hour/$minute/$second";
-    $tickUrl = htmlspecialchars($basePath . "tick/$tickPath");
+    $tickUrl = htmlspecialchars($siteUrl . $basePath . "tick/$tickPath");
     $tickTime = date(DATE_ATOM, strtotime($tick['timestamp']));
     $tickText = htmlspecialchars($tick['tick']);
 ?>
diff --git a/templates/feed/rss.php b/templates/feed/rss.php
index 4822a36..79a6ff3 100644
--- a/templates/feed/rss.php
+++ b/templates/feed/rss.php
@@ -10,7 +10,13 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
 <rss version="2.0">
 <channel>
     <title>My tkr</title>
-    <link rel="alternate" type="application/rss+xml" title="Tick RSS" href="/tkr/rss/">
+    <link rel="self"
+          type="application/rss+xml"
+          title="<?php echo htmlspecialchars($config->siteTitle) ?> RSS Feed"
+          href="<?php echo htmlspecialchars($config->baseUrl . $config->basePath)?>feed/rss/" />
+    <link rel="alternate"
+          type="text/html"
+          href=<?php echo htmlspecialchars($config->baseUrl . $config->basePath) ?> />
     <description>My tkr</description>
     <language>en-us</language>
     <lastBuildDate><?php echo date(DATE_RSS); ?></lastBuildDate>
diff --git a/templates/main.php b/templates/main.php
index e791827..61e5966 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -8,10 +8,20 @@
         <title><?= $config->siteTitle ?></title>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <link rel="stylesheet" href="<?= htmlspecialchars($config->basePath) ?>css/tkr.css?v=<?= time() ?>">
+        <link rel="stylesheet"
+              href="<?= htmlspecialchars($config->basePath) ?>css/tkr.css?v=<?= time() ?>">
 <?php if (!empty($config->cssId)): ?>
-        <link rel="stylesheet" href="<?= htmlspecialchars($config->basePath) ?>css/custom/<?= htmlspecialchars($config->customCssFilename()) ?>">
-<?php endif; ?>   
+        <link rel="stylesheet"
+              href="<?= htmlspecialchars($config->basePath) ?>css/custom/<?= htmlspecialchars($config->customCssFilename()) ?>">
+<?php endif; ?>
+        <link rel="alternate"
+              type="application/rss+xml"
+              title="<?php echo htmlspecialchars($config->siteTitle) ?> RSS Feed"
+              href="<?php echo htmlspecialchars($config->baseUrl . $config->basePath)?>feed/rss/" />   
+        <link rel="alternate"
+              type="application/atom+xml"
+              title="<?php echo htmlspecialchars($config->siteTitle) ?> Atom Feed"
+              href="<?php echo htmlspecialchars($config->baseUrl . $config->basePath)?>feed/atom/" />   
     </head>
     <body>
 <?php include TEMPLATES_DIR . '/partials/navbar.php'?>