Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update deltas when doing auth resolution 

Fixes a bug where the persisted state groups were different to those actually
being used after auth resolution.
This commit is contained in:
Richard van der Hoff 2017-11-07 16:43:00 +00:00
parent 1ca4288135
commit 780dbb378f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/handlers/federation.py
View File

@ -1934,11 +1934,15 @@ class FederationHandler(BaseHandler):
event_key ((str, str)): (type, state_key) for the current event. event_key ((str, str)): (type, state_key) for the current event.
this will not be included in the current_state in the context. this will not be included in the current_state in the context.
""" """
context.current_state_ids = dict(context.current_state_ids) state_updates = {
context.current_state_ids.update({
k: a.event_id for k, a in auth_events.items() k: a.event_id for k, a in auth_events.items()
if k != event_key if k != event_key
}) }
context.current_state_ids = dict(context.current_state_ids)
context.current_state_ids.update(state_updates)
if context.delta_ids is not None:
context.delta_ids = dict(context.delta_ids)
context.delta_ids.update(state_updates)
context.prev_state_ids = dict(context.prev_state_ids) context.prev_state_ids = dict(context.prev_state_ids)
context.prev_state_ids.update({ context.prev_state_ids.update({
k: a.event_id for k, a in auth_events.items() k: a.event_id for k, a in auth_events.items()