aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-09-23 17:55:49 +0200
committerKim Alvefur <zash@zash.se>2021-09-23 17:55:49 +0200
commit86c40a3873e9275fed054819c03a1ab2d1cc2050 (patch)
tree63e6d21a3055627c9830dd26a4120a924782b8f6 /plugins
parent24dc89e1259c1baacc51539e4acbad70ca903c1e (diff)
downloadprosody-86c40a3873e9275fed054819c03a1ab2d1cc2050.tar.gz
prosody-86c40a3873e9275fed054819c03a1ab2d1cc2050.zip
mod_mam: Merge main and RSM-specific log message here too
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_mam/mod_mam.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index 43ce27f3..afeef82b 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -143,22 +143,22 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
qstart, qend = vstart, vend;
end
- module:log("debug", "Archive query by %s id=%s with=%s when=%s...%s",
- origin.username,
- qid or stanza.attr.id,
- qwith or "*",
- qstart and timestamp(qstart) or "",
- qend and timestamp(qend) or "");
-
-- RSM stuff
local qset = rsm.get(query);
local qmax = m_min(qset and qset.max or default_max_items, max_max_items);
local reverse = qset and qset.before or false;
local before, after = qset and qset.before or qbefore, qset and qset.after or qafter;
if type(before) ~= "string" then before = nil; end
- if qset then
- module:log("debug", "Archive query id=%s rsm=%q", qid or stanza.attr.id, qset);
- end
+
+
+ module:log("debug", "Archive query by %s id=%s with=%s when=%s...%s rsm=%q",
+ origin.username,
+ qid or stanza.attr.id,
+ qwith or "*",
+ qstart and timestamp(qstart) or "",
+ qend and timestamp(qend) or "",
+ qset);
+
-- A reverse query needs to be flipped
local flip = reverse;
-- A flip-page query needs to be the opposite of that.