Skip to content
Snippets Groups Projects
Commit 5cf22f05 authored by Mark Haines's avatar Mark Haines
Browse files

Don't mark newly joined room timelines as limited in an incremental sync

parent f6e6f3d8
No related branches found
No related tags found
No related merge requests found
...@@ -387,7 +387,7 @@ class SyncHandler(BaseHandler): ...@@ -387,7 +387,7 @@ class SyncHandler(BaseHandler):
else: else:
prev_batch = now_token prev_batch = now_token
state = yield self.check_joined_room( state, limited = yield self.check_joined_room(
sync_config, room_id, state sync_config, room_id, state
) )
...@@ -396,7 +396,7 @@ class SyncHandler(BaseHandler): ...@@ -396,7 +396,7 @@ class SyncHandler(BaseHandler):
timeline=TimelineBatch( timeline=TimelineBatch(
events=recents, events=recents,
prev_batch=prev_batch, prev_batch=prev_batch,
limited=False, limited=limited,
), ),
state=state, state=state,
ephemeral=typing_by_room.get(room_id, []) ephemeral=typing_by_room.get(room_id, [])
...@@ -627,6 +627,7 @@ class SyncHandler(BaseHandler): ...@@ -627,6 +627,7 @@ class SyncHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def check_joined_room(self, sync_config, room_id, state_delta): def check_joined_room(self, sync_config, room_id, state_delta):
joined = False joined = False
limited = False
for event in state_delta: for event in state_delta:
if ( if (
event.type == EventTypes.Member event.type == EventTypes.Member
...@@ -638,5 +639,6 @@ class SyncHandler(BaseHandler): ...@@ -638,5 +639,6 @@ class SyncHandler(BaseHandler):
if joined: if joined:
res = yield self.state_handler.get_current_state(room_id) res = yield self.state_handler.get_current_state(room_id)
state_delta = res.values() state_delta = res.values()
limited = True
defer.returnValue(state_delta) defer.returnValue((state_delta, limited))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment