Merged with main tip.

1 files changed, 56 insertions, 104 deletions

diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua
index 9a559f2d..1f8d04e9 100644
--- a/plugins/mod_muc.lua
+++ b/plugins/mod_muc.lua
@@ -1,3 +1,10 @@
+-- Prosody IM v0.3
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
 
 local register_component = require "core.componentmanager".register_component;
@@ -62,7 +69,7 @@ function filter_xmlns_from_stanza(stanza, filters)
 end
 local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
 function get_filtered_presence(stanza)
-	return filter_xmlns_from_stanza(st.deserialize(st.preserialize(stanza)), presence_filters);
+	return filter_xmlns_from_stanza(st.clone(stanza), presence_filters);
 end
 function getUsingPath(stanza, path, getText)
 	local tag = stanza;
@@ -116,60 +123,12 @@ function set_subject(current_nick, room, subject)
 	if subject == "" then subject = nil; end
 	rooms_info:set(room, 'subject', subject);
 	save_room();
-	local msg = st.message({type='groupchat', from=from})
+	local msg = st.message({type='groupchat', from=current_nick})
 		:tag('subject'):text(subject):up();
 	broadcast_message_stanza(room, msg, false);
-	--broadcast_message(current_nick, room, subject or "", nil);
 	return true;
 end
 
-function broadcast_presence(type, from, room, code, newnick)
-	local data = rooms:get(room, from);
-	local stanza = st.presence({type=type, from=from})
-		:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-		:tag("item", {affiliation=data.affiliation, role=data.role, nick = newnick}):up();
-	if code then
-		stanza:tag("status", {code=code}):up();
-	end
-	local me;
-	local r = rooms:get(room);
-	if r then
-		for occupant, o_data in pairs(r) do
-			if occupant ~= from then
-				stanza.attr.to = o_data.jid;
-				core_route_stanza(component, stanza);
-			else
-				me = o_data.jid;
-			end
-		end
-	end
-	if me then
-		stanza:tag("status", {code='110'});
-		stanza.attr.to = me;
-		core_route_stanza(component, stanza);
-	end
-end
-function broadcast_message(from, room, subject, body)
-	local stanza = st.message({type='groupchat', from=from});
-	if subject then stanza:tag('subject'):text(subject):up(); end
-	if body then stanza:tag('body'):text(body):up(); end
-	local r = rooms:get(room);
-	if r then
-		for occupant, o_data in pairs(r) do
-			stanza.attr.to = o_data.jid;
-			core_route_stanza(component, stanza);
-		end
-		if not subject and body then -- add to history
-			local history = rooms_info:get(room, 'history');
-			if not history then history = {}; rooms_info:set(room, 'history', history); end
-			-- stanza = st.deserialize(st.preserialize(stanza));
-			stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203
-			stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
-			t_insert(history, st.preserialize(stanza));
-			while #history > history_length do t_remove(history, 1) end
-		end
-	end
-end
 function broadcast_message_stanza(room, stanza, historic)
 	local r = rooms:get(room);
 	if r then
@@ -182,10 +141,10 @@ function broadcast_message_stanza(room, stanza, historic)
 		if historic then -- add to history
 			local history = rooms_info:get(room, 'history');
 			if not history then history = {}; rooms_info:set(room, 'history', history); end
-			-- stanza = st.deserialize(st.preserialize(stanza));
+			-- stanza = st.clone(stanza);
 			stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203
 			stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
-			t_insert(history, st.preserialize(stanza));
+			t_insert(history, st.clone(st.preserialize(stanza)));
 			while #history > history_length do t_remove(history, 1) end
 		end
 	end
@@ -226,57 +185,58 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
 	local room = jid_bare(to);
 	local current_nick = jid_nick:get(from, room);
 	local type = stanza.attr.type;
+	log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag());
+	if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end
 	if stanza.name == "presence" then
 		local pr = get_filtered_presence(stanza);
-		pr.attr.from = to;
+		pr.attr.from = current_nick;
 		if type == "error" then -- error, kick em out!
 			if current_nick then
-				local data = rooms:get(room, to);
-				data.role = 'none';
-				local pr = st.presence({type='unavailable', from=current_nick}):tag('status'):text('This participant is kicked from the room because he sent an error presence'):up()
-					:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-					:tag("item", {affiliation=data.affiliation, role=data.role}):up();
-				broadcast_presence_stanza(room, pr);
-				--broadcast_presence('unavailable', to, room); -- TODO also add <status>This participant is kicked from the room because he sent an error presence: badformed error stanza</status>
-				rooms:remove(room, to);
-				jid_nick:remove(from, room);
+				log("debug", "kicking %s from %s", current_nick, room);
+				handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('This participant is kicked from the room because he sent an error presence')); -- send unavailable
 			end
 		elseif type == "unavailable" then -- unavailable
 			if current_nick then
-				local data = rooms:get(room, to);
+				log("debug", "%s leaving %s", current_nick, room);
+				local data = rooms:get(room, current_nick);
 				data.role = 'none';
 				broadcast_presence_stanza(room, pr);
-				--broadcast_presence('unavailable', to, room);
-				rooms:remove(room, to);
+				rooms:remove(room, current_nick);
 				jid_nick:remove(from, room);
 			end
 		elseif not type then -- available
 			if current_nick then
