Comparison

util.pubsub: Add support for requesting multiple specific items (needed for #1305)

comparison

equal deleted inserted replaced

-:5eb4ef537e98
+:7f84d7f77a00
 		self.config.broadcaster("purge", node, node_obj.subscribers, nil, actor, node_obj, self);
 	end
 	return true
 end
-function service:get_items(node, actor, id) --> (true, { id, [id] = node }) or (false, err)
+function service:get_items(node, actor, ids) --> (true, { id, [id] = node }) or (false, err)
 	-- Access checking
 	if not self:may(node, actor, "get_items") then
 		return false, "forbidden";
 	end
 	--
 	local node_obj = self.nodes[node];
 	if not node_obj then
 		return false, "item-not-found";
 	end
-	if id then -- Restrict results to a single specific item
+	if type(ids) == "string" then -- COMPAT see #1305
-		local with_id = self.data[node]:get(id);
+		ids = { ids };
-		if not with_id then
+	end
-			return true, { };
+	local data = {};
-		end
+	if ids then
-		return true, { id, [id] = with_id };
+		for _, key in ipairs(ids) do
+			local value = self.data[node]:get(key);
+			if value then
+				data[#data+1] = key;
+				data[key] = value;
+			end
+		end
 	else
-		local data = {}
 		for key, value in self.data[node]:items() do
 			data[#data+1] = key;
 			data[key] = value;
 		end
-		return true, data;
+	end
-	end
+	return true, data;
 end
 function service:get_last_item(node, actor) --> (true, id, node) or (false, err)
 	-- Access checking
 	if not self:may(node, actor, "get_items") then