Changeset

--- a/plugins/mod_muc.lua	Sat Feb 21 01:13:53 2009 +0500
+++ b/plugins/mod_muc.lua	Sat Feb 21 01:24:23 2009 +0500
@@ -119,57 +119,9 @@
 	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.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.clone(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
@@ -237,22 +189,16 @@
 				local data = rooms:get(room, current_nick);
 				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', current_nick, 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, current_nick);
 				jid_nick:remove(from, room);
 			end
 		elseif type == "unavailable" then -- unavailable
 			if current_nick then
 				log("debug", "%s leaving %s", current_nick, room);
---							log("debug", "rooms: %s", require "util.serialization".serialize(rooms.data));
---							log("debug", "jid_nick: %s", require "util.serialization".serialize(jid_nick.data));
 				local data = rooms:get(room, current_nick);
 				data.role = 'none';
 				broadcast_presence_stanza(room, pr);
-				--broadcast_presence('unavailable', current_nick, room);
 				rooms:remove(room, current_nick);
 				jid_nick:remove(from, room);
 			end
@@ -272,23 +218,14 @@
 							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);
---								log("debug", "rooms: %s", require "util.serialization".serialize(rooms.data));
---								log("debug", "jid_nick: %s", require "util.serialization".serialize(jid_nick.data));
 								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);
 								pr.attr.from = to;
 								rooms:get(room, to).sessions[from] = pr;
 								broadcast_presence_stanza(room, pr);
---								log("debug", "rooms: %s", require "util.serialization".serialize(rooms.data));
---								log("debug", "jid_nick: %s", require "util.serialization".serialize(jid_nick.data));
-								--broadcast_presence(nil, to, room, nil);
 							else
 								--TODO malformed-jid
 							end
@@ -325,9 +262,7 @@
 							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
@@ -335,7 +270,6 @@
 					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
@@ -406,7 +340,6 @@
 			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