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

Merge pull request #481 from matrix-org/erikj/SYN-589 

Don't include old left rooms in /sync
pull/470/head
Erik Johnston 2016-01-12 16:55:55 +00:00
parent 42aa1f3f33 70dfe4dc96
commit ea47760bd8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/sync.py
View File

@ -585,7 +585,8 @@ class SyncHandler(BaseHandler):
sync_config, leave_event, since_token, tags_by_room, sync_config, leave_event, since_token, tags_by_room,
account_data_by_room account_data_by_room
) )
archived.append(room_sync) if room_sync:
archived.append(room_sync)
invited = [ invited = [
InvitedSyncResult(room_id=event.room_id, invite=event) InvitedSyncResult(room_id=event.room_id, invite=event)
@ -726,6 +727,9 @@ class SyncHandler(BaseHandler):
leave_token = since_token.copy_and_replace("room_key", stream_token) leave_token = since_token.copy_and_replace("room_key", stream_token)
if since_token.is_after(leave_token):
defer.returnValue(None)
batch = yield self.load_filtered_recents( batch = yield self.load_filtered_recents(
leave_event.room_id, sync_config, leave_token, since_token, leave_event.room_id, sync_config, leave_token, since_token,
) )