aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_mam
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_mam
parent0c291f3a41eb20f4af48c535eb3b7cfa144b5778 (diff)
parentbd52588649aae5fffa05f1f60d3a9dcd27281271 (diff)
downloadprosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.tar.gz
prosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
-rw-r--r--plugins/mod_mam/mod_mam.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index f46d3818..4235fd59 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -123,7 +123,9 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
end
module:log("debug", "Archive query, id %s with %s from %s until %s)",
- tostring(qid), qwith or "anyone", qstart or "the dawn of time", qend or "now");
+ tostring(qid), qwith or "anyone",
+ qstart and timestamp(qstart) or "the dawn of time",
+ qend and timestamp(qend) or "now");
-- RSM stuff
local qset = rsm.get(query);
@@ -139,7 +141,7 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
limit = qmax + 1;
before = before; after = after;
reverse = reverse;
- total = get_total;
+ total = use_total;
});
if not data then