summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-03-16 00:52:04 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-03-16 00:52:04 +0000
commit3bc5bd2d22e6b53ec1f89760301df1517e71b53a (patch)
tree1da151beba22ed1639f7a2e2f0052a7e454b6a61
parentMerge branch 'develop' into matthew/filter_members (diff)
downloadsynapse-3bc5bd2d22e6b53ec1f89760301df1517e71b53a.tar.xz
make incr syncs work
-rw-r--r--synapse/handlers/sync.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index edbd2ae771..84c894ca4a 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -499,7 +499,7 @@ class SyncHandler(object): if filter_members: member_state_ids = { t: state_ids[t] - for t in state_ids if t[0] == EventTypes.Member + for t in state_ids if state_ids[t][0] == EventTypes.Member } else: @@ -512,7 +512,7 @@ class SyncHandler(object): if filter_members: member_state_ids = { t: state_ids[t] - for t in state_ids if t[0] == EventTypes.Member + for t in state_ids if state_ids[t][0] == EventTypes.Member } timeline_state = { @@ -543,7 +543,8 @@ class SyncHandler(object): if filter_members: member_state_ids = { t: state_at_timeline_start[t] - for t in state_at_timeline_start if t[0] == EventTypes.Member + for t in state_at_timeline_start + if state_at_timeline_start[t][0] == EventTypes.Member } timeline_state = {