From 264ed76508ef6a0bf83f28f55e53ff9ae906b7cd Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 17 Feb 2009 02:48:06 +0500 Subject: MUC: Fixed: Presence for user joining the roomi was sent twice to the user --- plugins/mod_muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 9a559f2d..a306c699 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -298,7 +298,7 @@ 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 -- cgit v1.2.3 From b964df3b328d3b83dc5e466dcb666c40198a19cc Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 18 Feb 2009 23:30:33 +0500 Subject: MUC: Various fixes --- plugins/mod_muc.lua | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index a306c699..7c18b9c4 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -116,7 +116,7 @@ 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); @@ -231,30 +231,35 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc pr.attr.from = to; if type == "error" then -- error, kick em out! if current_nick then - local data = rooms:get(room, to); + 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(); + --: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 This participant is kicked from the room because he sent an error presence: badformed error stanza - rooms:remove(room, to); + --broadcast_presence('unavailable', current_nick, room); -- TODO also add This participant is kicked from the room because he sent an error presence: badformed error stanza + rooms:remove(room, current_nick); jid_nick:remove(from, room); end elseif type == "unavailable" then -- unavailable if current_nick then - local data = rooms:get(room, to); + local data = rooms:get(room, current_nick); data.role = 'none'; broadcast_presence_stanza(room, pr); - --broadcast_presence('unavailable', to, room); - rooms:remove(room, to); + --broadcast_presence('unavailable', current_nick, room); + 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 + if #pr == #stanza then + broadcast_presence_stanza(room, pr); + else -- possible rejoin + local pr_ = st.presence({type='unavailable', from=from, to=current_nick}):tag('status'):text('Replaced by new connection'); + handle_to_occupant(origin, pr_); -- send unavailable + handle_to_occupant(origin, pr); -- resend available + end else -- change nick if rooms:get(room, to) then origin.send(st.error_reply(stanza, "cancel", "conflict")); -- cgit v1.2.3 From ac2f11fb5fbbe8111ce741e4509a73a71442f400 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 19 Feb 2009 02:01:31 +0500 Subject: MUC: Added logging --- plugins/mod_muc.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 7c18b9c4..38e93a45 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -226,11 +226,13 @@ 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, current_nick, stanza:top_tag()); if stanza.name == "presence" then local pr = get_filtered_presence(stanza); pr.attr.from = to; if type == "error" then -- error, kick em out! if current_nick then + log("debug", "kicking %s from %s", current_nick, room); 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() @@ -243,6 +245,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc end elseif type == "unavailable" then -- unavailable if current_nick then + log("debug", "%s leaving %s", current_nick, room); local data = rooms:get(room, current_nick); data.role = 'none'; broadcast_presence_stanza(room, pr); @@ -254,19 +257,23 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc if current_nick then if current_nick == to then -- simple presence if #pr == #stanza then + log("debug", "%s broadcasted presence", current_nick); broadcast_presence_stanza(room, pr); else -- possible rejoin + log("debug", "%s had connection replaced", current_nick); local pr_ = st.presence({type='unavailable', from=from, to=current_nick}):tag('status'):text('Replaced by new connection'); handle_to_occupant(origin, pr_); -- send unavailable handle_to_occupant(origin, pr); -- resend available end 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 local data = rooms:get(room, current_nick); local to_nick = select(3, jid_split(to)); if to_nick then + log("debug", "%s changing nick to %s", current_nick, to_nick); 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() @@ -289,8 +296,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)}}; @@ -338,6 +347,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc origin.send(st.error_reply(stanza, "modify", "bad-request")); elseif stanza.name == "message" and type == "error" then if current_nick then + log("debug", "%s kicked from %s for sending an error message", current_nick, room); 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() @@ -350,6 +360,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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; -- cgit v1.2.3 From 3b253992f156d8c91a1d9be6141349e032fa49bf Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 19 Feb 2009 14:10:26 +0500 Subject: MUC: Logging - logger doesn't like nils --- plugins/mod_muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 38e93a45..51a6c3b5 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -226,7 +226,7 @@ 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, current_nick, stanza:top_tag()); + log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag()); if stanza.name == "presence" then local pr = get_filtered_presence(stanza); pr.attr.from = to; -- cgit v1.2.3 From 3af91c3bf28a042b5ba08d085b3b4f1aefabb377 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 19 Feb 2009 20:17:07 +0500 Subject: MUC: Bug fixes and workarounds --- plugins/mod_muc.lua | 70 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 30 deletions(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 51a6c3b5..5fa52726 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -229,7 +229,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag()); 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 log("debug", "kicking %s from %s", current_nick, room); @@ -246,6 +246,8 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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); @@ -255,40 +257,47 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc end elseif not type then -- available if current_nick then - if current_nick == to then -- simple presence - if #pr == #stanza then + if #pr == #stanza 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 -- possible rejoin - log("debug", "%s had connection replaced", current_nick); - local pr_ = st.presence({type='unavailable', from=from, to=current_nick}):tag('status'):text('Replaced by new connection'); - handle_to_occupant(origin, pr_); -- send unavailable - handle_to_occupant(origin, pr); -- resend available - end - 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 - local data = rooms:get(room, current_nick); - local to_nick = select(3, jid_split(to)); - if to_nick then - log("debug", "%s changing nick to %s", current_nick, to_nick); - 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); + 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); +-- 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 end end + else -- possible rejoin + log("debug", "%s had connection replaced", current_nick); + local pr_ = st.presence({type='unavailable', from=from, to=current_nick}):tag('status'):text('Replaced by new connection'); + handle_to_occupant(origin, pr_); -- send unavailable + handle_to_occupant(origin, stanza); -- resend available end else -- enter room local new_nick = to; @@ -323,6 +332,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 -- cgit v1.2.3 From 1113fbdedd06e496c037a9449fd9136c0cbf58bb Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 20 Feb 2009 00:51:33 +0500 Subject: MUC: Throw an error if we try talking to ourselves --- plugins/mod_muc.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 5fa52726..e02ab00e 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -227,6 +227,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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) error("Presence from the MUC itself!!!"); if stanza.name == "presence" then local pr = get_filtered_presence(stanza); pr.attr.from = current_nick; -- cgit v1.2.3 From 4c696b7d8acaed5e4e324cae6f27d28d21a101d5 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 20 Feb 2009 00:56:14 +0500 Subject: MUC: Syntax error in last commit - this is lua :) --- plugins/mod_muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index e02ab00e..b82ea37f 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -227,7 +227,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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) error("Presence from the MUC itself!!!"); + 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 = current_nick; -- cgit v1.2.3 From b561d477830c46fbf4bda0b8145788c4c45ec30f Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 20 Feb 2009 02:23:21 +0500 Subject: MUC: Use util.stanza.clone instead of pre/deserialize for cloning stanzas --- plugins/mod_muc.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index b82ea37f..bae3d476 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -62,7 +62,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; @@ -162,10 +162,10 @@ function broadcast_message(from, room, subject, body) 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 = 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 @@ -182,10 +182,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 -- cgit v1.2.3 From 8f0b93e738a6df64a7eb70766ff31873c880d436 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 20 Feb 2009 03:52:04 +0500 Subject: MUC: Workaround for a Gajim bug (it includes in nick change presences) --- plugins/mod_muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index bae3d476..a0252dfc 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -258,7 +258,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc end elseif not type then -- available if current_nick then - if #pr == #stanza then + 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; -- cgit v1.2.3 From 656e45305cbbfbb55ebefdb4c51ef7bffaf07ece Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 21 Feb 2009 01:24:23 +0500 Subject: MUC: Removed commented and unused code --- plugins/mod_muc.lua | 69 +---------------------------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index a0252dfc..4b10a907 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -119,57 +119,9 @@ function set_subject(current_nick, room, subject) 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 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 This participant is kicked from the room because he sent an error presence: badformed error stanza 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 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 @@ 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 -- cgit v1.2.3 From 56b621a54d64a8ed13d785ac5d39616f18aa8ffb Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 21 Feb 2009 01:49:09 +0500 Subject: MUC: Replaced some duplicate code --- plugins/mod_muc.lua | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 4b10a907..a2bc683b 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -186,12 +186,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc if type == "error" then -- error, kick em out! if current_nick then log("debug", "kicking %s from %s", current_nick, room); - 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() - broadcast_presence_stanza(room, pr); - rooms:remove(room, current_nick); - jid_nick:remove(from, 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 @@ -233,8 +228,7 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc end else -- possible rejoin log("debug", "%s had connection replaced", current_nick); - local pr_ = st.presence({type='unavailable', from=from, to=current_nick}):tag('status'):text('Replaced by new connection'); - handle_to_occupant(origin, pr_); -- send unavailable + 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 @@ -291,17 +285,8 @@ function handle_to_occupant(origin, stanza) -- PM, vCards, etc 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 - log("debug", "%s kicked from %s for sending an error message", current_nick, room); - 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 -- cgit v1.2.3 From 4c2d9d14bc190e9c17d51a1eae47cf9a7a34b861 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 21 Feb 2009 01:57:13 +0500 Subject: MUC: Added copyright notice --- plugins/mod_muc.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index a2bc683b..83c35563 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; -- cgit v1.2.3 From b6b9906c3c653935b55ad79ad4a2c41118f0a0e3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 2 Mar 2009 19:50:28 +0000 Subject: mod_muc: Don't bounce error replies in response to errors --- plugins/mod_muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc.lua') diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua index 83c35563..1f8d04e9 100644 --- a/plugins/mod_muc.lua +++ b/plugins/mod_muc.lua @@ -287,7 +287,7 @@ 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")); -- cgit v1.2.3