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

simplify timeline_start_members

pull/3567/head
Matthew Hodgson 2018-03-16 01:17:34 +00:00
parent bf49d2dca8
commit 5b3b3aada8
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/handlers/sync.py
View File

@ -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
@ -510,10 +504,12 @@ class SyncHandler(object):
state_ids = current_state_ids
if filter_members:
logger.info("Finding members from %r", state_ids)
member_state_ids = {
t: state_ids[t]
for t in state_ids if state_ids[t][0] == EventTypes.Member
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