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

Check event is in state_map

pull/1818/head
Erik Johnston 2017-01-17 13:33:54 +00:00
parent e6153e1bd1
commit 633f97151c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/state.py
View File

@ -333,7 +333,7 @@ class StateHandler(object):
new_state = yield resolve_events( new_state = yield resolve_events(
state_groups_ids.values(), state_groups_ids.values(),
state_map_factory=lambda ev_ids: self.store.get_events( state_map_factory=lambda ev_ids: self.store.get_events(
ev_ids, get_prev_content=False ev_ids, get_prev_content=False, check_redacted=False,
), ),
) )
else: else:
@ -482,6 +482,8 @@ def _resolve_with_state_fac(unconflicted_state, conflicted_state,
for event_id in event_ids for event_id in event_ids
) )
logger.info("Asking for %d conflicted events", len(needed_events))
state_map = yield state_map_factory(needed_events) state_map = yield state_map_factory(needed_events)
auth_events = _create_auth_events_from_maps( auth_events = _create_auth_events_from_maps(
@ -491,6 +493,8 @@ def _resolve_with_state_fac(unconflicted_state, conflicted_state,
new_needed_events = set(auth_events.itervalues()) new_needed_events = set(auth_events.itervalues())
new_needed_events -= needed_events new_needed_events -= needed_events
logger.info("Asking for %d auth events", len(new_needed_events))
state_map_new = yield state_map_factory(new_needed_events) state_map_new = yield state_map_factory(new_needed_events)
state_map.update(state_map_new) state_map.update(state_map_new)
@ -515,13 +519,14 @@ def _create_auth_events_from_maps(unconflicted_state, conflicted_state, state_ma
def _resolve_with_state(unconflicted_state, conflicted_state, auth_events, def _resolve_with_state(unconflicted_state, conflicted_state, auth_events,
state_map): state_map):
conflicted_state = { conflicted_state = {
key: [state_map[ev_id] for ev_id in event_ids] key: [state_map[ev_id] for ev_id in event_ids if ev_id in state_map]
for key, event_ids in conflicted_state.items() for key, event_ids in conflicted_state.items()
} }
auth_events = { auth_events = {
key: state_map[ev_id] key: state_map[ev_id]
for key, ev_id in auth_events.items() for key, ev_id in auth_events.items()
if ev_id in state_map
} }
try: try: