Software / code / prosody
Changeset
8327:0b561f8bc790
mod_pubsub: Remove expose_publisher argument since it is handled in broadcaster
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 17 Oct 2017 00:07:34 +0200 |
| parents | 8326:12408867bc86 |
| children | 8328:29ef191c7bf9 |
| files | plugins/mod_pubsub/mod_pubsub.lua plugins/mod_pubsub/pubsub.lib.lua |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pubsub/mod_pubsub.lua Mon Oct 16 22:12:14 2017 +0200 +++ b/plugins/mod_pubsub/mod_pubsub.lua Tue Oct 17 00:07:34 2017 +0200 @@ -40,7 +40,7 @@ local function simple_itemstore(config, node) local archive = module:open_store("pubsub_"..node, "archive"); - return lib_pubsub.archive_itemstore(archive, config, nil, node, expose_publisher); + return lib_pubsub.archive_itemstore(archive, config, nil, node); end if enable_persistence then
--- a/plugins/mod_pubsub/pubsub.lib.lua Mon Oct 16 22:12:14 2017 +0200 +++ b/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 17 00:07:34 2017 +0200 @@ -328,16 +328,13 @@ return true; end -local function create_encapsulating_item(id, payload, publisher, expose_publisher) +local function create_encapsulating_item(id, payload) local item = st.stanza("item", { id = id, xmlns = xmlns_pubsub }); item:add_child(payload); - if expose_publisher then - item.attr.publisher = publisher; - end return item; end -local function archive_itemstore(archive, config, user, node, expose_publisher) +local function archive_itemstore(archive, config, user, node) 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 @@ -355,7 +352,7 @@ if id == nil then return; end - local item = create_encapsulating_item(id, payload, publisher, expose_publisher); + local item = create_encapsulating_item(id, payload, publisher); return id, item; end); end @@ -375,7 +372,7 @@ if id == nil then return nil; end - return create_encapsulating_item(id, payload, publisher, expose_publisher); + return create_encapsulating_item(id, payload, publisher); end function get_set:set(key, value) -- luacheck: ignore 212/self local data, err;
