diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-03-16 01:17:34 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-16 01:17:34 +0000 |
| commit | 5b3b3aada8952b53f82723227c9758ed47450a2e (patch) | |
| tree | 7aa8d19c59ae882a5dbcaf32ee07f9d3a282896e /synapse | |
| parent | Replace some ujson with simplejson to make it work (diff) | |
| download | synapse-5b3b3aada8952b53f82723227c9758ed47450a2e.tar.xz | |
simplify timeline_start_members
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/sync.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 84c894ca4a..ffb4f7915e 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -496,12 +496,6 @@ class SyncHandler(object): batch.events[0].event_id, types=types ) - if filter_members: - member_state_ids = { - t: state_ids[t] - for t in state_ids if state_ids[t][0] == EventTypes.Member - } - else: current_state_ids = yield self.get_state_at( room_id, stream_position=now_token, types=types @@ -509,11 +503,13 @@ class SyncHandler(object): state_ids = current_state_ids - if filter_members: - member_state_ids = { - t: state_ids[t] - for t in state_ids if state_ids[t][0] == EventTypes.Member - } + if filter_members: + logger.info("Finding members from %r", state_ids) + member_state_ids = { + e: state_ids[e] + for e in state_ids if state_ids[e][0] == EventTypes.Member + } + logger.info("Found members %r", member_state_ids) timeline_state = { (event.type, event.state_key): event.event_id @@ -541,11 +537,14 @@ class SyncHandler(object): ) if filter_members: + logger.info("Finding members from %r", state_at_timeline_start) member_state_ids = { - t: state_at_timeline_start[t] - for t in state_at_timeline_start - if state_at_timeline_start[t][0] == EventTypes.Member + e: state_at_timeline_start[e] + for e in state_at_timeline_start + if state_at_timeline_start[e][0] == EventTypes.Member } + logger.info("Found members %r", member_state_ids) + timeline_state = { (event.type, event.state_key): event.event_id |