-				if current_nick == to then -- simple presence
-					broadcast_presence_stanza(room, pr);
-					-- FIXME check if something was filtered. if it was, then user may be rejoining
-				else -- change nick
-					if rooms:get(room, to) then
-						origin.send(st.error_reply(stanza, "cancel", "conflict"));
-					else
-						local data = rooms:get(room, current_nick);
-						local to_nick = select(3, jid_split(to));
-						if to_nick then
-							local p = st.presence({type='unavailable', from=current_nick});
-								--[[:tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
-									:tag('item', {affiliation=data.affiliation, role=data.role, nick=to_nick}):up()
-									:tag('status', {code='303'});]]
-							broadcast_presence_stanza(room, p, '303', to_nick);
-							--broadcast_presence('unavailable', current_nick, room, '303', to_nick);
-							rooms:remove(room, current_nick);
-							rooms:set(room, to, data);
-							jid_nick:set(from, room, to);
-							broadcast_presence_stanza(room, pr);
-							--broadcast_presence(nil, to, room, nil);
+				if #pr == #stanza or current_nick ~= to then
+					if current_nick == to then -- simple presence
+						log("debug", "%s broadcasted presence", current_nick);
+						rooms:get(room, current_nick).sessions[from] = pr;
+						broadcast_presence_stanza(room, pr);
+					else -- change nick
+						if rooms:get(room, to) then
+							log("debug", "%s couldn't change nick", current_nick);
+							origin.send(st.error_reply(stanza, "cancel", "conflict"));
 						else
-							--TODO malformed-jid
+							local data = rooms:get(room, current_nick);
+							local to_nick = select(3, jid_split(to));
+							if to_nick then
+								log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to);
+								local p = st.presence({type='unavailable', from=current_nick});
+								broadcast_presence_stanza(room, p, '303', to_nick);
+								rooms:remove(room, current_nick);
+								rooms:set(room, to, data);
+								jid_nick:set(from, room, to);
+								pr.attr.from = to;
+								rooms:get(room, to).sessions[from] = pr;
+								broadcast_presence_stanza(room, pr);
+							else
+								--TODO malformed-jid
+							end
 						end
 					end
+				else -- possible rejoin
+					log("debug", "%s had connection replaced", current_nick);
+					handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('Replaced by new connection')); -- send unavailable
+					handle_to_occupant(origin, stanza); -- resend available
 				end
 			else -- enter room
 				local new_nick = to;
@@ -284,8 +244,10 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
 					new_nick = nil;
 				end
 				if not new_nick then
+					log("debug", "%s couldn't join due to nick conflict: %s", from, to);
 					origin.send(st.error_reply(stanza, "cancel", "conflict"));
 				else
+					log("debug", "%s joining as %s", from, to);
 					local data;
 					if not rooms:get(room) and not rooms_info:get(room) then -- new room
 						data = {affiliation='owner', role='moderator', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
@@ -298,19 +260,17 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
 					local r = rooms:get(room);
 					if r then
 						for occupant, o_data in pairs(r) do
-							if occupant ~= from then
+							if occupant ~= to then
 								local pres = get_filtered_presence(o_data.sessions[o_data.jid]);
 								pres.attr.to, pres.attr.from = from, occupant;
-								pres
-								--local pres = st.presence({to=from, from=occupant})
-									:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+								pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
 									:tag("item", {affiliation=o_data.affiliation, role=o_data.role}):up();
 								core_route_stanza(component, pres);
 							end
 						end
 					end
+					pr.attr.from = to;
 					broadcast_presence_stanza(room, pr);
-					--broadcast_presence(nil, to, room);
 					local history = rooms_info:get(room, 'history'); -- send discussion history
 					if history then
 						for _, msg in ipairs(history) do
@@ -327,24 +287,17 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc
 		elseif type ~= 'result' then -- bad type
 			origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
 		end
-	elseif not current_nick then -- not in room
+	elseif not current_nick and type ~= "error" then -- not in room
 		origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
 	elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
 		origin.send(st.error_reply(stanza, "modify", "bad-request"));
 	elseif stanza.name == "message" and type == "error" then
-		if current_nick then
-			local data = rooms:get(room, to);
-			data.role = 'none';
-			local pr = st.presence({type='unavailable', from=current_nick}):tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant'):up()
-				:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-				:tag("item", {affiliation=data.affiliation, role=data.role}):up();
-			broadcast_presence_stanza(room, pr);
-			rooms:remove(room, to);
-			jid_nick:remove(from, room);
-		end
+		log("debug", "%s kicked from %s for sending an error message", current_nick, room);
+		handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}):tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant')); -- send unavailable
 	else -- private stanza
 		local o_data = rooms:get(room, to);
 		if o_data then
+			log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid);
 			local jid = o_data.jid;
 			if stanza.name=='iq' and type=='get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then jid = jid_bare(jid); end
 			stanza.attr.to, stanza.attr.from = jid, current_nick;
@@ -379,7 +332,6 @@ function handle_to_room(origin, stanza) -- presence changes and groupchat messag
 			if subject then
 				set_subject(current_nick, room, subject); -- TODO use broadcast_message_stanza
 			else
-				--broadcast_message(current_nick, room, nil, getText(stanza, {"body"}));
 				broadcast_message_stanza(room, stanza, true);
 			end
 		end