aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_storage_internal.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-17 01:06:20 +0200
committerKim Alvefur <zash@zash.se>2017-05-17 01:06:20 +0200
commit9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7 (patch)
tree87920ea2589baddc568772aeebb1fda17b5c9e0c /plugins/mod_storage_internal.lua
parent0c291f3a41eb20f4af48c535eb3b7cfa144b5778 (diff)
parentbd52588649aae5fffa05f1f60d3a9dcd27281271 (diff)
downloadprosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.tar.gz
prosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_internal.lua')
-rw-r--r--plugins/mod_storage_internal.lua11
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
index 21a63c95..0a382cee 100644
--- a/plugins/mod_storage_internal.lua
+++ b/plugins/mod_storage_internal.lua
@@ -139,12 +139,19 @@ function archive:delete(username, query)
if k ~= "end" then return nil, "unsupported-query-field"; end
end
local items, err = datamanager.list_load(username, host, self.store);
- if not items then return items, err; end
+ if not items then
+ if err then
+ return items, err;
+ end
+ -- Store is empty
+ return 0;
+ end
items = array(items);
+ local count_before = #items;
items:filter(function (item)
return item.when > query["end"];
end);
- local count = #items;
+ local count = count_before - #items;
local ok, err = datamanager.list_store(username, host, self.store, items);
if not ok then return ok, err; end
return count;