From f5a0fb8b64c57e98fcf73369cb4dbb1b31620fd7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 01:29:36 +0300 Subject: queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating --- classes/api.php | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 8267572f4..1a52c9257 100644 --- a/classes/api.php +++ b/classes/api.php @@ -658,11 +658,30 @@ class API extends Handler { } } - $qfh_ret = queryFeedHeadlines($feed_id, $limit, + /*$qfh_ret = queryFeedHeadlines($feed_id, $limit, $view_mode, $is_cat, $search, false, - $order, $offset, 0, false, $since_id, $include_nested); - - $result = $qfh_ret[0]; + $order, $offset, 0, false, $since_id, $include_nested);*/ + + //function queryFeedHeadlines($feed, $limit, + // $view_mode, $cat_view, $search, $search_mode, + // $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, + // $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) { + + $params = array( + "feed" => $feed_id, + "limit" => $limit, + "view_mode" => $view_mode, + "cat_view" => $is_cat, + "search" => $search, + "override_order" => $order, + "offset" => $offset, + "since_id" => $since_id, + "include_children" => $include_nested, + ); + + $qfh_ret = queryFeedHeadlines($params); + + $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; $headlines = array(); -- cgit v1.2.3 From 34440201006344012ed01e37f883f2f0c11fcba7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 12:01:34 +0300 Subject: report top id changed in headlines buffer --- classes/api.php | 110 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 54 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 1a52c9257..30bde1ffe 100644 --- a/classes/api.php +++ b/classes/api.php @@ -681,47 +681,48 @@ class API extends Handler { $qfh_ret = queryFeedHeadlines($params); - $result = $qfh_ret[0]; + $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; $headlines = array(); - while ($line = db_fetch_assoc($result)) { - $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length); - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { - $line = $p->hook_query_headlines($line, $excerpt_length, true); - } - - $is_updated = ($line["last_read"] == "" && - ($line["unread"] != "t" && $line["unread"] != "1")); + if (is_resource($result)) { + while ($line = db_fetch_assoc($result)) { + $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { + $line = $p->hook_query_headlines($line, $excerpt_length, true); + } - $tags = explode(",", $line["tag_cache"]); + $is_updated = ($line["last_read"] == "" && + ($line["unread"] != "t" && $line["unread"] != "1")); - $label_cache = $line["label_cache"]; - $labels = false; + $tags = explode(",", $line["tag_cache"]); - if ($label_cache) { - $label_cache = json_decode($label_cache, true); + $label_cache = $line["label_cache"]; + $labels = false; if ($label_cache) { - if ($label_cache["no-labels"] == 1) - $labels = array(); - else - $labels = $label_cache; + $label_cache = json_decode($label_cache, true); + + if ($label_cache) { + if ($label_cache["no-labels"] == 1) + $labels = array(); + else + $labels = $label_cache; + } } - } - if (!is_array($labels)) $labels = get_article_labels($line["id"]); + if (!is_array($labels)) $labels = get_article_labels($line["id"]); - //if (!$tags) $tags = get_article_tags($line["id"]); - //if (!$labels) $labels = get_article_labels($line["id"]); + //if (!$tags) $tags = get_article_tags($line["id"]); + //if (!$labels) $labels = get_article_labels($line["id"]); - $headline_row = array( + $headline_row = array( "id" => (int)$line["id"], "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), "published" => sql_bool_to_bool($line["published"]), - "updated" => (int) strtotime($line["updated"]), + "updated" => (int)strtotime($line["updated"]), "is_updated" => $is_updated, "title" => $line["title"], "link" => $line["link"], @@ -729,49 +730,50 @@ class API extends Handler { "tags" => $tags, ); - if ($include_attachments) - $headline_row['attachments'] = get_article_enclosures( - $line['id']); + if ($include_attachments) + $headline_row['attachments'] = get_article_enclosures( + $line['id']); - if ($show_excerpt) - $headline_row["excerpt"] = $line["content_preview"]; + if ($show_excerpt) + $headline_row["excerpt"] = $line["content_preview"]; - if ($show_content) { + if ($show_content) { - if ($sanitize_content) { - $headline_row["content"] = sanitize( - $line["content"], - sql_bool_to_bool($line['hide_images']), - false, $line["site_url"], false, $line["id"]); - } else { - $headline_row["content"] = $line["content"]; + if ($sanitize_content) { + $headline_row["content"] = sanitize( + $line["content"], + sql_bool_to_bool($line['hide_images']), + false, $line["site_url"], false, $line["id"]); + } else { + $headline_row["content"] = $line["content"]; + } } - } - // unify label output to ease parsing - if ($labels["no-labels"] == 1) $labels = array(); + // unify label output to ease parsing + if ($labels["no-labels"] == 1) $labels = array(); - $headline_row["labels"] = $labels; + $headline_row["labels"] = $labels; - $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : - $feed_title; + $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : + $feed_title; - $headline_row["comments_count"] = (int)$line["num_comments"]; - $headline_row["comments_link"] = $line["comments"]; + $headline_row["comments_count"] = (int)$line["num_comments"]; + $headline_row["comments_link"] = $line["comments"]; - $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); + $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); - $headline_row["author"] = $line["author"]; + $headline_row["author"] = $line["author"]; - $headline_row["score"] = (int)$line["score"]; - $headline_row["note"] = $line["note"]; - $headline_row["lang"] = $line["lang"]; + $headline_row["score"] = (int)$line["score"]; + $headline_row["note"] = $line["note"]; + $headline_row["lang"] = $line["lang"]; - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { - $headline_row = $p->hook_render_article_api(array("headline" => $headline_row)); - } + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { + $headline_row = $p->hook_render_article_api(array("headline" => $headline_row)); + } - array_push($headlines, $headline_row); + array_push($headlines, $headline_row); + } } return $headlines; -- cgit v1.2.3 From 5c784e701c5a2715e94479ee202a5c179398a0e0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 12:26:09 +0300 Subject: api: add top id stuff, optionally return header w/ status information in getHeadlines (currently only top_id_changed) --- classes/api.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 30bde1ffe..af16d0658 100644 --- a/classes/api.php +++ b/classes/api.php @@ -203,6 +203,8 @@ class API extends Handler { $force_update = sql_bool_to_bool($_REQUEST["force_update"]); $has_sandbox = sql_bool_to_bool($_REQUEST["has_sandbox"]); $excerpt_length = (int)$this->dbh->escape_string($_REQUEST["excerpt_length"]); + $check_top_id = (int)$this->dbh->escape_string($_REQUEST["check_top_id"]); + $include_header = sql_bool_to_bool($_REQUEST["include_header"]); $_SESSION['hasSandbox'] = $has_sandbox; @@ -223,12 +225,16 @@ class API extends Handler { $search = $this->dbh->escape_string($_REQUEST["search"]); - $headlines = $this->api_get_headlines($feed_id, $limit, $offset, + list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, - $include_nested, $sanitize_content, $force_update, $excerpt_length); + $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_top_id); - $this->wrap(self::STATUS_OK, $headlines); + if ($include_header) { + $this->wrap(self::STATUS_OK, array($headlines_header, $headlines)); + } else { + $this->wrap(self::STATUS_OK, $headlines); + } } else { $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE')); } @@ -635,7 +641,8 @@ class API extends Handler { static function api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, - $search = "", $include_nested = false, $sanitize_content = true, $force_update = false, $excerpt_length = 100) { + $search = "", $include_nested = false, $sanitize_content = true, + $force_update = false, $excerpt_length = 100, $check_top_id = false) { if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { // Update the feed if required with some basic flood control @@ -677,6 +684,7 @@ class API extends Handler { "offset" => $offset, "since_id" => $since_id, "include_children" => $include_nested, + "check_top_id" => $check_top_id ); $qfh_ret = queryFeedHeadlines($params); @@ -685,6 +693,7 @@ class API extends Handler { $feed_title = $qfh_ret[1]; $headlines = array(); + $headlines_header = array(); if (is_resource($result)) { while ($line = db_fetch_assoc($result)) { @@ -774,9 +783,11 @@ class API extends Handler { array_push($headlines, $headline_row); } + } else if (is_numeric($result) && $result == -1) { + $headlines_header['top_id_changed'] = true; } - return $headlines; + return array($headlines, $headlines_header); } function unsubscribeFeed() { -- cgit v1.2.3 From 491f69c7e363ac751d2207813f6f0a9424c93505 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 12:27:18 +0300 Subject: bump api level --- classes/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index af16d0658..c61f522cb 100644 --- a/classes/api.php +++ b/classes/api.php @@ -2,7 +2,7 @@ class API extends Handler { - const API_LEVEL = 11; + const API_LEVEL = 12; const STATUS_OK = 0; const STATUS_ERR = 1; -- cgit v1.2.3 From b0ce3d33c3102f5c1176ecfba61f75d05e495622 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 12:37:19 +0300 Subject: api: initialize headlines header --- classes/api.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index c61f522cb..cbb4720c1 100644 --- a/classes/api.php +++ b/classes/api.php @@ -693,7 +693,10 @@ class API extends Handler { $feed_title = $qfh_ret[1]; $headlines = array(); - $headlines_header = array(); + + $headlines_header = array( + 'id' => $feed_id, + 'is_cat' => $is_cat); if (is_resource($result)) { while ($line = db_fetch_assoc($result)) { -- cgit v1.2.3 From 96ac72bc12ab0f5a79c48b2542d4a20088d87f0a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 13:18:03 +0300 Subject: api: getHeadlines: cast feed_it to int if needed --- classes/api.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index cbb4720c1..2691625c7 100644 --- a/classes/api.php +++ b/classes/api.php @@ -184,6 +184,8 @@ class API extends Handler { $feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]); if ($feed_id != "") { + if (is_numeric($feed_id)) $feed_id = (int) $feed_id; + $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]); if (!$limit || $limit >= 200) $limit = 200; -- cgit v1.2.3 From ec57104d6e221a2a44752d6f68615055eefea1db Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 14:23:32 +0300 Subject: apparently it's a bad idea to do is_resource() on a mysqli result --- classes/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 2691625c7..648d6ca6e 100644 --- a/classes/api.php +++ b/classes/api.php @@ -700,7 +700,7 @@ class API extends Handler { 'id' => $feed_id, 'is_cat' => $is_cat); - if (is_resource($result)) { + if (!is_numeric($result)) { while ($line = db_fetch_assoc($result)) { $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length); foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { -- cgit v1.2.3 From 48fefe2f6b6e625b64b0c6d54e35e3608e70a1bd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 17:55:35 +0300 Subject: fixes for first_id stuff --- classes/api.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 648d6ca6e..08c1846d2 100644 --- a/classes/api.php +++ b/classes/api.php @@ -205,7 +205,7 @@ class API extends Handler { $force_update = sql_bool_to_bool($_REQUEST["force_update"]); $has_sandbox = sql_bool_to_bool($_REQUEST["has_sandbox"]); $excerpt_length = (int)$this->dbh->escape_string($_REQUEST["excerpt_length"]); - $check_top_id = (int)$this->dbh->escape_string($_REQUEST["check_top_id"]); + $check_first_id = (int)$this->dbh->escape_string($_REQUEST["check_first_id"]); $include_header = sql_bool_to_bool($_REQUEST["include_header"]); $_SESSION['hasSandbox'] = $has_sandbox; @@ -230,7 +230,7 @@ class API extends Handler { list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, - $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_top_id); + $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id); if ($include_header) { $this->wrap(self::STATUS_OK, array($headlines_header, $headlines)); @@ -644,7 +644,7 @@ class API extends Handler { $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, $search = "", $include_nested = false, $sanitize_content = true, - $force_update = false, $excerpt_length = 100, $check_top_id = false) { + $force_update = false, $excerpt_length = 100, $check_first_id = false) { if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { // Update the feed if required with some basic flood control @@ -686,18 +686,20 @@ class API extends Handler { "offset" => $offset, "since_id" => $since_id, "include_children" => $include_nested, - "check_top_id" => $check_top_id + "check_first_id" => $check_first_id ); $qfh_ret = queryFeedHeadlines($params); $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; + $first_id = $qfh_ret[6]; $headlines = array(); $headlines_header = array( 'id' => $feed_id, + 'first_id' => $first_id, 'is_cat' => $is_cat); if (!is_numeric($result)) { @@ -789,7 +791,7 @@ class API extends Handler { array_push($headlines, $headline_row); } } else if (is_numeric($result) && $result == -1) { - $headlines_header['top_id_changed'] = true; + $headlines_header['first_id_changed'] = true; } return array($headlines, $headlines_header); -- cgit v1.2.3