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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-01-21 17:18:16 +01:00
commit dbbde4a0f0
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/mod_mam/mod_mam.lua
View file

@ -142,9 +142,14 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
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
-- 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 with=%s when=%s...%s rsm=%q",
origin.username,
@ -154,11 +159,6 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
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.
if query:get_child("flip-page") then flip = not flip end
-- Load all the data!
local data, err = archive:find(origin.username, {
start = qstart; ["end"] = qend; -- Time range

23
plugins/mod_muc_mam.lua
View file

@ -67,6 +67,7 @@ if archive.name == "null" or not archive.find then
module:log("info", "See https://prosody.im/doc/storage and https://prosody.im/doc/archiving for more information");
return false;
end
local use_total = module:get_option_boolean("muc_log_include_total", true);
local function archiving_enabled(room)
if log_all_rooms then
@ -109,10 +110,20 @@ local query_form = dataform {
{ name = "end"; type = "text-single"; datatype = "xs:dateTime" };
};
if archive.caps and archive.caps.full_id_range then
table.insert(query_form, { name = "before-id"; type = "text-single"; });
table.insert(query_form, { name = "after-id"; type = "text-single"; });
end
if archive.caps and archive.caps.ids then
table.insert(query_form, { name = "ids"; type = "list-multi"; });
end
-- Serve form
module:hook("iq-get/bare/"..xmlns_mam..":query", function(event)
local origin, stanza = event.origin, event.stanza;
origin.send(st.reply(stanza):tag("query", { xmlns = xmlns_mam }):add_child(query_form:form()));
origin.send(st.reply(stanza):query(xmlns_mam):add_child(query_form:form()));
return true;
end);
@ -172,6 +183,7 @@ 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
-- A reverse query needs to be flipped
local flip = reverse;
-- A flip-page query needs to be the opposite of that.
@ -187,11 +199,12 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
-- Load all the data!
local data, err = archive:find(room_node, {
start = qstart; ["end"] = qend; -- Time range
with = "message<groupchat";
limit = qmax + 1;
before = before; after = after;
ids = qids;
reverse = reverse;
with = "message<groupchat";
total = use_total or qmax == 0;
});
if not data then
@ -216,6 +229,8 @@ module:hook("iq-set/bare/"..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
@ -259,7 +274,6 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event)
first, last = last, first;
end
origin.send(st.reply(stanza)
:tag("fin", { xmlns = xmlns_mam, complete = complete })
:add_child(rsm.generate {
@ -551,4 +565,7 @@ if cleanup_after ~= "never" then
else
module:log("debug", "Archive expiry disabled");
-- Don't ask the backend to count the potentially unbounded number of items,
-- it'll get slow.
use_total = module:get_option_boolean("mam_include_total", false);
end