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 ++++++++++++++++++++++---- classes/feeds.php | 28 +++++++++++++++++++++++---- classes/handler/public.php | 48 ++++++++++++++++++++++++++++++++++++++++------ classes/pref/filters.php | 19 +++++++++++++++--- 4 files changed, 105 insertions(+), 17 deletions(-) (limited to 'classes') 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(); diff --git a/classes/feeds.php b/classes/feeds.php index ed66be291..15b3f068c 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -148,7 +148,7 @@ class Feeds extends Handler_Protected { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false, $include_children = false) { + $override_order = false, $include_children = false, $check_top_id = false) { $disable_cache = false; @@ -232,9 +232,28 @@ class Feeds extends Handler_Protected { } } else { - $qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, + /*$qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, false, $override_order, $offset, 0, - false, 0, $include_children); + false, 0, $include_children, $topid);*/ + + //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, + "limit" => $limit, + "view_mode" => $view_mode, + "cat_view" => $cat_view, + "search" => $search, + "override_order" => $override_order, + "offset" => $offset, + "include_children" => $include_children, + "check_top_id" => $check_top_id + ); + + $qfh_ret = queryFeedHeadlines($params); } $vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") && $feed != -6; @@ -810,6 +829,7 @@ class Feeds extends Handler_Protected { @$offset = $this->dbh->escape_string($_REQUEST["skip"]); @$vgroup_last_feed = $this->dbh->escape_string($_REQUEST["vgrlf"]); $order_by = $this->dbh->escape_string($_REQUEST["order_by"]); + $check_top_id = $this->dbh->escape_string($_REQUEST["topid"]); if (is_numeric($feed)) $feed = (int) $feed; @@ -889,7 +909,7 @@ class Feeds extends Handler_Protected { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order, true); + $vgroup_last_feed, $override_order, true, $check_top_id); //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; diff --git a/classes/handler/public.php b/classes/handler/public.php index 74e837846..1bf088701 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -37,10 +37,31 @@ class Handler_Public extends Handler { break; } - $qfh_ret = queryFeedHeadlines($feed, + /*$qfh_ret = queryFeedHeadlines($feed, 1, $view_mode, $is_cat, $search, false, $date_sort_field, $offset, $owner_uid, - false, 0, true, true, false, false, $start_ts); + false, 0, true, true, false, false, $start_ts);*/ + + //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( + "owner_uid" => $owner_uid, + "feed" => $feed, + "limit" => 1, + "view_mode" => $view_mode, + "cat_view" => $is_cat, + "search" => $search, + "override_order" => $date_sort_field, + "include_children" => true, + "ignore_vfeed_group" => true, + "offset" => $offset, + "start_ts" => $start_ts + ); + + $qfh_ret = queryFeedHeadlines($params); $result = $qfh_ret[0]; @@ -58,11 +79,26 @@ class Handler_Public extends Handler { header("Last-Modified: $last_modified", true); } - $qfh_ret = queryFeedHeadlines($feed, + /*$qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $is_cat, $search, false, $date_sort_field, $offset, $owner_uid, - false, 0, true, true, false, false, $start_ts); - + false, 0, true, true, false, false, $start_ts);*/ + + $params = array( + "owner_uid" => $owner_uid, + "feed" => $feed, + "limit" => $limit, + "view_mode" => $view_mode, + "cat_view" => $is_cat, + "search" => $search, + "override_order" => $date_sort_field, + "include_children" => true, + "ignore_vfeed_group" => true, + "offset" => $offset, + "start_ts" => $start_ts + ); + + $qfh_ret = queryFeedHeadlines($params); $result = $qfh_ret[0]; $feed_title = htmlspecialchars($qfh_ret[1]); @@ -496,7 +532,7 @@ class Handler_Public extends Handler { - + diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 170c1a527..5e3c35b7d 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -83,9 +83,22 @@ class Pref_Filters extends Handler_Protected { } } - $qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false, - "date_entered DESC", 0, $_SESSION["uid"], $filter); - + //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, + // $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, + + /*$qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false, + "date_entered DESC", 0, $_SESSION["uid"], $filter);*/ + + $params = array( + "feed" => -4, + "limit" => 30, + "view_mode" => "", + "cat_view" => false, + "override_order" => "date_entered DESC", + "filter" => $filter + ); + + $qfh_ret = queryFeedHeadlines($params); $result = $qfh_ret[0]; $found = 0; -- cgit v1.2.3-54-g00ecf 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 +++++++++++++++++++++++++------------------------ classes/feeds.php | 27 +++++++----- include/functions2.php | 2 +- js/viewfeed.js | 21 ++++++++-- 4 files changed, 90 insertions(+), 70 deletions(-) (limited to 'classes') 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; diff --git a/classes/feeds.php b/classes/feeds.php index 15b3f068c..d1caf3c25 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -295,7 +295,7 @@ class Feeds extends Handler_Protected { } } - if ($this->dbh->num_rows($result) > 0) { + if (is_resource($result) && $this->dbh->num_rows($result) > 0) { $lnum = $offset; @@ -753,7 +753,7 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info); - } else { + } else if (is_resource($result)) { $message = ""; switch ($view_mode) { @@ -799,6 +799,9 @@ class Feeds extends Handler_Protected { } $reply['content'] .= "

"; } + } else if (is_numeric($result) && $result == -1) { + $reply['content'] = ''; + $reply['top_id_changed'] = true; } if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info); @@ -884,13 +887,6 @@ class Feeds extends Handler_Protected { $reply['headlines'] = array(); - if (!$next_unread_feed) - $reply['headlines']['id'] = $feed; - else - $reply['headlines']['id'] = $next_unread_feed; - - $reply['headlines']['is_cat'] = (bool) $cat_view; - $override_order = false; switch ($order_by) { @@ -917,8 +913,17 @@ class Feeds extends Handler_Protected { $disable_cache = $ret[3]; $vgroup_last_feed = $ret[4]; - $reply['headlines']['content'] =& $ret[5]['content']; - $reply['headlines']['toolbar'] =& $ret[5]['toolbar']; + //$reply['headlines']['content'] =& $ret[5]['content']; + //$reply['headlines']['toolbar'] =& $ret[5]['toolbar']; + + $reply['headlines'] =& $ret[5]; + + if (!$next_unread_feed) + $reply['headlines']['id'] = $feed; + else + $reply['headlines']['id'] = $next_unread_feed; + + $reply['headlines']['is_cat'] = (bool) $cat_view; if ($_REQUEST["debug"]) $timing_info = print_checkpoint("05", $timing_info); diff --git a/include/functions2.php b/include/functions2.php index e4e66acd1..31504a38b 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -761,7 +761,7 @@ if ($current_top_id != $check_top_id) { // top changed, bail out - return array(false, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); } } } diff --git a/js/viewfeed.js b/js/viewfeed.js index 8bc42aadc..b4bf69a7e 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -184,10 +184,22 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } else { console.log("no new headlines received"); + var top_id_changed = reply['headlines']['top_id_changed']; + console.log("top id changed:" + top_id_changed); + var hsp = $("headlines-spacer"); - if (hsp) hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; + if (hsp) { + if (top_id_changed) { + hsp.innerHTML = "" + + __("New articles found, reload feed to continue.") + ""; + } else { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; + } + + } + } } @@ -1325,13 +1337,14 @@ function headlines_scroll_handler(e) { return; } - } else { - if (hsp) + /*} else { + if (hsp) { if (_infscroll_disable) hsp.innerHTML = "" + __("Click to open next unread feed.") + ""; else hsp.innerHTML = ""; + }*/ } if (isCdmMode()) { -- cgit v1.2.3-54-g00ecf 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') 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-54-g00ecf 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') 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-54-g00ecf 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') 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-54-g00ecf 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') 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-54-g00ecf 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 +- classes/feeds.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') 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) { diff --git a/classes/feeds.php b/classes/feeds.php index d1caf3c25..508ad988a 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -295,7 +295,7 @@ class Feeds extends Handler_Protected { } } - if (is_resource($result) && $this->dbh->num_rows($result) > 0) { + if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) { $lnum = $offset; @@ -753,7 +753,7 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info); - } else if (is_resource($result)) { + } else if (!is_numeric($result)) { $message = ""; switch ($view_mode) { -- cgit v1.2.3-54-g00ecf 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 +++++++----- classes/feeds.php | 11 ++++++----- include/functions2.php | 53 +++++++++++++++++++++++--------------------------- js/feedlist.js | 6 ++---- js/viewfeed.js | 8 +++++--- 5 files changed, 44 insertions(+), 46 deletions(-) (limited to 'classes') 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); diff --git a/classes/feeds.php b/classes/feeds.php index 508ad988a..9608290ca 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -148,7 +148,7 @@ class Feeds extends Handler_Protected { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false, $include_children = false, $check_top_id = false) { + $override_order = false, $include_children = false, $check_first_id = false) { $disable_cache = false; @@ -250,7 +250,7 @@ class Feeds extends Handler_Protected { "override_order" => $override_order, "offset" => $offset, "include_children" => $include_children, - "check_top_id" => $check_top_id + "check_first_id" => $check_first_id ); $qfh_ret = queryFeedHeadlines($params); @@ -267,6 +267,7 @@ class Feeds extends Handler_Protected { $last_updated = strpos($qfh_ret[4], '1970-') === FALSE ? make_local_datetime($qfh_ret[4], false) : __("Never"); $highlight_words = $qfh_ret[5]; + $reply['first_id'] = $qfh_ret[6]; $vgroup_last_feed = $vgr_last_feed; @@ -801,7 +802,7 @@ class Feeds extends Handler_Protected { } } else if (is_numeric($result) && $result == -1) { $reply['content'] = ''; - $reply['top_id_changed'] = true; + $reply['first_id_changed'] = true; } if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info); @@ -832,7 +833,7 @@ class Feeds extends Handler_Protected { @$offset = $this->dbh->escape_string($_REQUEST["skip"]); @$vgroup_last_feed = $this->dbh->escape_string($_REQUEST["vgrlf"]); $order_by = $this->dbh->escape_string($_REQUEST["order_by"]); - $check_top_id = $this->dbh->escape_string($_REQUEST["topid"]); + $check_first_id = $this->dbh->escape_string($_REQUEST["fid"]); if (is_numeric($feed)) $feed = (int) $feed; @@ -905,7 +906,7 @@ class Feeds extends Handler_Protected { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order, true, $check_top_id); + $vgroup_last_feed, $override_order, true, $check_first_id); //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; diff --git a/include/functions2.php b/include/functions2.php index 282571850..a85c49ccf 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -444,7 +444,7 @@ $override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false; $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false; $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false; - $check_top_id = isset($params["check_top_id"]) ? $params["check_top_id"] : false; + $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false; $ext_tables_part = ""; $query_strategy_part = ""; @@ -729,28 +729,26 @@ $start_ts_query_part = ""; } - + $first_id = false; // if previous topmost article id changed that means our current pagination is no longer valid - if ($check_top_id) { - $query = "SELECT DISTINCT - date_entered, - guid, - ttrss_entries.id, - ttrss_entries.title, - updated, - score - FROM - $from_qpart - WHERE - $feed_check_qpart - ttrss_user_entries.ref_id = ttrss_entries.id AND - ttrss_user_entries.owner_uid = '$owner_uid' AND - $search_query_part - $start_ts_query_part - $filter_query_part - $view_query_part - $since_id_part - $query_strategy_part ORDER BY $order_by LIMIT 1"; + $query = "SELECT DISTINCT + date_entered, + guid, + ttrss_entries.id, + ttrss_entries.title, + updated, + score + FROM + $from_qpart + WHERE + $feed_check_qpart + ttrss_user_entries.ref_id = ttrss_entries.id AND + ttrss_user_entries.owner_uid = '$owner_uid' AND + $search_query_part + $start_ts_query_part + $filter_query_part + $since_id_part + $query_strategy_part ORDER BY $order_by LIMIT 1"; if ($_REQUEST["debug"]) { print $query; @@ -758,15 +756,12 @@ $result = db_query($query); if ($result) { - $current_top_id = db_fetch_result($result, 0, "id"); + $first_id = (int) db_fetch_result($result, 0, "id"); - if ($current_top_id != $check_top_id) { - // top changed, bail out - - return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + if ($offset > 0 && $check_first_id && $first_id != $check_first_id) { + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } } - } $query = "SELECT DISTINCT date_entered, @@ -851,7 +846,7 @@ $result = db_query($query); } - return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } diff --git a/js/feedlist.js b/js/feedlist.js index 54ad1cc50..0bfb6b6a7 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -100,10 +100,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_w } if (offset > 0) { - var firstRow = $$('div[id*="RROW-"]').first(); - - if (firstRow) { - query = query + "&topid=" + param_escape(parseInt(firstRow.id.replace("RROW-", ""))); + if (current_first_id) { + query = query + "&fid=" + param_escape(current_first_id); } } diff --git a/js/viewfeed.js b/js/viewfeed.js index 3fc616058..1a45e8bb5 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -13,6 +13,7 @@ var catchup_timeout_id = false; var cids_requested = []; var loaded_article_ids = []; var _last_headlines_update = 0; +var current_first_id = 0; var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; @@ -77,6 +78,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { _infscroll_disable = 0; } + current_first_id = reply['headlines']['first_id']; var counters = reply['counters']; var articles = reply['articles']; //var runtime_info = reply['runtime-info']; @@ -183,13 +185,13 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } else { console.log("no new headlines received"); - var top_id_changed = reply['headlines']['top_id_changed']; - console.log("top id changed:" + top_id_changed); + var first_id_changed = reply['headlines']['first_id_changed']; + console.log("first id changed:" + first_id_changed); var hsp = $("headlines-spacer"); if (hsp) { - if (top_id_changed) { + if (first_id_changed) { hsp.innerHTML = "" + __("New articles found, reload feed to continue.") + ""; } else { -- cgit v1.2.3-54-g00ecf From ac4c1383ae3b1af7be056b1f75c8125b272b0e5f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Jul 2015 01:19:52 +0300 Subject: bring cdmFeedTitle style in line with the rest of the UI send headline rows as separate JSON objects --- classes/feeds.php | 161 +++++++++++++++++++++++++++++------------------------- css/cdm.css | 5 +- js/viewfeed.js | 51 +++++++++++++---- 3 files changed, 127 insertions(+), 90 deletions(-) (limited to 'classes') diff --git a/classes/feeds.php b/classes/feeds.php index 9608290ca..089c3e713 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -307,7 +307,11 @@ class Feeds extends Handler_Protected { $expand_cdm = get_pref('CDM_EXPANDED'); + $reply['content'] = array(); + while ($line = $this->dbh->fetch_assoc($result)) { + $headline_row = ''; + $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250); foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { @@ -448,76 +452,79 @@ class Feeds extends Handler_Protected { $vf_catchup_link = "".__('mark feed as read').""; - $reply['content'] .= "
". + $feed_title_row = "
". "
$feed_icon_img
". - "". $line["feed_title"]." + "". + $line["feed_title"]." $vf_catchup_link
"; + array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row)); + } } $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' onmouseout='postMouseOut($id)'"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= ""; - $reply['content'] .= "$marked_pic"; - $reply['content'] .= "$published_pic"; + $headline_row .= "$marked_pic"; + $headline_row .= "$published_pic"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= ""; + $headline_row .= "
"; if (!$vfeed_group_enabled) { if (@$line["feed_title"]) { $rgba = @$rgba_cache[$feed_id]; - $reply['content'] .= "". + $headline_row .= "". truncate_string($line["feed_title"],30).""; } } - $reply['content'] .= ""; + $headline_row .= ""; - $reply['content'] .= "
$updated_fmt
+ $headline_row .= "
$updated_fmt
"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= $score_pic; + $headline_row .= $score_pic; if ($line["feed_title"] && !$vfeed_group_enabled) { - $reply['content'] .= " $feed_icon_img"; } - $reply['content'] .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; + $headline_row .= "
"; } else { @@ -551,10 +558,12 @@ class Feeds extends Handler_Protected { //$feed_icon_img = "\"\""; } - $reply['content'] .= "
". + $feed_title_row = "
". "
$feed_icon_img
". "". $line["feed_title"]." $vf_catchup_link
"; + + array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row)); } } @@ -563,20 +572,20 @@ class Feeds extends Handler_Protected { $expanded_class = $expand_cdm ? "expanded" : "expandable"; - $reply['content'] .= "
"; - $reply['content'] .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; + $headline_row .= "
"; - $reply['content'] .= ""; - $reply['content'] .= "$marked_pic"; - $reply['content'] .= "$published_pic"; + $headline_row .= "$marked_pic"; + $headline_row .= "$published_pic"; - $reply['content'] .= "
"; + $headline_row .= "
"; if ($highlight_words && count($highlight_words > 0)) { foreach ($highlight_words as $word) { @@ -585,7 +594,7 @@ class Feeds extends Handler_Protected { } } - $reply['content'] .= " $entry_author"; - $reply['content'] .= $labels_str; + $headline_row .= $labels_str; - $reply['content'] .= ""; + $headline_row .= ""; if (!$vfeed_group_enabled) { if (@$line["feed_title"]) { $rgba = @$rgba_cache[$feed_id]; - $reply['content'] .= "
+ $headline_row .= "
". truncate_string($line["feed_title"],30)." @@ -622,34 +631,34 @@ class Feeds extends Handler_Protected { } } - $reply['content'] .= " + $headline_row .= " $updated_fmt"; - $reply['content'] .= "
"; - $reply['content'] .= "$score_pic"; + $headline_row .= "
"; + $headline_row .= "$score_pic"; if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { - $reply['content'] .= "$feed_icon_img"; } - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; if ($line['note']) { - $reply['content'] .= format_article_note($id, $line['note']); + $headline_row .= format_article_note($id, $line['note']); } - $reply['content'] .= "
"; + $headline_row .= "
"; if (!$line['lang']) $line['lang'] = 'en'; - $reply['content'] .= "
"; + $headline_row .= "
"; if ($line["orig_feed_id"]) { @@ -658,54 +667,54 @@ class Feeds extends Handler_Protected { if ($this->dbh->num_rows($tmp_result) != 0) { - $reply['content'] .= "
"; - $reply['content'] .= __("Originally from:"); + $headline_row .= "
"; + $headline_row .= __("Originally from:"); - $reply['content'] .= " "; + $headline_row .= " "; $tmp_line = $this->dbh->fetch_assoc($tmp_result); - $reply['content'] .= "" . $tmp_line['title'] . ""; - $reply['content'] .= " "; + $headline_row .= " "; - $reply['content'] .= ""; - $reply['content'] .= ""; + $headline_row .= ""; + $headline_row .= ""; - $reply['content'] .= "
"; + $headline_row .= "
"; } } - $reply['content'] .= ""; + $headline_row .= ""; // if (!$expand_cdm) { - $reply['content'] .= ""; - $reply['content'] .= htmlspecialchars($line["content"]); - $reply['content'] .= ""; + $headline_row .= htmlspecialchars($line["content"]); + $headline_row .= ""; + $headline_row .= "
"; foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { - $reply['content'] .= $p->hook_article_left_button($line); + $headline_row .= $p->hook_article_left_button($line); } $tags_str = format_tags_string($tags, $id); - $reply['content'] .= "Tags + $headline_row .= "Tags $tags_str (+)"; @@ -729,26 +738,28 @@ class Feeds extends Handler_Protected { } } - if ($entry_comments) $reply['content'] .= " ($entry_comments)"; + if ($entry_comments) $headline_row .= " ($entry_comments)"; - $reply['content'] .= "
"; + $headline_row .= "
"; -// $reply['content'] .= "$marked_pic"; -// $reply['content'] .= "$published_pic"; +// $headline_row .= "$marked_pic"; +// $headline_row .= "$published_pic"; foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) { - $reply['content'] .= $p->hook_article_button($line); + $headline_row .= $p->hook_article_button($line); } - $reply['content'] .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; + $headline_row .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; - $reply['content'] .= "
"; + $headline_row .= "
"; } + array_push($reply['content'], array("id" => (int)$line['id'], 'html' => $headline_row)); + ++$lnum; } diff --git a/css/cdm.css b/css/cdm.css index 0af07076f..ed9bedea1 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -213,17 +213,14 @@ div.cdmContent div.postEnclosures { } div.cdmFeedTitle { - border-color : #a0a0a0; + border-color : #4684ff; border-width : 0px 0px 1px 0px; border-style : solid; padding : 5px 3px 5px 5px; - background : url("../images/toolbar.png") bottom left; - background-repeat : repeat-x; } div.cdmFeedTitle a.title { color : #555; - font-style : italic; font-weight : bold; } diff --git a/js/viewfeed.js b/js/viewfeed.js index 1a45e8bb5..be30183be 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -86,8 +86,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) { if (infscroll_req == false) { loaded_article_ids = []; - dijit.byId("headlines-frame").attr('content', - reply['headlines']['content']); + /*dijit.byId("headlines-frame").attr('content', + reply['headlines']['content']);*/ //dijit.byId("headlines-toolbar").attr('content', // reply['headlines']['toolbar']); @@ -96,12 +96,28 @@ function headlines_callback2(transport, offset, background, infscroll_req) { reply['headlines']['toolbar'], {parseContent: true}); - $$("#headlines-frame > div[id*=RROW]").each(function(row) { + /*$$("#headlines-frame > div[id*=RROW]").each(function(row) { if (loaded_article_ids.indexOf(row.id) != -1) { row.parentNode.removeChild(row); } else { loaded_article_ids.push(row.id); } + });*/ + + + dijit.byId("headlines-frame").attr("content", ""); + + reply['headlines']['content'].each(function(row) { + if (loaded_article_ids.indexOf(row.id) == -1) { + loaded_article_ids.push(row.id); + } + + var tmp = new Element("div"); + tmp.innerHTML = row.html; + + dojo.parser.parse(tmp.firstChild); + dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild); + }); var hsp = $("headlines-spacer"); @@ -127,16 +143,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) { var c = dijit.byId("headlines-frame"); var ids = getSelectedArticleIds2(); - var new_elems = []; + //var new_elems = []; - $("headlines-tmp").innerHTML = reply['headlines']['content']; + //$("headlines-tmp").innerHTML = reply['headlines']['content']; var hsp = $("headlines-spacer"); if (hsp) c.domNode.removeChild(hsp); - $$("#headlines-tmp > div").each(function(row) { + /*$$("#headlines-tmp > div").each(function(row) { if (row.className == 'cdmFeedTitle') { row.style.display = 'none'; c.domNode.appendChild(row); @@ -149,18 +165,31 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } else { row.parentNode.removeChild(row); } + });*/ + + reply['headlines']['content'].each(function(row) { + if (loaded_article_ids.indexOf(row.id) == -1 || row.kind == 'feed_title') { + loaded_article_ids.push(row.id); + + var tmp = new Element("div"); + tmp.innerHTML = row.html; + + dojo.parser.parse(tmp.firstChild); + dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild); + + } }); + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); // if (getInitParam("cdm_auto_catchup") == 1) { c.domNode.appendChild(hsp); // } - console.log("added " + new_elems.size() + " headlines"); + console.log("added " + reply['headlines']['content'].size() + " headlines"); - if (new_elems.size() == 0) - _infscroll_disable = true; + if (reply['headlines']['content'].size() == 0) _infscroll_disable = true; console.log("restore selected ids: " + ids); @@ -170,12 +199,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) { initHeadlinesMenu(); - new_elems.each(function(child) { + /*new_elems.each(function(child) { dojo.parser.parse(child); if (!Element.visible(child)) new Effect.Appear(child, { duration : 0.5 }); - }); + });*/ if (_infscroll_disable) { hsp.innerHTML = "" + -- cgit v1.2.3-54-g00ecf