MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-15 14:31:11 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Comments around the age ts conditions.

Browse source
This commit is contained in:
Jason Volk 2019-05-25 14:51:42 -07:00
parent 91ce49d671
commit 680734c47b
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ircd/m_event.cc
View file

@ -508,12 +508,25 @@ ircd::m::append(json::stack::object &object,
{ {
unsigned_, "age", json::value unsigned_, "age", json::value
{ {
// When the opts give an explicit age, use it.
opts.age != std::numeric_limits<long>::min()? opts.age != std::numeric_limits<long>::min()?
opts.age: opts.age:
// If we have depth information, craft a value based on the
// distance to the head depth; if this is 0 in riot the event will
// "stick" at the bottom of the timeline. This may be advantageous
// in the future but for now we make sure the result is non-zero.
json::get<"depth"_>(event) >= 0 && opts.room_depth && *opts.room_depth >= 0L? json::get<"depth"_>(event) >= 0 && opts.room_depth && *opts.room_depth >= 0L?
((*opts.room_depth + 1) - json::get<"depth"_>(event)) + 100: ((*opts.room_depth + 1) - json::get<"depth"_>(event)) + 100:
// We don't have depth information, so we use the origin_server_ts.
// It is bad if it conflicts with other appends in the room which
// did have depth information.
!opts.room_depth && json::get<"origin_server_ts"_>(event)? !opts.room_depth && json::get<"origin_server_ts"_>(event)?
ircd::time<milliseconds>() - json::get<"origin_server_ts"_>(event): ircd::time<milliseconds>() - json::get<"origin_server_ts"_>(event):
// Finally, this special value will eliminate the age altogether
// during serialization.
json::undefined_number json::undefined_number
} }
}; };