From 25b5ef2889ed4ef4fe2fd58143fa7042937ab449 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 12 Oct 2017 01:31:08 +0200 Subject: mod_pubsub, mod_pep_plus: Rename simple_itemstore to reflect that it's based on archive storage --- plugins/mod_pep_plus.lua | 2 +- plugins/mod_pubsub/mod_pubsub.lua | 2 +- plugins/mod_pubsub/pubsub.lib.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/mod_pep_plus.lua b/plugins/mod_pep_plus.lua index 09c9d07d..323fbf8a 100644 --- a/plugins/mod_pep_plus.lua +++ b/plugins/mod_pep_plus.lua @@ -45,7 +45,7 @@ local function simple_itemstore(username) module:log("debug", "new simple_itemstore(%q, %q)", username, node); known_nodes_map:set(username, node, true); local archive = module:open_store("pep_"..node, "archive"); - return lib_pubsub.simple_itemstore(archive, config, username, node, false); + return lib_pubsub.archive_itemstore(archive, config, username, node, false); end end diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 6e3854ee..49b21838 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -40,7 +40,7 @@ end local function simple_itemstore(config, node) local archive = module:open_store("pubsub_"..node, "archive"); - return lib_pubsub.simple_itemstore(archive, config, nil, node, expose_publisher); + return lib_pubsub.archive_itemstore(archive, config, nil, node, expose_publisher); end if enable_persistence then diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua index b1f0ce02..56b0cb42 100644 --- a/plugins/mod_pubsub/pubsub.lib.lua +++ b/plugins/mod_pubsub/pubsub.lib.lua @@ -331,7 +331,7 @@ local function create_encapsulating_item(id, payload, publisher, expose_publishe return item; end -local function simple_itemstore(archive, config, user, node, expose_publisher) +local function archive_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() -- luacheck: ignore 212/self @@ -389,6 +389,6 @@ local function simple_itemstore(archive, config, user, node, expose_publisher) end return setmetatable(get_set, archive); end -_M.simple_itemstore = simple_itemstore; +_M.archive_itemstore = archive_itemstore; return _M; -- cgit v1.2.3