diff options
| author | Erik Johnston <erik@matrix.org> | 2024-07-12 13:11:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2024-07-12 13:11:40 +0100 |
| commit | 5c93a0d2463d26992cba66b2831e369be9084597 (patch) | |
| tree | 679a5636663a92a87d70bba82a26bda2802c0103 | |
| parent | Fixup (diff) | |
| download | synapse-5c93a0d2463d26992cba66b2831e369be9084597.tar.xz | |
Fixup
| -rw-r--r-- | synapse/handlers/sliding_sync.py | 5 | ||||
| -rw-r--r-- | synapse/rest/client/sync.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py index 90128fa7f5..2300e3acaf 100644 --- a/synapse/handlers/sliding_sync.py +++ b/synapse/handlers/sliding_sync.py @@ -1440,7 +1440,10 @@ class SlidingSyncHandler: last_bump_event_stream_ordering = None if timeline_events: for e in reversed(timeline_events): - if e.type in DEFAULT_BUMP_EVENT_TYPES: + if ( + e.type in DEFAULT_BUMP_EVENT_TYPES + and e.internal_metadata.stream_ordering > 0 + ): last_bump_event_stream_ordering = ( e.internal_metadata.stream_ordering ) diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index e57fe4c61f..ee665ad173 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -989,7 +989,6 @@ class SlidingSyncRestServlet(RestServlet): for room_id, room_result in rooms.items(): serialized_rooms[room_id] = { "bump_stamp": abs(room_result.bump_stamp), - "timestamp": abs(room_result.bump_stamp), "joined_count": room_result.joined_count, "invited_count": room_result.invited_count, "notification_count": room_result.notification_count, |