Software / code / prosody
Changeset
8906:f15e35458ecc
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jun 2018 01:20:05 +0200 |
| parents | 8903:c5d5dfaa8d38 (current diff) 8905:65d1a80d3565 (diff) |
| children | 8909:dbb5ec6885fe |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_mam/mod_mam.lua Sat Jun 09 15:30:26 2018 +0200 +++ b/plugins/mod_mam/mod_mam.lua Sun Jun 10 01:20:05 2018 +0200 @@ -145,7 +145,7 @@ 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 @@ 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
