From 1f9024763d9224c4cd9a181bac27e6b9f12ad672 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Wed, 18 Sep 2024 14:14:53 -0400
Subject: refactor

---
 src/web/_views/apps/blog.php      | 6 +++---
 src/web/_views/apps/blog_post.php | 2 +-
 src/web/_views/apps/blog_rss.php  | 5 +++--
 src/web/_views/apps/bucket.php    | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/web/_views/apps')

diff --git a/src/web/_views/apps/blog.php b/src/web/_views/apps/blog.php
index 7290f0e..f64453c 100644
--- a/src/web/_views/apps/blog.php
+++ b/src/web/_views/apps/blog.php
@@ -1,13 +1,13 @@
 <?php /* Copyright (c) 2024 Freya Murphy */ ?>
 <?=aria_section('blog', lang('title'))?>
-	<p><?=lang('blog_desc', sub: [$this->main->get_url('rss.xml')])?></p>
+	<p><?=lang('blog_desc', sub: [$this->get_url('rss.xml')])?></p>
 	<?php
 		foreach($blog as $name => $post) {
 			$meta = $post['meta'];
-			$link = $this->main->get_url('blog/post?name=' . $name);
+			$link = $this->get_url('blog/post/' . substr($name, 0, -3));
 			echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
 			echo '<span>' . $meta['desc'] . '</span><br>';
-			echo '<span><time>' . $this->main->format_date($meta['date']) . '</time></span>';
+			echo '<span><time>' . $this->format_date($meta['date']) . '</time></span>';
 		}
 	?>
 </div>
diff --git a/src/web/_views/apps/blog_post.php b/src/web/_views/apps/blog_post.php
index d5ad255..8b45a62 100644
--- a/src/web/_views/apps/blog_post.php
+++ b/src/web/_views/apps/blog_post.php
@@ -1,6 +1,6 @@
 <?php /* Copyright (c) 2024 Freya Murphy */ ?>
 <?=aria_section('post', $post['meta']['name'])?>
-	<span><?=ucfirst(lang('posted'))?>: <time><?=$this->main->format_date($post['meta']['date'])?></time></span>
+	<span><?=ucfirst(lang('posted'))?>: <time><?=$this->format_date($post['meta']['date'])?></time></span>
 	<br>
 	<?=$post['content']?>
 </div>
diff --git a/src/web/_views/apps/blog_rss.php b/src/web/_views/apps/blog_rss.php
index c3b1c84..e112389 100644
--- a/src/web/_views/apps/blog_rss.php
+++ b/src/web/_views/apps/blog_rss.php
@@ -7,12 +7,13 @@
 		<language><?=lang('lang_short')?></language>
 	<?php
 		foreach ($blog as $name => $post) {
+			$name = substr($name, 0, -3);
 			echo '<item>';
 			echo '<title>' . $post['meta']['name'] . '</title>';
 			echo '<description>' . $post['meta']['desc'] . '</description>';
 			echo '<pubDate>' . $post['meta']['date'] . '</pubDate>';
-			echo '<link>' . lang('root_url') . 'blog/post?name=' . $name . '</link>';
-			echo '<guid>' . lang('root_url') . 'blog/post?name=' . $name . '</guid>';
+			echo '<link>' . lang('root_url') . 'blog/post/' . $name . '</link>';
+			echo '<guid>' . lang('root_url') . 'blog/post/' . $name . '</guid>';
 			echo '</item>';
 		}
 	?>
diff --git a/src/web/_views/apps/bucket.php b/src/web/_views/apps/bucket.php
index 72c349b..aeb6cf3 100644
--- a/src/web/_views/apps/bucket.php
+++ b/src/web/_views/apps/bucket.php
@@ -3,9 +3,9 @@
         $root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name;
         $this->view('head', $data);
         if ($lightmode === 'true') {
-            echo $this->main->link_css('css/bucket_light.css');
+            echo $this->link_css('css/bucket_light.css');
         } else {
-            echo $this->main->link_css('css/bucket.css');
+            echo $this->link_css('css/bucket.css');
         }
     ?>
         <base target="_parent" />
-- 
cgit v1.2.3-freya