Merge 0.10->trunk

[prosody.git] / plugins / mod_private.lua

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 05f05708f4945bd85733be3812dd0e33b139b68d..9375cf80d9bd4d759c859cb8b222a0fc8ec04eec 100644 (file)
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -17,19 +17,21 @@ 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;
        if stanza.attr.type == "get" then
                local data, err = private_storage:get(origin.username, key);
                if data then
-                       return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
+                       origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
                elseif 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));
                else
-                       return origin.send(st.reply(stanza):add_child(query));
+                       origin.send(st.reply(stanza):add_child(query));
                end
+               return true;
        else -- type == set
                local data;
                if #tag ~= 0 then
@@ -38,8 +40,10 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
                -- TODO delete datastore if empty
                local ok, err = private_storage:set(origin.username, key, 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);