diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-10 11:29:47 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-10 11:29:47 +0000 |
| commit | 05cd95bf80167c87312b04107a3f2abc25e83094 (patch) | |
| tree | 479c845b81a7d47465c3223177a7119dbe3dd7ba /plugins/muc/mod_muc.lua | |
| parent | 4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (diff) | |
| parent | e39fde236178e9d41cf0b1f56aae0aad382df96b (diff) | |
| download | prosody-05cd95bf80167c87312b04107a3f2abc25e83094.tar.gz prosody-05cd95bf80167c87312b04107a3f2abc25e83094.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 0df8b790..9f907f17 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -126,9 +126,10 @@ local function handle_to_domain(event) if type == "error" or type == "result" then return; end if stanza.name == "iq" and type == "get" then local xmlns = stanza.tags[1].attr.xmlns; - if xmlns == "http://jabber.org/protocol/disco#info" then + local node = stanza.tags[1].attr.node; + if xmlns == "http://jabber.org/protocol/disco#info" and not node then origin.send(get_disco_info(stanza)); - elseif xmlns == "http://jabber.org/protocol/disco#items" then + elseif xmlns == "http://jabber.org/protocol/disco#items" and not node then origin.send(get_disco_items(stanza)); elseif xmlns == "http://jabber.org/protocol/muc#unique" then origin.send(st.reply(stanza):tag("unique", {xmlns = xmlns}):text(uuid_gen())); -- FIXME Random UUIDs can theoretically have collisions |