mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-21 12:14:29 +03:00
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
This commit is contained in:
commit
562066577c
2 changed files with 4 additions and 0 deletions
1
changelog.d/17065.bugfix
Normal file
1
changelog.d/17065.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
|
|
@ -1272,8 +1272,11 @@ class SyncHandler:
|
|||
for e in batch.events[1:]:
|
||||
if e.prev_event_ids() != [prev_event_id]:
|
||||
break
|
||||
prev_event_id = e.event_id
|
||||
else:
|
||||
is_linear_timeline = True
|
||||
else:
|
||||
is_linear_timeline = True
|
||||
|
||||
if is_linear_timeline and not batch.limited:
|
||||
state_ids: StateMap[str] = {}
|
||||
|
|
Loading…
Reference in a new issue