OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Call get_last_ts less

erikj/paginate_sync
Erik Johnston 2016-05-17 15:37:48 +01:00
parent 64df836067
commit d1e9655f75
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
synapse/handlers/sync.py
View File

@ -662,29 +662,28 @@ class SyncHandler(BaseHandler):
limit=timeline_limit + 1, limit=timeline_limit + 1,
) )
p_room_token = room_pagination_config.get("t", None)
if p_room_token:
needing_full_state = yield self._get_rooms_that_need_full_state(
joined_room_ids,
since_token,
room_pagination_config.get("ts", 0),
)
else:
needing_full_state = set()
joined = [] joined = []
# We loop through all room ids, even if there are no new events, in case # We loop through all room ids, even if there are no new events, in case
# there are non room events taht we need to notify about. # there are non room events taht we need to notify about.
for room_id in joined_room_ids: for room_id in joined_room_ids:
room_entry = room_to_events.get(room_id, None) room_entry = room_to_events.get(room_id, None)
need_full_state = room_id in needing_full_state
if room_entry: if room_entry:
events, start_key = room_entry events, start_key = room_entry
prev_batch_token = now_token.copy_and_replace("room_key", start_key) prev_batch_token = now_token.copy_and_replace("room_key", start_key)
p_room_token = room_pagination_config.get("t", None)
if p_room_token:
needing_full_state = yield self._get_rooms_that_need_full_state(
[room_id],
since_token,
room_pagination_config.get("ts", 0),
)
need_full_state = room_id in needing_full_state
else:
need_full_state = False
newly_joined_room = (room_id in newly_joined_rooms) or need_full_state newly_joined_room = (room_id in newly_joined_rooms) or need_full_state
full_state = newly_joined_room full_state = newly_joined_room
@ -695,9 +694,6 @@ class SyncHandler(BaseHandler):
newly_joined_room=newly_joined_room, newly_joined_room=newly_joined_room,
) )
else: else:
if need_full_state:
continue
batch = TimelineBatch( batch = TimelineBatch(
events=[], events=[],
prev_batch=since_token, prev_batch=since_token,
@ -717,6 +713,16 @@ class SyncHandler(BaseHandler):
full_state=full_state, full_state=full_state,
) )
if room_sync: if room_sync:
if not room_sync.timeline:
p_room_token = room_pagination_config.get("t", None)
if p_room_token:
needing_full_state = yield self._get_rooms_that_need_full_state(
[room_id],
since_token,
room_pagination_config.get("ts", 0),
)
if room_id in needing_full_state:
continue
joined.append(room_sync) joined.append(room_sync)
# For each newly joined room, we want to send down presence of # For each newly joined room, we want to send down presence of