MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-01 05:08:59 +02:00
Code Issues Releases Wiki Activity

modules/client/sync/rooms/timeline: Fix rejoin events not appearing in timeline in linear handler.

Browse source
This commit is contained in:
Jason Volk 2020-04-20 17:24:03 -07:00
parent b798864d18
commit f8c98015f8
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,19 +111,30 @@ ircd::m::sync::room_timeline_linear(data &data)
const bool is_own_join
{
is_own_membership && data.membership == "join"
is_own_membership
&& data.membership == "join"
};
const auto last_membership_state_idx
{
is_own_join?
m::room::state::prev(data.event_idx):
0UL
};
const bool is_own_rejoin
{
last_membership_state_idx?
m::membership(last_membership_state_idx, "join"):
false
};
// Branch to backfill the user's timeline before their own join event to
// the room. This simply reuses the polylog handler as if they were
// initial-syncing the room.
if(is_own_join)
// initial-syncing the room. This branch is not taken for rejoins (i.e
// displayname and avatar changes).
if(is_own_join && !is_own_rejoin)
{
const auto last_membership_state_idx
{
m::room::state::prev(data.event_idx)
};
const scope_restore range_first
{
data.range.first, last_membership_state_idx