Fix feed links, clean up single tick pages (#69)

Fix feed links. Clean up single-tick page.

Reviewed-on: https://gitea.subcultureofone.org/greg/tkr/pulls/69
Co-authored-by: Greg Sarjeant <greg@subcultureofone.org>
Co-committed-by: Greg Sarjeant <greg@subcultureofone.org>

public/css/default.css

@@ -370,6 +370,11 @@ time {
     font-size: 1.0em;
     display: block;
 }
+.tick-meta {
+    color: var(--color-log-muted);
+    font-size: 0.9em;
+    margin-bottom: 0.4em;
+}
 
 .tick-pagination a {
     margin: 0 5px;

public/index.php

@@ -118,7 +118,7 @@ if ($method === 'POST' && $path != 'tkr-setup') {
     if ($path != 'login'){
         if (!Session::isValid($_POST['csrf_token'])) {
             // Invalid session - redirect to /login
-            Log::info('Attempt to POST with invalid session. Redirecting to login.');
+            Log::warning('Attempt to POST with invalid session. Redirecting to login.');
             header('Location: ' . Util::buildRelativeUrl($app['settings']->basePath, 'login'));
             exit;
         }

src/Controller/HomeController/HomeController.php

@@ -6,8 +6,8 @@ class HomeController extends Controller {
     // renders the homepage view.
     public function index(){
         $page = isset($_GET['page']) ? max(1, (int)$_GET['page']) : 1;
-        $data = $this->getHomeData($page);
+        $vars = $this->getHomeData($page);
-        $this->render("home.php", $data);
+        $this->render("home.php", $vars);
     }
 
     public function getHomeData(int $page): array {

src/Controller/TickController/TickController.php

@@ -2,22 +2,27 @@
 declare(strict_types=1);
 
 class TickController extends Controller{
-    public function index(int $id){
+    public function index(string $id){
+        // This is because my router is too simplistic to cleanly handle type casting,
+        // so I just accept a sting here and cast it to an int immediately.
+        $id = (int) $id;
         global $app;
+        $vars = ['settings' => $app['settings']];
 
         Log::debug("Fetching tick with ID: {$id}");
 
         try {
             $tickModel = new TickModel($app['db'], $app['settings']);
-            $vars = $tickModel->get($id);
+            $tick = $tickModel->get($id);
 
-            if (empty($vars) || !isset($vars['tick'])) {
+            if (empty($tick) || !isset($tick['tick'])) {
                 Log::warning("Tick not found for ID: {$id}");
                 http_response_code(404);
-                echo '<h1>404 - Tick Not Found</h1>';
+                $this->render('tick-404.php', $vars);
                 return;
             }
 
+            $vars = array_merge($tick, $vars);
             Log::info("Successfully loaded tick {$id}: " . substr($vars['tick'], 0, 50) . (strlen($vars['tick']) > 50 ? '...' : ''));
             $this->render('tick.php', $vars);
 

src/Feed/AtomGenerator.php

@@ -41,7 +41,7 @@ class AtomGenerator extends FeedGenerator {
     $tickUrl = Util::escape_xml($siteUrl . $tickPath);
     $tickTime = date(DATE_ATOM, strtotime($tick['timestamp']));
     $tickTitle = Util::escape_xml($tick['tick']);
-    $tickContent = Util::linkify($tickTitle);
+    $tickContent = Util::escape_xml(Util::linkify(Util::escape_html($tick['tick'])));
 ?>
   <entry>
     <title><?= $tickTitle ?></title>

src/Feed/RssGenerator.php

@@ -35,10 +35,11 @@ class RssGenerator extends FeedGenerator {
     $tickUrl = Util::escape_xml($this->buildTickUrl($tick['id']));
     $tickDate = date(DATE_RSS, strtotime($tick['timestamp']));
     $tickTitle = Util::escape_xml($tick['tick']);
-    $tickDescription = Util::linkify($tickTitle);
+    $tickDescription = Util::escape_xml(Util::linkify(Util::escape_html($tick['tick'])));
+    Log::debug("RSS item: {$tickDescription}");
 ?>
     <item>
-        <title><?php echo $tickTitle ?></title>
+        <title><?php echo $tickTitle; ?></title>
         <link><?php echo $tickUrl; ?></link>
         <description><?php echo $tickDescription; ?></description>
         <pubDate><?php echo $tickDate; ?></pubDate>

src/Model/TickModel/TickModel.php

@@ -41,7 +41,6 @@ class TickModel {
         return [
             'tickTime' => $row['timestamp'],
             'tick' => $row['tick'],
-            'settings' => $this->settings,
         ];
     }
 

templates/partials/tick-404.php

@@ -0,0 +1,4 @@
+        <div class="not-found-container">
+            <h1>Tick Not Found</h1>
+            <p>The tick you're looking for has been deleted or never existed.</p>
+        </div>

templates/partials/tick.php

@@ -1,4 +1,14 @@
 <?php /** @var Date $tickTime */ ?>
 <?php /** @var string $tick */ ?>
-        <h1>Tick from <?= $tickTime; ?></h1>
+<?php $displayTime = DateTimeImmutable::createFromformat('Y-m-d H:i:s', $tickTime) ?>
-        <p><?= Util::linkify(Util::escape_html($tick)) ?></p>
+        <div class="tick-container">
+            <article class="tick">
+                <header class="tick-header">
+                    <h1>Tick</h1>
+                    <p class="tick-meta">Posted on <time class="tick-meta" datetime="<?= $displayTime->format('c') ?>"><?= $displayTime->format('F j, Y \a\t g:i A') ?></time> UTC</p>
+                </header>
+                <div class="tick-text">
+                    <?= Util::linkify(Util::escape_html($tick)) ?>
+                </div>
+            </article>
+        </div>

tests/Controller/TickController/TickControllerTest.php

@@ -62,7 +62,7 @@ class TickControllerTest extends TestCase
         ob_start();
 
         $controller = new TickController();
-        $controller->index(123);
+        $controller->index("123");
 
         $output = ob_get_clean();
 
@@ -96,12 +96,12 @@ class TickControllerTest extends TestCase
         ob_start();
 
         $controller = new TickController();
-        $controller->index(999);
+        $controller->index("999");
 
         $output = ob_get_clean();
 
         // Should return 404 error
-        $this->assertStringContainsString('404 - Tick Not Found', $output);
+        $this->assertStringContainsString('Tick Not Found', $output);
     }
 
     public function testIndexWithEmptyTickData(): void
@@ -125,12 +125,12 @@ class TickControllerTest extends TestCase
         ob_start();
 
         $controller = new TickController();
-        $controller->index(456);
+        $controller->index("456");
 
         $output = ob_get_clean();
 
         // Should return 404 error for empty data
-        $this->assertStringContainsString('404 - Tick Not Found', $output);
+        $this->assertStringContainsString('Tick Not Found', $output);
     }
 
     public function testIndexWithDatabaseException(): void
@@ -145,7 +145,7 @@ class TickControllerTest extends TestCase
         ob_start();
 
         $controller = new TickController();
-        $controller->index(123);
+        $controller->index("123");
 
         $output = ob_get_clean();