From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 Apr 2016 16:46:07 +0000 (+0200)
Subject: MUC: Fix logic for when to broadcast unavailable presence (actual fix for 14170d161b39)
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=a90f9bdc907fa6fc61e6ad066b370e03790bfbf3

MUC: Fix logic for when to broadcast unavailable presence (actual fix for 14170d161b39)
---

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