From 7cfa1513cc23bb7b305f2607581c7fece4c2bf95 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 21 Sep 2015 23:06:22 +0200 Subject: plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) --- plugins/mod_private.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'plugins/mod_private.lua') diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua index 8bca5154..c01053d5 100644 --- a/plugins/mod_private.lua +++ b/plugins/mod_private.lua @@ -17,19 +17,23 @@ module:hook("iq/self/jabber:iq:private:query", function(event) local origin, stanza = event.origin, event.stanza; local query = stanza.tags[1]; if #query.tags ~= 1 then - return origin.send(st.error_reply(stanza, "modify", "bad-format")); + origin.send(st.error_reply(stanza, "modify", "bad-format")); + return true; end local tag = query.tags[1]; local key = tag.name..":"..tag.attr.xmlns; local data, err = private_storage:get(origin.username); if err then - return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); + origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); + return true; end if stanza.attr.type == "get" then if data and data[key] then - return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data[key]))); + origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data[key]))); + return true; else - return origin.send(st.reply(stanza):add_child(query)); + origin.send(st.reply(stanza):add_child(query)); + return true; end else -- type == set if not data then data = {}; end; @@ -41,8 +45,10 @@ module:hook("iq/self/jabber:iq:private:query", function(event) -- TODO delete datastore if empty local ok, err = private_storage:set(origin.username, data); if not ok then - return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); + origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); + return true; end - return origin.send(st.reply(stanza)); + origin.send(st.reply(stanza)); + return true; end end); -- cgit v1.2.3