Never return negative bump stamp (#17748)

Fixes #17737
This commit is contained in:
Erik Johnston 2024-09-24 11:07:23 +01:00 committed by GitHub
parent 5173741c71
commit aad26cb93f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 0 deletions

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

@ -0,0 +1 @@
Fix bug in sliding sync where the server would incorrectly return a negative bump stamp, which caused Element X apps to stop syncing.

View file

@ -1063,6 +1063,22 @@ class SlidingSyncHandler:
if new_bump_stamp is not None: if new_bump_stamp is not None:
bump_stamp = new_bump_stamp bump_stamp = new_bump_stamp
if bump_stamp < 0:
# We never want to send down negative stream orderings, as you can't
# sensibly compare positive and negative stream orderings (they have
# different meanings).
#
# A negative bump stamp here can only happen if the stream ordering
# of the membership event is negative (and there are no further bump
# stamps), which can happen if the server leaves and deletes a room,
# and then rejoins it.
#
# To deal with this, we just set the bump stamp to zero, which will
# shove this room to the bottom of the list. This is OK as the
# moment a new message happens in the room it will get put into a
# sensible order again.
bump_stamp = 0
unstable_expanded_timeline = False unstable_expanded_timeline = False
prev_room_sync_config = previous_connection_state.room_configs.get(room_id) prev_room_sync_config = previous_connection_state.room_configs.get(room_id)
# Record the `room_sync_config` if we're `ignore_timeline_bound` (which means # Record the `room_sync_config` if we're `ignore_timeline_bound` (which means