MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

modules/client: Use the event::idx sequence difference for unsigned.age.

Browse source
This commit is contained in:
Jason Volk 2019-01-10 16:56:32 -08:00
parent 86ae182f64
commit 11f905274e
2 changed files with 57 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
modules/client/rooms/messages.cc
View file

@ -22,6 +22,11 @@ struct pagination_tokens
pagination_tokens(const resource::request &);
};
static void
_append(json::stack::array &chunk,
const m::event &,
const m::event::idx &);
conf::item<size_t>
max_filter_miss
{
@ -117,11 +122,11 @@ get__messages(client &client,
else if(it)
++it;
size_t hit{0}, miss{0};
m::event::id::buf start, end;
{
json::stack::member chunk{ret, "chunk"};
json::stack::array messages{chunk};
json::stack::member member{ret, "chunk"};
json::stack::array chunk{member};
size_t hit{0}, miss{0};
for(; it; page.dir == 'b'? --it : ++it)
{
const m::event &event{*it};
@ -138,7 +143,7 @@ get__messages(client &client,
if(empty(filter_json) || match(filter, event))
{
messages.append(event);
_append(chunk, event, it.event_idx());
++hit;
}
else ++miss;
@ -168,6 +173,32 @@ get__messages(client &client,
return {};
}
void
_append(json::stack::array &chunk,
const m::event &event,
const m::event::idx &event_idx)
{
json::stack::object object
{
chunk
};
object.append(event);
json::stack::object unsigned_
{
object, "unsigned"
};
json::stack::member
{
unsigned_, "age", json::value
{
long(m::vm::current_sequence - event_idx)
}
};
}
// Client-Server 6.3.6 query parameters
pagination_tokens::pagination_tokens(const resource::request &request)
try

23
modules/client/sync/rooms/timeline.cc
View file

@ -178,7 +178,28 @@ ircd::m::sync::_room_timeline_polylog_events(data &data,
if(i > 0)
for(; it && i > -1; ++it, --i)
array.append(*it);
{
json::stack::object object
{
array
};
const m::event &event(*it);
object.append(event);
json::stack::object unsigned_
{
object, "unsigned"
};
json::stack::member
{
unsigned_, "age", json::value
{
long(vm::current_sequence - it.event_idx())
}
};
}
return event_id;
}