mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_muc_mam: Merge main and RSM-specific log message into a single one

Browse source
This commit is contained in:
Kim Alvefur 2021-09-23 15:53:39 +02:00
parent 0a8a04dcb1
commit f958af4a11
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/mod_muc_mam.lua
View file

@ -175,12 +175,6 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
qstart, qend = vstart, vend;
end
module:log("debug", "Archive query by %s id=%s when=%s...%s",
from,
qid or stanza.attr.id,
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);
@ -188,14 +182,18 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
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
-- A reverse query needs to be flipped
local flip = reverse;
-- A flip-page query needs to be the opposite of that.
if query:get_child("flip-page") then flip = not flip end
module:log("debug", "Archive query by %s id=%s when=%s...%s rsm=%q",
from,
qid or stanza.attr.id,
qstart and timestamp(qstart) or "",
qend and timestamp(qend) or "",
qset);
-- Load all the data!
local data, err = archive:find(room_node, {
start = qstart; ["end"] = qend; -- Time range