summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-02 12:01:24 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-02 12:01:24 +0000
commitc2c70f7daf5ea1b638e7366f57570417155ab7e2 (patch)
tree3a517743efa1b4eb4b826f879111db03e66a4001 /synapse/handlers/federation.py
parentMerge branch 'develop' into markjh/edu_frequency (diff)
downloadsynapse-c2c70f7daf5ea1b638e7366f57570417155ab7e2.tar.xz
Use the context returned by _handle_new_event
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 5f3562b5b5..2855f2d7c3 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -177,7 +177,7 @@ class FederationHandler(BaseHandler):
                 )
 
             try:
-                _, event_stream_id, max_stream_id = yield self._handle_new_event(
+                context, event_stream_id, max_stream_id = yield self._handle_new_event(
                     origin,
                     event,
                     state=state,
@@ -234,9 +234,6 @@ class FederationHandler(BaseHandler):
 
         if event.type == EventTypes.Member:
             if event.membership == Membership.JOIN:
-                context = yield self.state_handler.compute_event_context(
-                    event, old_state=state, outlier=event.internal_metadata.is_outlier()
-                )
                 prev_state = context.current_state.get((event.type, event.state_key))
                 if not prev_state or prev_state.membership != Membership.JOIN:
                     # Only fire user_joined_room if the user has acutally