From 0db6c3f669d4c62d01f86ad9ee1b3754b861dfe1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 27 Nov 2018 18:56:22 +0100 Subject: mod_csi_simple: Don't set stamps on stanzas (fixes #1248) --- plugins/mod_csi_simple.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index f3df5734..551b13c0 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -85,7 +85,7 @@ module:hook("csi-client-inactive", function (event) pump:flush(); send(stanza); else - if st.is_stanza(stanza) then + if st.is_stanza(stanza) and st.attr.xmlns == nil and st.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 -- cgit v1.2.3 From 1796f20abcadc4626422d9476f88646a8953db6a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 27 Nov 2018 19:05:11 +0100 Subject: mod_csi_simple: Bypass importance event in active mode (fixes #1249) --- plugins/mod_csi_simple.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index 551b13c0..99e4408d 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -71,6 +71,7 @@ end, -1); module:hook("csi-client-inactive", function (event) local session = event.origin; + session.state = "inactive"; if session.pump then session.pump:pause(); else @@ -81,7 +82,7 @@ module:hook("csi-client-inactive", function (event) 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 @@ -98,6 +99,7 @@ end); module:hook("csi-client-active", function (event) local session = event.origin; + session.state = "active"; if session.pump then session.pump:resume(); end -- cgit v1.2.3 From 64b9b5a758874d074778dc913a2274f0ff410391 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 27 Nov 2018 19:15:33 +0100 Subject: mod_csi_simple: Fix autocompletion mistake --- plugins/mod_csi_simple.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index 99e4408d..f00279d3 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -86,7 +86,7 @@ module:hook("csi-client-inactive", function (event) pump:flush(); send(stanza); else - if st.is_stanza(stanza) and st.attr.xmlns == nil and st.name ~= "iq" 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 -- cgit v1.2.3 From a24712e84549f512be9339976cf2e5583292703e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 27 Nov 2018 19:34:21 +0100 Subject: mod_csi: Set session.state to simplify CSI modules Moved here from mod_csi_simple --- plugins/mod_csi.lua | 1 + plugins/mod_csi_simple.lua | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/mod_csi.lua b/plugins/mod_csi.lua index 03f052b7..7f50dfd9 100644 --- a/plugins/mod_csi.lua +++ b/plugins/mod_csi.lua @@ -11,6 +11,7 @@ end); 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 --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index f00279d3..1efff38f 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -71,7 +71,6 @@ end, -1); module:hook("csi-client-inactive", function (event) local session = event.origin; - session.state = "inactive"; if session.pump then session.pump:pause(); else @@ -99,7 +98,6 @@ end); module:hook("csi-client-active", function (event) local session = event.origin; - session.state = "active"; if session.pump then session.pump:resume(); end -- cgit v1.2.3