diff options
| author | Kim Alvefur <zash@zash.se> | 2018-11-17 15:48:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-11-17 15:48:32 +0100 |
| commit | 84440f2e91632d32c5484165547b4c3495fca2c0 (patch) | |
| tree | b7dd1f7b94bc4a621e3f8785701731acdf5aa017 | |
| parent | 4b9b245dc0ec77a2ee8ca99e5a6ec88e301703a6 (diff) | |
| parent | 320392f1d11e27b89f8ce0556812465c1bf1ed40 (diff) | |
| download | prosody-84440f2e91632d32c5484165547b4c3495fca2c0.tar.gz prosody-84440f2e91632d32c5484165547b4c3495fca2c0.zip | |
Merge 0.11->trunk
| -rw-r--r-- | plugins/mod_csi_simple.lua | 9 | ||||
| -rw-r--r-- | spec/util_stanza_spec.lua | 14 | ||||
| -rw-r--r-- | util/stanza.lua | 11 |
3 files changed, 30 insertions, 4 deletions
diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index 1535edae..c8151df5 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -48,6 +48,9 @@ local queue_size = module:get_option_number("csi_queue_size", 256); module:hook("csi-is-stanza-important", function (event) local stanza = event.stanza; + if not st.is_stanza(stanza) then + return true; + end local st_name = stanza.name; if not st_name then return false; end local st_type = stanza.attr.type; @@ -82,8 +85,10 @@ module:hook("csi-client-inactive", function (event) pump:flush(); send(stanza); else - stanza = st.clone(stanza); - stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = bare_jid, stamp = dt.datetime()})); + if st.is_stanza(stanza) then + stanza = st.clone(stanza); + stanza:add_direct_child(st.stanza("delay", {xmlns = "urn:xmpp:delay", from = bare_jid, stamp = dt.datetime()})); + end pump:push(stanza); end return true; diff --git a/spec/util_stanza_spec.lua b/spec/util_stanza_spec.lua index 7eaadfe6..7fe836c7 100644 --- a/spec/util_stanza_spec.lua +++ b/spec/util_stanza_spec.lua @@ -346,4 +346,18 @@ describe("util.stanza", function() end, "Invalid stanza"); end); end); + + describe("#clone", function () + it("works", function () + local s = st.message({type="chat"}, "Hello"):reset(); + local c = st.clone(s); + assert.same(s, c); + end); + + it("works", function () + assert.has_error(function () + st.clone("this is not a stanza"); + end); + end); + end); end); diff --git a/util/stanza.lua b/util/stanza.lua index 85c89d43..8d199912 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -398,7 +398,7 @@ local function deserialize(stanza) return stanza; end -local function clone(stanza) +local function _clone(stanza) local attr, tags = {}, {}; for k,v in pairs(stanza.attr) do attr[k] = v; end local old_namespaces, namespaces = stanza.namespaces; @@ -410,7 +410,7 @@ local function clone(stanza) for i=1,#stanza do local child = stanza[i]; if child.name then - child = clone(child); + child = _clone(child); t_insert(tags, child); end t_insert(new, child); @@ -418,6 +418,13 @@ local function clone(stanza) return setmetatable(new, stanza_mt); end +local function clone(stanza) + if not is_stanza(stanza) then + error("bad argument to clone: expected stanza, got "..type(stanza)); + end + return _clone(stanza); +end + local function message(attr, body) if not body then return new_stanza("message", attr); |