Software / code / prosody
Diff
plugins/muc/muc.lib.lua @ 5242:b86172b12912
Merge 0.9->trunk
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sat, 15 Dec 2012 07:12:32 +0500 |
| parent | 5241:4516e6bd51b4 |
| child | 5294:87f07dd0bbfb |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Tue Dec 11 23:41:02 2012 +0100 +++ b/plugins/muc/muc.lib.lua Sat Dec 15 07:12:32 2012 +0500 @@ -914,8 +914,8 @@ elseif type ~= "error" and type ~= "result" then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); end - elseif stanza.name == "message" and not stanza.attr.type and #stanza.tags == 1 and self._jid_nick[stanza.attr.from] - and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" then + elseif stanza.name == "message" and not(type == "chat" or type == "error" or type == "groupchat" or type == "headline") and #stanza.tags == 1 + and self._jid_nick[stanza.attr.from] and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" then local x = stanza.tags[1]; local payload = (#x.tags == 1 and x.tags[1]); if payload and payload.name == "invite" and payload.attr.to then
