mod_pubsub: Pass 'user' to simple_itemstore

plugins/mod_pep_plus.lua

@@ -36,8 +36,10 @@ local function subscription_presence(user_bare, recipient)
 	return is_contact_subscribed(username, host, recipient_bare);
 end
 
-local function simple_itemstore(config, node)
-	return lib_pubsub.simple_itemstore(archive, config, node, false);
+local function simple_itemstore(user)
+	return function (config, node)
+		return lib_pubsub.simple_itemstore(archive, config, user, node, false);
+	end
 end
 
 local function get_broadcaster(name)
@@ -166,7 +168,7 @@ function get_pep_service(name)
 		autocreate_on_publish = true;
 		autocreate_on_subscribe = true;
 
-		itemstore = simple_itemstore;
+		itemstore = simple_itemstore(name);
 		broadcaster = get_broadcaster(name);
 		get_affiliation = function (jid)
 			if jid_bare(jid) == name then

plugins/mod_pubsub/mod_pubsub.lua

@@ -39,7 +39,7 @@ function handle_pubsub_iq(event)
 end
 
 local function simple_itemstore(config, node)
-	return lib_pubsub.simple_itemstore(archive, config, node, expose_publisher);
+	return lib_pubsub.simple_itemstore(archive, config, nil, node, expose_publisher);
 end
 
 function simple_broadcast(kind, node, jids, item, actor)

plugins/mod_pubsub/pubsub.lib.lua

@@ -326,7 +326,7 @@ local function create_encapsulating_item(id, payload, publisher, expose_publishe
 	return item;
 end
 
-local function simple_itemstore(archive, config, node, expose_publisher)
+local function simple_itemstore(archive, config, user, node, expose_publisher)
 	module:log("debug", "Creation of itemstore for node %s with config %s", node, config);
 	local get_set = {};
 	function get_set:items()