MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

modules/client/rooms/members: Fix at token usage.

Browse source
This commit is contained in:
Jason Volk 2019-09-23 14:26:18 -07:00
parent 82a2f14481
commit 35f9810dbd
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/client/rooms/members.cc
View file

@ -60,30 +60,21 @@ get__members(client &client,
split(at, '_')
};
const auto event_idx
const auto at_idx
{
snapshot?
lex_cast<m::event::idx>(snapshot):
since?
lex_cast<m::event::idx>(since):
0UL
-1UL
};
const m::event::id::buf event_id
{
event_idx && event_idx <= m::vm::sequence::retired?
m::event_id(event_idx, std::nothrow):
m::event::id::buf{}
};
// View the room at the requested event; if no event requested this
// instance represents the present state of the room.
const m::room room
{
room_id, event_id
room_id
};
if(!event_id && !exists(room))
if(!exists(room))
throw m::NOT_FOUND
{
"Room %s does not exist.",
@ -154,9 +145,12 @@ get__members(client &client,
}};
// prefetch loop
members.for_each(membership, [&membership, &membership_match]
members.for_each(membership, [&membership, &membership_match, &at_idx]
(const m::user::id &member, const m::event::idx &event_idx)
{
if(event_idx > at_idx)
return true;
if(!membership && !membership_match(member, event_idx))
return true;
@ -165,9 +159,12 @@ get__members(client &client,
});
// stream to client
members.for_each(membership, [&membership, &membership_match, &chunk]
members.for_each(membership, [&membership, &membership_match, &at_idx, &chunk]
(const m::user::id &member, const m::event::idx &event_idx)
{
if(event_idx > at_idx)
return true;
if(!membership && !membership_match(member, event_idx))
return true;