diff options
| author | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
| commit | 9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7 (patch) | |
| tree | 87920ea2589baddc568772aeebb1fda17b5c9e0c /plugins/mod_mam/mod_mam.lua | |
| parent | d300932f7b75b891e6dfcf7d568d796c227b9502 (diff) | |
| parent | 8c3f6bd236ef6addc1dda80d42d6fd73acc4e1f5 (diff) | |
| download | prosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.tar.gz prosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mod_mam.lua')
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 6 |
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 |