# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1543349899 -3600
# Node ID a58b48268ecd2786bf358b83ac40e5f0b5f5eb22
# Parent  0f43b901c854d1edae1a8d422b2bae7651c0dbe8# Parent  989cf872d5c03ffdb61e44a918d2832803e8ad85
Merge 0.11->trunk

diff -r 0f43b901c854 -r a58b48268ecd plugins/mod_csi.lua
--- a/plugins/mod_csi.lua	Tue Nov 27 17:01:47 2018 +0100
+++ b/plugins/mod_csi.lua	Tue Nov 27 21:18:19 2018 +0100
@@ -11,6 +11,7 @@
 function refire_event(name)
 	return function (event)
 		if event.origin.username then
+			session.state = event.stanza.name;
 			module:fire_event(name, event);
 			return true;
 		end
diff -r 0f43b901c854 -r a58b48268ecd plugins/mod_csi_simple.lua
--- a/plugins/mod_csi_simple.lua	Tue Nov 27 17:01:47 2018 +0100
+++ b/plugins/mod_csi_simple.lua	Tue Nov 27 21:18:19 2018 +0100
@@ -81,11 +81,11 @@
 		pump:pause();
 		session.pump = pump;
 		function session.send(stanza)
-			if module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then
+			if session.state == "active" or module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then
 				pump:flush();
 				send(stanza);
 			else
-				if st.is_stanza(stanza) then
+				if st.is_stanza(stanza) and stanza.attr.xmlns == nil and stanza.name ~= "iq" then
 					stanza = st.clone(stanza);
 					stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = bare_jid, stamp = dt.datetime()}));
 				end