public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-27 02:41:29 +00:00
Code Issues Releases Wiki Activity

queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating

Browse Source
This commit is contained in:
Andrew Dolgov
2015-07-12 01:29:36 +03:00
parent 5f297a5c11
commit f5a0fb8b64
8 changed files with 186 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
classes/api.php
View File

@@ -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);
$order, $offset, 0, false, $since_id, $include_nested);*/
$result = $qfh_ret[0];
//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();

28
classes/feeds.php
View File

@@ -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];

46
classes/handler/public.php
View File

@@ -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 {
</div>
<button type="submit"><?php echo __('Share') ?></button>
<button onclick="return window.close()"><?php echo __('Cancel') ?></button>
</div>
</td>
</form>
</td></tr></table>

17
classes/pref/filters.php
View File

@@ -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;