Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Look for bump stamp in the room timeline"

Browse Source 
This reverts commit a3c49565ff.
This commit is contained in:
Erik Johnston 2024-09-09 11:58:50 +01:00
parent a3c49565ff
commit 5c229415c4
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
synapse/handlers/sliding_sync/__init__.py
View File

@ -1045,17 +1045,6 @@ class SlidingSyncHandler:
# Figure out the last bump event in the room if we're in the room. # Figure out the last bump event in the room if we're in the room.
if room_membership_for_user_at_to_token.membership == Membership.JOIN: if room_membership_for_user_at_to_token.membership == Membership.JOIN:
new_bump_stamp: Optional[int] = None
# First check the timeline events we're returning to see if one of
# those matches. We iterate backwards and take the stream ordering
# of the first event that matches the bump event types.
for timeline_event in reversed(timeline_events):
if timeline_event.type in SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES:
new_bump_stamp = timeline_event.internal_metadata.stream_ordering
break
else:
# If not then we query the DB for it.
last_bump_event_result = ( last_bump_event_result = (
await self.store.get_last_event_pos_in_room_before_stream_ordering( await self.store.get_last_event_pos_in_room_before_stream_ordering(
room_id, room_id,
@ -1063,18 +1052,17 @@ class SlidingSyncHandler:
event_types=SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES, event_types=SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES,
) )
) )
# But if we found a bump event, use that instead
if last_bump_event_result is not None: if last_bump_event_result is not None:
_, new_bump_event_pos = last_bump_event_result _, new_bump_event_pos = last_bump_event_result
new_bump_stamp = new_bump_event_pos.stream
# If we found a bump event, use that instead
if new_bump_stamp is not None:
# If we've just joined a remote room, then the last bump event may # If we've just joined a remote room, then the last bump event may
# have been backfilled (and so have a negative stream ordering). # have been backfilled (and so have a negative stream ordering).
# These negative stream orderings can't sensibly be compared, so # These negative stream orderings can't sensibly be compared, so
# instead we use the membership event position. # instead we use the membership event position.
if new_bump_stamp > 0: if new_bump_event_pos.stream > 0:
bump_stamp = new_bump_stamp bump_stamp = new_bump_event_pos.stream
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)