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

Always include tags

erikj/paginate_sync
Erik Johnston 2016-06-21 11:18:09 +01:00
parent 6992fb9bc1
commit 3b6027dbc1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/handlers/sync.py
View File

@ -747,15 +747,27 @@ class SyncHandler(object):
pagination_state=sync_result_builder.pagination_state, pagination_state=sync_result_builder.pagination_state,
) )
all_tags = yield self.store.get_tags_for_user(user_id)
if missing_state: if missing_state:
for r in room_entries: for r in room_entries:
if r.room_id in missing_state: if r.room_id in missing_state:
if r.room_id in all_tags:
r.always_include = True
continue
r.full_state = True r.full_state = True
if r.room_id in include_map: if r.room_id in include_map:
r.always_include = True r.always_include = True
r.events = None r.events = None
r.since_token = None r.since_token = None
r.upto_token = now_token r.upto_token = now_token
elif pagination_config:
all_tags = yield self.store.get_tags_for_user(user_id)
logger.info("all_tags: %r", all_tags)
for r in room_entries:
if r.room_id in all_tags:
r.always_include = True
for room_id in set(include_map.keys()) - {r.room_id for r in room_entries}: for room_id in set(include_map.keys()) - {r.room_id for r in room_entries}:
sync_result_builder.errors.append(ErrorSyncResult( sync_result_builder.errors.append(ErrorSyncResult(