diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-09-07 20:35:09 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-09-07 20:35:09 +0500 |
| commit | a786afa14d3eadc24e91cd7b60eb82784e7740d3 (patch) | |
| tree | d5467a5a3c333105bbeb1e03eee7068ee1d641c6 /plugins | |
| parent | 5ca2c3be1da01c7aa1c6a40f1eeb6b630f838895 (diff) | |
| download | prosody-a786afa14d3eadc24e91cd7b60eb82784e7740d3.tar.gz prosody-a786afa14d3eadc24e91cd7b60eb82784e7740d3.zip | |
MUC: Some fixes for minor bugs in IQ handling.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 8cf20b09..8538d01a 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -309,8 +309,8 @@ end function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc local type = stanza.attr.type; - if stanza.name == "iq" and type == "get" then -- disco requests - local xmlns = stanza.tags[1].attr.xmlns; + local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns; + if stanza.name == "iq" and type == "get" and xmlns ~= "http://jabber.org/protocol/muc#admin" then -- disco requests if xmlns == "http://jabber.org/protocol/disco#info" then origin.send(room_get_disco_info(self, stanza)); elseif xmlns == "http://jabber.org/protocol/disco#items" then @@ -318,20 +318,20 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha else origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); end - elseif stanza.name == "iq" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#admin" then + elseif stanza.name == "iq" and xmlns == "http://jabber.org/protocol/muc#admin" then local actor = stanza.attr.from; local affiliation = self:get_affiliation(actor); local current_nick = self._jid_nick[actor]; local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation); - local item = stanza.tags[1] and stanza.tags[1].tags[1]; + local item = stanza.tags[1].tags[1]; if item and item.name == "item" then if type == "set" then local callback = function() origin.send(st.reply(stanza)); end if item.attr.affiliation and item.attr.jid and not item.attr.role and not item.attr.nick then local success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, callback); if not success then origin.send(st.error_reply(stanza, errtype, err)); end - elseif item.attr.role and item.attr.nick and not item.attr.affiliation and not item.attr.jid then - local success, errtype, err = self:set_role(actor, item.attr.nick, item.attr.role, callback); + elseif item.attr.role and item.attr.nick and not item.attr.affiliation then + local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback); if not success then origin.send(st.error_reply(stanza, errtype, err)); end else origin.send(st.error_reply(stanza, "cancel", "bad-request")); |