# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254050925 -3600
# Node ID c07f8f3e93ea84a065a928880846eec334dd6f40
# Parent  f4c88dd32724a7c9ff9d197bc0099d57817fe8b3# Parent  de165b5de25425d2dc888194b36e538fefaa2955
Merge with trunk

diff -r f4c88dd32724 -r c07f8f3e93ea plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Sun Sep 27 12:26:51 2009 +0100
+++ b/plugins/muc/muc.lib.lua	Sun Sep 27 12:28:45 2009 +0100
@@ -107,23 +107,14 @@
 
 function room_mt:broadcast_presence(stanza, code, nick)
 	stanza = get_filtered_presence(stanza);
-	local data = self._occupants[stanza.attr.from];
+	local occupant = self._occupants[stanza.attr.from];
 	stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-		:tag("item", {affiliation=data.affiliation, role=data.role, nick=nick}):up();
+		:tag("item", {affiliation=occupant.affiliation, role=occupant.role, nick=nick}):up();
 	if code then
 		stanza:tag("status", {code=code}):up();
 	end
-	local me;
-	for occupant, o_data in pairs(self._occupants) do
-		if occupant ~= stanza.attr.from then
-			for jid in pairs(o_data.sessions) do
-				stanza.attr.to = jid;
-				self:route_stanza(stanza);
-			end
-		else
-			me = o_data;
-		end
-	end
+	self:broadcast_except_nick(stanza, stanza.attr.from);
+	local me = self._occupants[stanza.attr.from];
 	if me then
 		stanza:tag("status", {code='110'});
 		for jid in pairs(me.sessions) do
@@ -224,10 +215,22 @@
 		elseif type == "unavailable" then -- unavailable
 			if current_nick then
 				log("debug", "%s leaving %s", current_nick, room);
-				local data = self._occupants[current_nick];
-				data.role = 'none';
-				self:broadcast_presence(pr);
-				self._occupants[current_nick] = nil;
+				local occupant = self._occupants[current_nick];
+				local old_session = occupant.sessions[from];
+				local new_jid = next(occupant.sessions);
+				if new_jid == from then new_jid = next(occupant.sessions, new_jid); end
+				if new_jid then
+					occupant.jid = new_jid;
+					occupant.sessions[from] = nil;
+					local pr = st.clone(occupant[new_jid])
+						:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+						:tag("item", {affiliation=occupant.affiliation, role=occupant.role});
+					self:broadcast_except_nick(pr, current_nick);
+				else
+					occupant.role = 'none';
+					self:broadcast_presence(pr);
+					self._occupants[current_nick] = nil;
+				end
 				self._jid_nick[from] = nil;
 			end
 		elseif not type then -- available