diff options
| author | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
| commit | 0269157c4511472cf0bf377d84f6e99876f83d12 (patch) | |
| tree | 8cd84a76fb673cbfefa00ba1516bd16150f1c780 /plugins/mod_pubsub | |
| parent | a4764762b3dad679f40dadd6eb2eb31ea1d5cace (diff) | |
| parent | 9a5a3fd0f10693e6cba2779095398614eb94e68c (diff) | |
| download | prosody-0269157c4511472cf0bf377d84f6e99876f83d12.tar.gz prosody-0269157c4511472cf0bf377d84f6e99876f83d12.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_pubsub')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 855c5fd2..05f80365 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -75,7 +75,7 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj) local msg_type = node_obj and node_obj.config.message_type or "headline"; local message = st.message({ from = module.host, type = msg_type, id = id }) :tag("event", { xmlns = xmlns_pubsub_event }) - :tag(kind, { node = node }) + :tag(kind, { node = node }); if item then message:add_child(item); @@ -101,11 +101,12 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj) end local max_max_items = module:get_option_number("pubsub_max_items", 256); -function check_node_config(node, actor, new_config) -- luacheck: ignore 212/actor 212/node +function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor if (new_config["max_items"] or 1) > max_max_items then return false; end - if new_config["access_model"] ~= "whitelist" and new_config["access_model"] ~= "open" then + if new_config["access_model"] ~= "whitelist" + and new_config["access_model"] ~= "open" then return false; end return true; |