aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-10 01:20:05 +0200
committerKim Alvefur <zash@zash.se>2018-06-10 01:20:05 +0200
commit0c7f971a484cc7b93d599ea8f0d8878a04fa994f (patch)
tree349dd0220f89e02d73610850acd422d6862ffe4c
parentf4edab7047ed425561e429c2be064fd20ef258ad (diff)
parentb7fc41affc5f5ae2f726b3c17e89fc7deb6b81f7 (diff)
downloadprosody-0c7f971a484cc7b93d599ea8f0d8878a04fa994f.tar.gz
prosody-0c7f971a484cc7b93d599ea8f0d8878a04fa994f.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_mam/mod_mam.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index cf622e0f..2874ac23 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -145,7 +145,7 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
local data, err = archive:find(origin.username, {
start = qstart; ["end"] = qend; -- Time range
with = qwith;
- limit = qmax + 1;
+ limit = qmax == 0 and 0 or qmax + 1;
before = before; after = after;
reverse = reverse;
total = use_total or qmax == 0;
@@ -168,6 +168,8 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
for id, item, when in data do
count = count + 1;
if count > qmax then
+ -- We requested qmax+1 items. If that many items are retrieved then
+ -- there are more results to page through, so:
complete = nil;
break;
end