diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-20 11:21:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:21:01 +0000 |
| commit | 2e05f5d7a4d713be3ba950672c26e6d5e3ab031f (patch) | |
| tree | 9beddc25115cb9931933727b1ea6d7205999ce72 /synapse/handlers/federation.py | |
| parent | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_join (diff) | |
| parent | Avoid resetting state on rejected events (diff) | |
| download | synapse-2e05f5d7a4d713be3ba950672c26e6d5e3ab031f.tar.xz | |
Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejections
Avoid resetting state on rejected events
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0cd5501b05..10b2325b27 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1537,7 +1537,17 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def _prep_event(self, origin, event, state=None, auth_events=None): + """ + + Args: + origin: + event: + state: + auth_events: + Returns: + Deferred, which resolves to synapse.events.snapshot.EventContext + """ context = yield self.state_handler.compute_event_context( event, old_state=state, ) |