DakuTree / manga-tracker

application/models/Tracker_Model.php

Indentation +48 added lines, -48 removed lines

@@ -90,9 +90,9 @@ 
 
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$siteData = $query->row();
@@ -103,10 +103,10 @@ 
 
 	public function getTitleID(string $titleURL, int $siteID) {
 		$query = $this->db->select('id')
-		                  ->from('tracker_titles')
-		                  ->where('title_url', $titleURL)
-		                  ->where('site_id', $siteID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('title_url', $titleURL)
+						  ->where('site_id', $siteID)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$titleID = $query->row('id');
@@ -140,9 +140,9 @@ 
 			}
 			if($this->db->select('*')->where('user_id', $userID)->where('title_id', $titleID)->get('tracker_chapters')->num_rows() > 0) {
 				$success = $this->db->set(['current_chapter' => $chapter, 'last_updated' => NULL])
-				                    ->where('user_id', $userID)
-				                    ->where('title_id', $titleID)
-				                    ->update('tracker_chapters');
+									->where('user_id', $userID)
+									->where('title_id', $titleID)
+									->update('tracker_chapters');
 			} else {
 				$success = $this->db->insert('tracker_chapters', [
 					'user_id'         => $userID,
@@ -157,31 +157,31 @@ 
 
 	public function updateTrackerByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = $this->db->set(['current_chapter' => $chapter, 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
 
 	public function deleteTrackerByID(int $userID, int $chapterID) {
 		$success = $this->db->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->delete('tracker_chapters');
+							->where('id', $chapterID)
+							->delete('tracker_chapters');
 
 		return (bool) $success;
 	}
 	private function updateTitleById(int $id, string $latestChapter) {
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
 		$query = $this->db->select('latest_chapter, last_updated')
-		                  ->from('tracker_titles')
-		                  ->where('id', $id)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $id)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		//Update History
 		$this->History->updateTitleHistory($id, $row->latest_chapter, $row->last_updated);
@@ -190,16 +190,16 @@ 
 	}
 	private function updateTitleDataById(int $id, array $titleData) {
 		$success = $this->db->set($titleData)
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		return (bool) $success;
 	}
 	private function addTitle(string $titleURL, int $siteID) {
 		$query = $this->db->select('site, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('id', $siteID)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('id', $siteID)
+						  ->get();
 
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL);
 		$this->db->insert('tracker_titles', array_merge($titleData, ['title_url' => $titleURL, 'site_id' => $siteID]));
@@ -224,18 +224,18 @@ 
 		                      tracker_titles.last_updated,
 		                      from_unixtime(MAX(auth_users.last_login)) AS timestamp
 		                  ')
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-		                  ->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
-		                  ->where('tracker_sites.status = "enabled"')
-		                  ->where('(`complete` = "N" AND (`latest_chapter` = NULL OR `last_checked` < DATE_SUB(NOW(), INTERVAL 12 HOUR)))', NULL, FALSE) //TODO: Each title should have specific interval time?
-		                  ->or_where('(`complete` = "Y" AND `last_checked` < DATE_SUB(NOW(), INTERVAL 1 WEEK))', NULL, FALSE)
-		                  ->group_by('tracker_titles.id')
-		                  ->having('timestamp IS NOT NULL')
-		                  ->having('timestamp > DATE_SUB(NOW(), INTERVAL 120 HOUR)')
-		                  ->order_by('tracker_titles.title', 'ASC')
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
+						  ->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
+						  ->where('tracker_sites.status = "enabled"')
+						  ->where('(`complete` = "N" AND (`latest_chapter` = NULL OR `last_checked` < DATE_SUB(NOW(), INTERVAL 12 HOUR)))', NULL, FALSE) //TODO: Each title should have specific interval time?
+						  ->or_where('(`complete` = "Y" AND `last_checked` < DATE_SUB(NOW(), INTERVAL 1 WEEK))', NULL, FALSE)
+						  ->group_by('tracker_titles.id')
+						  ->having('timestamp IS NOT NULL')
+						  ->having('timestamp > DATE_SUB(NOW(), INTERVAL 120 HOUR)')
+						  ->order_by('tracker_titles.title', 'ASC')
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			foreach ($query->result() as $row) {
@@ -248,8 +248,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						//Update History
 						$this->History->updateTitleHistory((int) $row->id, $titleData['latest_chapter'], $titleData['last_updated']);
@@ -362,9 +362,9 @@ 
 	}
 	public function setCategoryTrackerByID(int $userID, int $chapterID, string $category) : bool {
 		$success = $this->db->set(['category' => $category, 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
@@ -374,9 +374,9 @@ 
 		$success = FALSE;
 		if(preg_match("/^[a-z0-9-_,]{0,255}$/", $tag_string)) {
 			$success = $this->db->set(['tags' => $tag_string, 'last_updated' => NULL])
-			                    ->where('user_id', $userID)
-			                    ->where('id', $chapterID)
-			                    ->update('tracker_chapters');
+								->where('user_id', $userID)
+								->where('id', $chapterID)
+								->update('tracker_chapters');
 		}
 
 		return (bool) $success;
@@ -386,9 +386,9 @@ 
 		$usedCategories = [];
 
 		$query = $this->db->distinct()
-		                  ->select('category')
-		                  ->from('tracker_chapters')
-		                  ->get();
+						  ->select('category')
+						  ->from('tracker_chapters')
+						  ->get();
 
 		return array_column($query->result_array(), 'category');
 	}

application/models/History_Model.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
 
 	public function getCurrentChapter(int $titleID) : string {
 		$query = $this->db->select('latest_chapter')
-		                  ->from('tracker_titles')
-		                  ->where('id', $titleID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $titleID)
+						  ->get();
 
 		return $query->row()->latest_chapter;
 	}