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

Handle initial flag correctly

Browse source
This commit is contained in:
Erik Johnston 2024-07-17 10:32:31 +01:00
parent e2a88e44ef
commit 185831754e
1 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
synapse/handlers/sliding_sync.py
View file

@ -1391,6 +1391,37 @@ class SlidingSyncHandler:
""" """
user = sync_config.user user = sync_config.user
# Determine whether we should limit the timeline to the token range.
#
# We should return historical messages (before token range) in the
# following cases because we want clients to be able to show a basic
# screen of information:
# - Initial sync (because no `from_token` to limit us anyway)
# - When users `newly_joined`
# - For an incremental sync where we haven't sent it down this
# connection before
to_bound = None
initial = True
if from_token and not room_membership_for_user_at_to_token.newly_joined:
room_status = await self.connection_store.have_sent_room(
user_id=user.to_string(),
conn_id=sync_config.connection_id(),
connection_token=from_token.connection_token,
room_id=room_id,
)
if room_status.status == HaveSentRoomFlag.LIVE:
to_bound = from_token.stream_token.room_key
initial = False
elif room_status.status == HaveSentRoomFlag.PREVIOUSLY:
assert room_status.last_token is not None
to_bound = room_status.last_token
initial = False
elif room_status.status == HaveSentRoomFlag.NEVER:
to_bound = None
initial = True
else:
assert_never(room_status.status)
# Assemble the list of timeline events # Assemble the list of timeline events
# #
# FIXME: It would be nice to make the `rooms` response more uniform regardless of # FIXME: It would be nice to make the `rooms` response more uniform regardless of
@ -1426,35 +1457,6 @@ class SlidingSyncHandler:
room_membership_for_user_at_to_token.event_pos.to_room_stream_token() room_membership_for_user_at_to_token.event_pos.to_room_stream_token()
) )
# Determine whether we should limit the timeline to the token range.
#
# We should return historical messages (before token range) in the
# following cases because we want clients to be able to show a basic
# screen of information:
# - Initial sync (because no `from_token` to limit us anyway)
# - When users `newly_joined`
# - For an incremental sync where we haven't sent it down this
# connection before
if from_token and not room_membership_for_user_at_to_token.newly_joined:
room_status = await self.connection_store.have_sent_room(
user_id=user.to_string(),
conn_id=sync_config.connection_id(),
connection_token=from_token.connection_token,
room_id=room_id,
)
if room_status.status == HaveSentRoomFlag.LIVE:
to_bound = from_token.stream_token.room_key
elif room_status.status == HaveSentRoomFlag.PREVIOUSLY:
assert room_status.last_token is not None
to_bound = room_status.last_token
elif room_status.status == HaveSentRoomFlag.NEVER:
to_bound = None
else:
assert_never(room_status.status)
else:
to_bound = None
timeline_events, new_room_key = await self.store.paginate_room_events( timeline_events, new_room_key = await self.store.paginate_room_events(
room_id=room_id, room_id=room_id,
from_key=from_bound, from_key=from_bound,
@ -1575,12 +1577,6 @@ class SlidingSyncHandler:
# indicate to the client that a state reset happened. Perhaps we should indicate # indicate to the client that a state reset happened. Perhaps we should indicate
# this by setting `initial: True` and empty `required_state`. # this by setting `initial: True` and empty `required_state`.
# TODO: Since we can't determine whether we've already sent a room down this
# Sliding Sync connection before (we plan to add this optimization in the
# future), we're always returning the requested room state instead of
# updates.
initial = True
# Check whether the room has a name set # Check whether the room has a name set
name_state_ids = await self.get_current_state_ids_at( name_state_ids = await self.get_current_state_ids_at(
room_id=room_id, room_id=room_id,