TTRSS_API getUnread

Alkarex · Alkarex · commit 511f7291d77a · 2017-05-08T21:28:45.000+02:00
FreshRSS/Extensions#15
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
@@ -858,9 +858,11 @@ public function count($minPriority = null) {
 		return $res[0];
 	}
 	public function countNotRead($minPriority = null) {
-		$sql = 'SELECT COUNT(e.id) AS count FROM `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE is_read=0';
+		$sql = 'SELECT COUNT(e.id) AS count FROM `' . $this->prefix . 'entry` e ';
 		if ($minPriority !== null) {
-			$sql = ' AND priority > ' . intval($minPriority);
+			$sql .= 'INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE is_read=0 AND f.priority > ' . intval($minPriority);
+		} else {
+			$sql .= 'WHERE is_read=0';
 		}
 		$stm = $this->bd->prepare($sql);
 		$stm->execute();
diff --git a/p/api/ttrss.php b/p/api/ttrss.php
@@ -490,7 +490,10 @@ public function getFeedTree() {
 	}
 
 	public function getUnread() {
-		Minz_Log::warning('TTRSS API: getUnread() not implemented');
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$this->good(array(
+				'unread' => $entryDAO->countNotRead(),
+			));
 	}
 	public function getArticle() {
 		Minz_Log::warning('TTRSS API: getArticle() not implemented');

Original file line number	Diff line number	Diff line change
`@@ -858,9 +858,11 @@ public function count($minPriority = null) {`
`858`	`858`	`return $res[0];`
`859`	`859`	`}`
`860`	`860`	`public function countNotRead($minPriority = null) {`
`861`		- $sql = 'SELECT COUNT(e.id) AS count FROM `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE is_read=0';
	`861`	+ $sql = 'SELECT COUNT(e.id) AS count FROM `' . $this->prefix . 'entry` e ';
`862`	`862`	`if ($minPriority !== null) {`
`863`		`- $sql = ' AND priority > ' . intval($minPriority);`
	`863`	+ $sql .= 'INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id WHERE is_read=0 AND f.priority > ' . intval($minPriority);
	`864`	`+ } else {`
	`865`	`+ $sql .= 'WHERE is_read=0';`
`864`	`866`	`}`
`865`	`867`	`$stm = $this->bd->prepare($sql);`
`866`	`868`	`$stm->execute();`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,10 @@ public function getFeedTree() {`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`public function getUnread() {`
`493`		`- Minz_Log::warning('TTRSS API: getUnread() not implemented');`
	`493`	`+ $entryDAO = FreshRSS_Factory::createEntryDao();`
	`494`	`+ $this->good(array(`
	`495`	`+ 'unread' => $entryDAO->countNotRead(),`
	`496`	`+ ));`
`494`	`497`	`}`
`495`	`498`	`public function getArticle() {`
`496`	`499`	`Minz_Log::warning('TTRSS API: getArticle() not implemented');`