diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-19 18:01:47 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-19 18:01:47 +0000 |
commit | f16334e5a7bc021bb6c43b9d2c59ca0d4fb315d3 (patch) | |
tree | 3121f7d5c2da0392ba52ab25dc1d538ffdeeaf4d /synapse/handlers/federation.py | |
parent | Persist auth/state events at backwards extremities when we fetch them (#6526) (diff) | |
parent | Exclude rejected state events when calculating state at backwards extrems (#6... (diff) | |
download | synapse-f16334e5a7bc021bb6c43b9d2c59ca0d4fb315d3.tar.xz |
Exclude rejected state events when calculating state at backwards extrems (#6527)
* commit '6920d8889': Exclude rejected state events when calculating state at backwards extrems (#6527)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6e3144e47f..4d152d5985 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -605,7 +605,7 @@ class FederationHandler(BaseHandler): remote_event = event_map.get(event_id) if not remote_event: raise Exception("Unable to get missing prev_event %s" % (event_id,)) - if remote_event.is_state(): + if remote_event.is_state() and remote_event.rejected_reason is None: remote_state.append(remote_event) auth_chain = [event_map[e_id] for e_id in auth_event_ids if e_id in event_map] |