aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-05 12:21:32 +0200
committerKim Alvefur <zash@zash.se>2015-05-05 12:21:32 +0200
commit9e2d9737662cc09c8c34f8bc5af9c89c4ebc3d69 (patch)
tree02a95fa0890f15f1fc9c97894bf9a32dab2b49ac
parent9699e09082cb84af5e2c74c05d162438a4c6d536 (diff)
downloadprosody-9e2d9737662cc09c8c34f8bc5af9c89c4ebc3d69.tar.gz
prosody-9e2d9737662cc09c8c34f8bc5af9c89c4ebc3d69.zip
mod_pubsub: Add option for default affiliation of non-existent nodes (thanks Flow)
-rw-r--r--plugins/mod_pubsub/mod_pubsub.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua
index de027b58..40c28d27 100644
--- a/plugins/mod_pubsub/mod_pubsub.lua
+++ b/plugins/mod_pubsub/mod_pubsub.lua
@@ -125,11 +125,15 @@ module:hook("host-disco-items", function (event)
end);
local admin_aff = module:get_option_string("default_admin_affiliation", "owner");
-local function get_affiliation(jid)
+local unowned_aff = module:get_option_string("default_unowned_affiliation");
+local function get_affiliation(jid, node)
local bare_jid = jid_bare(jid);
if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then
return admin_aff;
end
+ if not node then
+ return unowned_aff;
+ end
end
function set_service(new_service)