diff options
| author | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
| commit | f2b49140d8f9309bb3613effbef0739216ba7a9b (patch) | |
| tree | 6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /plugins/mod_pubsub | |
| parent | e081fd664251a2eb7ab68262c2b8a3cad4b381c7 (diff) | |
| parent | ae48864f9d7368bf2030d391d68d6363278202ea (diff) | |
| download | prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.tar.gz prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.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; |