diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
| commit | a540d613cd08b8feee096d19b727d1f5b2cab507 (patch) | |
| tree | ac1899833b30b87ea97439f061e9b892bd188367 /plugins | |
| parent | 8b320cb39f3d22c7af46d33ddfc017a726db30d0 (diff) | |
| parent | 80bafb72003774e5eb63ef9d3d7960385cfb8c6a (diff) | |
| download | prosody-a540d613cd08b8feee096d19b727d1f5b2cab507.tar.gz prosody-a540d613cd08b8feee096d19b727d1f5b2cab507.zip | |
Merge
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 6 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
2 files changed, 7 insertions, 2 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) diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 1ce63a8b..060e04f6 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -625,8 +625,9 @@ end function listener.onreadtimeout(conn) local session = sessions[conn]; + local host = session.host or session.to_host; if session then - return (hosts[session.host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); + return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); end end |