From: Andrew Dolgov Date: Wed, 16 Dec 2009 11:16:56 +0000 (+0300) Subject: api: show virtual feeds in getFeeds (fixes) X-Git-Tag: 1.4.0~183^2~9 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=53aff642cabbe5d72f0395f48e77121111e314ff;p=tt-rss.git api: show virtual feeds in getFeeds (fixes) --- diff --git a/api/index.php b/api/index.php index f0f7aa20..6cae3087 100644 --- a/api/index.php +++ b/api/index.php @@ -121,7 +121,9 @@ } } - if (!$cat_id || $cat_id == -1) { + /* Labels */ + + if (!$cat_id || $cat_id == -2) { $counters = getLabelCounters($link, false, true); foreach (array_keys($counters) as $id) { @@ -134,7 +136,7 @@ "id" => $id, "title" => $counters[$id]["description"], "unread" => $counters[$id]["counter"], - "cat_id" => -1, + "cat_id" => -2, ); array_push($feeds, $row); @@ -142,6 +144,27 @@ } } + /* Virtual feeds */ + + if (!$cat_id || $cat_id == -1) { + foreach (array(-1, -2, -3, -4) as $i) { + $unread = getFeedUnread($link, $i); + + if ($unread || !$unread_only) { + $title = getFeedTitle($link, $i); + + $row = array( + "id" => $i, + "title" => $title, + "unread" => $unread, + "cat_id" => -1, + ); + array_push($feeds, $row); + } + + } + } + print json_encode($feeds); break; @@ -276,6 +299,7 @@ $article = array( "title" => $line["title"], "link" => $line["link"], + "labels" => get_article_labels($link, $article_id), "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), "published" => sql_bool_to_bool($line["published"]),