mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 04:34:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

Browse source
This commit is contained in:
Erik Johnston 2024-04-08 14:55:30 +01:00
commit 562066577c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/17065.bugfix Normal file
View file

@ -0,0 +1 @@
Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.

3
synapse/handlers/sync.py
View file

@ -1272,6 +1272,9 @@ class SyncHandler:
for e in batch.events[1:]: for e in batch.events[1:]:
if e.prev_event_ids() != [prev_event_id]: if e.prev_event_ids() != [prev_event_id]:
break break
prev_event_id = e.event_id
else:
is_linear_timeline = True
else: else:
is_linear_timeline = True is_linear_timeline = True