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

mod_mam: Add support for page flipping

Browse source 
This was easy. Needs tests tho, 100% chance of the logic being
backwards.
This commit is contained in:
Kim Alvefur 2020-11-30 21:12:01 +01:00
parent b96341a58f
commit af189d8103
2 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/mod_mam/mod_mam.lua
View file

@ -147,6 +147,10 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
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
-- Load all the data!
local data, err = archive:find(origin.username, {
@ -199,17 +203,19 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
if not first then first = id; end
last = id;
if reverse then
if flip then
results[count] = fwd_st;
else
origin.send(fwd_st);
end
end
if reverse then
if flip then
for i = #results, 1, -1 do
origin.send(results[i]);
end
end
if reverse then
first, last = last, first;
end
@ -516,7 +522,6 @@ module:hook("message/full", message_handler, 0);
local advertise_extended = module:get_option_boolean("mam_advertise_extend", false);
-- TODO before-id, after-id
-- TODO ids
-- TODO page flipping
-- TODO archive metadata query
-- TODO delete feature flag option

44
spec/scansion/mam_extended.scs
View file

@ -76,3 +76,47 @@ Romeo receives:
</set>
</fin>
</iq>
# Get results in reverse order
Romeo sends:
<iq type="set" id="mamquery2">
<query xmlns="urn:xmpp:mam:2" queryid="q1">
<flip-page/>
</query>
</iq>
Romeo receives:
<message to="${Romeo's full JID}">
<result xmlns="urn:xmpp:mam:2" queryid="q1" id="{scansion:any}">
<forwarded xmlns="urn:xmpp:forward:0">
<delay stamp="2008-08-22T21:09:04Z" xmlns="urn:xmpp:delay"/>
<message to="someone@localhost" xmlns="jabber:client" type="chat" xml:lang="en" id="chat02" from="${Romeo's full JID}">
<body>U there?</body>
</message>
</forwarded>
</result>
</message>
Romeo receives:
<message to="${Romeo's full JID}">
<result xmlns="urn:xmpp:mam:2" queryid="q1" id="{scansion:any}">
<forwarded xmlns="urn:xmpp:forward:0">
<delay stamp="2008-08-22T21:09:04Z" xmlns="urn:xmpp:delay"/>
<message to="someone@localhost" xmlns="jabber:client" type="chat" xml:lang="en" id="chat01" from="${Romeo's full JID}">
<body>Hello</body>
</message>
</forwarded>
</result>
</message>
# FIXME unstable tag order from util.rsm
Romeo receives:
<iq type="result" id="mamquery2" to="${Romeo's full JID}">
<fin xmlns="urn:xmpp:mam:2" complete="true" queryid="q1">
<set xmlns="http://jabber.org/protocol/rsm" scansion:strict="false">
<count>2</count>
<first></first>
<last></last>
</set>
</fin>
</iq>