projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bc0d957
)
mod_muc: Don't bounce error replies in response to errors
author
Matthew Wild
<mwild1@gmail.com>
Mon, 2 Mar 2009 19:50:28 +0000
(19:50 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Mon, 2 Mar 2009 19:50:28 +0000
(19:50 +0000)
plugins/mod_muc.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_muc.lua
b/plugins/mod_muc.lua
index 83c35563457cc220a380a02679f0850b4e2cf358..1f8d04e99586be9f4dd9aaa32dae39f917f7bd87 100644
(file)
--- 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 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"));
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"));