diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 18:46:07 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 18:46:07 +0200 |
| commit | f90697534896e28ea57c15cf29458601c655f8f1 (patch) | |
| tree | e7da5b08cf4c8a9ffe2244d8e6aeafc6fa339b1e | |
| parent | e498d0230137cbab5025b308900520ee5feac665 (diff) | |
| download | prosody-f90697534896e28ea57c15cf29458601c655f8f1.tar.gz prosody-f90697534896e28ea57c15cf29458601c655f8f1.zip | |
MUC: Fix logic for when to broadcast unavailable presence (actual fix for 14170d161b39)
| -rw-r--r-- | plugins/muc/muc.lib.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 18f40758..e98e99b8 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -196,7 +196,7 @@ function room_mt:publicise_occupant_status(occupant, base_x, nick, actor, reason local base_presence do -- Try to use main jid's presence local pr = occupant:get_presence(); - if pr and (pr.attr.type ~= "unavailable" or occupant.role == nil) then + if pr and (pr.attr.type ~= "unavailable" and occupant.role ~= nil) then base_presence = st.clone(pr); else -- user is leaving but didn't send a leave presence. make one for them base_presence = st.presence {from = occupant.nick; type = "unavailable";}; @@ -737,7 +737,6 @@ function room_mt:clear(x) occupants_updated[occupant] = true; end for occupant in pairs(occupants_updated) do - occupant:set_session(occupant.jid, st.presence({type="unavailable"}), true); self:publicise_occupant_status(occupant, x); module:fire_event("muc-occupant-left", { room = self; nick = occupant.nick; occupant = occupant;}); end |