From c2c70f7daf5ea1b638e7366f57570417155ab7e2 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 2 Dec 2015 12:01:24 +0000
Subject: [PATCH] Use the context returned by _handle_new_event
---
synapse/handlers/federation.py | 5 +----
1 file changed, 1 insertion(+), 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
--
GitLab