# HG changeset patch # User Waqas Hussain # Date 1271683859 -18000 # Node ID 5760074dc7d4bf435e35e2da17612c0bf103a49c # Parent 686f9a5a7f5e03be4aa55d6545bda346e17ead5b MUC: Include in a message, not in presence. Fixes various issues. diff -r 686f9a5a7f5e -r 5760074dc7d4 plugins/muc/muc.lib.lua --- a/plugins/muc/muc.lib.lua Mon Apr 19 18:29:10 2010 +0500 +++ b/plugins/muc/muc.lib.lua Mon Apr 19 18:30:59 2010 +0500 @@ -319,6 +319,11 @@ :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up() :tag("status", {code='110'})); end + if self._data.whois == 'anyone' then -- non-anonymous? + self:_route_stanza(st.stanza("message", {from=to, to=from, type='groupchat'}) + :tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) + :tag("status", {code='100'})); + end self:send_history(from); else -- banned local reply = st.error_reply(stanza, "auth", "forbidden"):up(); @@ -799,9 +804,6 @@ end end end - if self._data.whois == 'anyone' then - muc_child:tag('status', { code = '100' }); - end end self:route_stanza(stanza); if muc_child then