Mercurial > prosody-hg

comparison plugins/mod_mam/mod_mam.lua @ 8146:5c91fb62338e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 17 May 2017 01:06:20 +0200
parents 2bda04a7b4d4
children 1dc6efcc420a
comparison
equal deleted inserted replaced
8133:102e1ec8bee1 8146:5c91fb62338e
121 end 121 end
122 qstart, qend = vstart, vend; 122 qstart, qend = vstart, vend;
123 end 123 end
124 124
125 module:log("debug", "Archive query, id %s with %s from %s until %s)", 125 module:log("debug", "Archive query, id %s with %s from %s until %s)",
126 tostring(qid), qwith or "anyone", qstart or "the dawn of time", qend or "now"); 126 tostring(qid), qwith or "anyone",
127 qstart and timestamp(qstart) or "the dawn of time",
128 qend and timestamp(qend) or "now");
127 129
128 -- RSM stuff 130 -- RSM stuff
129 local qset = rsm.get(query); 131 local qset = rsm.get(query);
130 local qmax = m_min(qset and qset.max or default_max_items, max_max_items); 132 local qmax = m_min(qset and qset.max or default_max_items, max_max_items);
131 local reverse = qset and qset.before or false; 133 local reverse = qset and qset.before or false;
137 start = qstart; ["end"] = qend; -- Time range 139 start = qstart; ["end"] = qend; -- Time range
138 with = qwith; 140 with = qwith;
139 limit = qmax + 1; 141 limit = qmax + 1;
140 before = before; after = after; 142 before = before; after = after;
141 reverse = reverse; 143 reverse = reverse;
142 total = get_total; 144 total = use_total;
143 }); 145 });
144 146
145 if not data then 147 if not data then
146 origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err)); 148 origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err));
147 return true; 149 return true;