6 files changed, 41 insertions, 52 deletions

diff --git a/web/routes/home/controller.php b/web/_controller/apps/home.php
index 775e43a..25c8c4e 100644
--- a/web/routes/home/controller.php
+++ b/web/_controller/apps/home.php
@@ -1,22 +1,31 @@
 <?php /* Copyright (c) 2024 Freya Murphy */
-class HomeController extends Controller {
+class Home_controller extends Controller {
 
-	private $model;
+	// the home model
+	private $home_model;
 
-	function __construct($model) {
-		parent::__construct();
-		$this->model = $model;
+	// the request model
+	private $request_model;
+
+	// the caceh model
+	private $cache_model;
+
+	function __construct($load) {
+		parent::__construct($load);
+		$this->home_model = $this->load->model('apps/home');
+		$this->request_model = $this->load->model('request');
+		$this->cache_model = $this->load->model('cache');
 	}
 
-	public function index() {
+	public function index(): void {
 		parent::index();
-		$data = $this->model->get_data();
+		$data = $this->home_model->get_data();
 		$this->view('header', $data);
-		$this->app_view('main', $data);
+		$this->view('apps/home/main', $data);
 	}
 
-	public function posts() {
-		$page = $this->main->get_num('page', 0);
+	public function posts(): void {
+		$page = $this->request_model->get_int('page', 0);
 		$page_size = 20;
 		$offset = $page * $page_size;
 
@@ -30,7 +39,7 @@ class HomeController extends Controller {
 			$query = $query->select('p.*, FALSE as liked');
 		}
 
-		$query = $query->from('admin.post p');
+		$query = $query->from('api.post p');
 
 		if ($user) {
 			$query = $query->join('admin.like l', 'p.id = l.post_id')
@@ -42,7 +51,7 @@ class HomeController extends Controller {
 			->offset($offset)
 			->rows();
 
-		$users = $this->main->get_users($posts);
+		$users = $this->cache_model->get_users($posts);
 
 		foreach ($posts as $post) {
 			$data = array();
@@ -52,9 +61,9 @@ class HomeController extends Controller {
 		}
 	}
 
-	public function comments() {
-		$page = $this->main->get_num('page', 0);
-		$id = $this->main->get_num('id');
+	public function comments(): void {
+		$page = $this->request_model->get_int('page', 0);
+		$id = $this->request_model->get_int('id');
 		$page_size = 20;
 		$offset = $page * $page_size;
 
@@ -65,7 +74,7 @@ class HomeController extends Controller {
 			->offset($offset)
 			->rows();
 
-		$users = $this->main->get_users($comments);
+		$users = $this->cache_model->get_users($comments);
 
 		foreach ($comments as $comment) {
 			$data = array();
@@ -75,10 +84,6 @@ class HomeController extends Controller {
 		}
 	}
 
-	public function new_post_modal() {
-		$this->modal(lang('new_post_modal_title'), 'new-post');
-	}
-
 }
 
 ?>
diff --git a/web/routes/error/model.php b/web/_model/apps/error.php
index a30fccc..ad72b28 100644
--- a/web/routes/error/model.php
+++ b/web/_model/apps/error.php
@@ -1,5 +1,9 @@
 <?php /* Copyright (c) 2024 Freya Murphy */
-class ErrorModel extends Model {
+class Error_model extends Model {
+
+	function __construct($load) {
+		parent::__construct($load);
+	}
 
 	private function get_msg(&$data) {
 		if (!array_key_exists('code', $_GET)) {
@@ -22,7 +26,7 @@ class ErrorModel extends Model {
 		}
 	}
 
-	public function get_data() {
+	public function get_data(): array {
 		$data = parent::get_data();
 		$this->get_msg($data);
 		return $data;
diff --git a/web/routes/home/model.php b/web/_model/apps/home.php
index 44a8549..82fbf26 100644
--- a/web/routes/home/model.php
+++ b/web/_model/apps/home.php
@@ -1,7 +1,11 @@
 <?php /* Copyright (c) 2024 Freya Murphy */
-class HomeModel extends Model {
+class Home_model extends Model {
 
-	private function get_posts() {
+	function __construct($load) {
+		parent::__construct($load);
+	}
+
+	private function get_posts(): array {
 		return $this->db
 			->select('*')
 			->from('admin.post')
@@ -9,11 +13,10 @@ class HomeModel extends Model {
 			->rows();
 	}
 
-	public function get_data() {
+	public function get_data(): array {
 		$data = parent::get_data();
 		$data['title'] = lang('title');
 		$data['posts'] = $this->get_posts();
 		return $data;
 	}
 }
-?>
diff --git a/web/routes/error/controller.php b/web/routes/error/controller.php
deleted file mode 100644
index 3cb2345..0000000
--- a/web/routes/error/controller.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */
-class ErrorController extends Controller {
-
-	private $model;
-
-	function __construct($model) {
-		parent::__construct();
-		$this->model = $model;
-	}
-
-	public function index() {
-		parent::index();
-		$data = $this->model->get_data();
-		$this->view('header', $data);
-		$this->app_view('error', $data);
-	}
-
-}
-
-?>
diff --git a/web/routes/error/views/error.php b/web/routes/error/views/error.php
deleted file mode 100644
index 3b926bc..0000000
--- a/web/routes/error/views/error.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="error">
-	<h1><?=$title?></h1>
-	<span><?=$msg?></span>
-</div>
diff --git a/web/routes/home/views/main.php b/web/views/apps/home/main.php
index bf0087b..b1c1efc 100644
--- a/web/routes/home/views/main.php
+++ b/web/views/apps/home/main.php
@@ -1,4 +1,5 @@
-<?php // vi: syntax=php ?>
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?php /* vi: syntax=php */ ?>
 <div id="main-content">
 <?php if ($self): ?>
 	<div id="new-post" class="card">
@@ -15,7 +16,7 @@
 		</div>
 		<script>
 			$('#action-new-post').on('click', function() {
-				$.get( "/home/new_post_modal", function (data) {
+				$.get( "/modal/new_post", function (data) {
 					$(document.body).append(data);
 				});
 			})