request label counters conditionally

2 files changed, 16 insertions, 6 deletions

diff --git a/js/Feeds.js b/js/Feeds.js
index 5d64b77ee..3767f8b65 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -133,10 +133,15 @@ const	Feeds = {
 		this._search_query = "";
 		this.reloadCurrent();
 	},
-	requestCounters: function(feed_ids = null) {
-		xhr.json("backend.php", {op: "rpc", method: "getAllCounters", "feed_ids[]": feed_ids, seq: App.next_seq()}, () => {
-			//
-		});
+	// null = get all data, [] would give empty response for specific type
+	requestCounters: function(feed_ids = null, label_ids = null) {
+		xhr.json("backend.php", {op: "rpc",
+							method: "getAllCounters",
+							"feed_ids[]": feed_ids,
+							"feed_id_count": feed_ids ? feed_ids.length : -1,
+							"label_ids[]": label_ids,
+							"label_id_count": label_ids ? label_ids.length : -1,
+							seq: App.next_seq()});
 	},
 	reload: function() {
 		try {
diff --git a/js/Headlines.js b/js/Headlines.js
index d44866d94..6dbe24918 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -175,6 +175,7 @@ const Headlines = {
 
 		Promise.all(promises).then((results) => {
 			let feeds = [];
+			let labels = [];
 
 			results.forEach((res) => {
 				if (res) {
@@ -183,6 +184,10 @@ const Headlines = {
 
 						if (obj.feeds)
 							feeds = feeds.concat(obj.feeds);
+
+						if (obj.labels)
+							labels = labels.concat(obj.labels);
+
 					} catch (e) {
 						console.warn(e, res);
 					}
@@ -190,8 +195,8 @@ const Headlines = {
 			});
 
 			if (feeds.length > 0) {
-				console.log('requesting counters for', feeds);
-				Feeds.requestCounters(feeds);
+				console.log('requesting counters for', feeds, labels);
+				Feeds.requestCounters(feeds, labels);
 			}
 		});
 	},