# HG changeset patch
# User daurnimator <quae@daurnimator.com>
# Date 1400521254 14400
# Node ID 454ef19e7925738426f81385854e6275e66303d9
# Parent  2420e308f64af16668ddcd8d72a0d8e38461fa1f
plugins/muc/muc: Better check for live sessions

diff -r 2420e308f64a -r 454ef19e7925 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Mon May 19 13:40:24 2014 -0400
+++ b/plugins/muc/muc.lib.lua	Mon May 19 13:40:54 2014 -0400
@@ -100,11 +100,21 @@
 			self._jid_nick[real_jid] = nil;
 		end
 	end
-	if occupant.role ~= nil and next(occupant.sessions) then
+
+	local has_live_session = false
+	if occupant.role ~= nil then
 		for real_jid, presence in occupant:each_session() do
-			self._jid_nick[real_jid] = occupant.nick;
+			if presence.attr.type == nil then
+				has_live_session = true
+				self._jid_nick[real_jid] = occupant.nick;
+			end
 		end
-	else
+		if not has_live_session then
+			-- Has no live sessions left; they have left the room.
+			occupant.role = nil
+		end
+	end
+	if not has_live_session then
 		occupant = nil
 	end
 	self._occupants[id] = occupant