319 end |
319 end |
320 end |
320 end |
321 elseif type ~= 'result' then -- bad type |
321 elseif type ~= 'result' then -- bad type |
322 origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error? |
322 origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error? |
323 end |
323 end |
324 elseif not current_nick and type ~= "error" then -- not in room |
324 elseif not current_nick and type ~= "error" and type ~= "result" then -- not in room |
325 origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); |
325 origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); |
326 elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM |
326 elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM |
327 origin.send(st.error_reply(stanza, "modify", "bad-request")); |
327 origin.send(st.error_reply(stanza, "modify", "bad-request")); |
328 elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then |
328 elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then |
329 log("debug", "%s kicked from %s for sending an error message", current_nick, room); |
329 log("debug", "%s kicked from %s for sending an error message", current_nick, room); |