valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

requestCounters: remove cooldown

This commit is contained in:
Andrew Dolgov 2018-12-12 20:06:44 +03:00
parent 5807f2e0f0
commit d53cdaf815
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/rpc.php
View File

@ -271,17 +271,14 @@ class RPC extends Handler_Protected {
} }
function getAllCounters() { function getAllCounters() {
$last_article_id = (int) clean($_REQUEST["last_article_id"]); @$seq = (int) $_REQUEST['seq'];
$reply = array(); $reply = [
'counters' => Counters::getAllCounters()
];
if (!empty($_REQUEST['seq'])) $reply['seq'] = (int) $_REQUEST['seq']; if ($seq % 2 == 0)
$reply['runtime-info'] = make_runtime_info();
if ($last_article_id != Article::getLastArticleId()) {
$reply['counters'] = Counters::getAllCounters();
}
$reply['runtime-info'] = make_runtime_info();
print json_encode($reply); print json_encode($reply);
} }

3
include/functions.php
View File

@ -1305,10 +1305,7 @@
$data["max_feed_id"] = (int) $max_feed_id; $data["max_feed_id"] = (int) $max_feed_id;
$data["num_feeds"] = (int) $num_feeds; $data["num_feeds"] = (int) $num_feeds;
$data['last_article_id'] = Article::getLastArticleId();
$data['cdm_expanded'] = get_pref('CDM_EXPANDED'); $data['cdm_expanded'] = get_pref('CDM_EXPANDED');
$data["labels"] = Labels::get_all_labels($_SESSION["uid"]); $data["labels"] = Labels::get_all_labels($_SESSION["uid"]);
if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) { if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {

1
js/AppBase.js
View File

@ -218,7 +218,6 @@ define(["dojo/_base/declare"], function (declare) {
if (message == "UPDATE_COUNTERS") { if (message == "UPDATE_COUNTERS") {
console.log("need to refresh counters..."); console.log("need to refresh counters...");
App.setInitParam("last_article_id", -1);
Feeds.requestCounters(true); Feeds.requestCounters(true);
} }

25
js/Feeds.js
View File

@ -120,27 +120,10 @@ define(["dojo/_base/declare"], function (declare) {
this._search_query = ""; this._search_query = "";
this.reloadCurrent(); this.reloadCurrent();
}, },
requestCounters: function(force) { requestCounters: function() {
const date = new Date(); xhrPost("backend.php", {op: "rpc", method: "getAllCounters", seq: App.next_seq()}, (transport) => {
const timestamp = Math.round(date.getTime() / 1000); App.handleRpcJson(transport);
});
if (force || timestamp - this.counters_last_request > 5) {
console.log("scheduling request of counters...");
this.counters_last_request = timestamp;
let query = {op: "rpc", method: "getAllCounters", seq: App.next_seq()};
if (!force)
query.last_article_id = App.getInitParam("last_article_id");
xhrPost("backend.php", query, (transport) => {
App.handleRpcJson(transport);
});
} else {
console.log("request_counters: rate limit reached: " + (timestamp - this.counters_last_request));
}
}, },
reload: function() { reload: function() {
try { try {