From 53147e5ae4c02f1d9bc4a4b5242a8ac1f476b1b8 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Thu, 14 Aug 2014 16:22:08 +0100
Subject: Reflect user's messages up to themselves before pushing it to
 federatoin; also release roomlock before touching federation so we don't halt
 progress on the world

---
 synapse/handlers/room.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/handlers/room.py')

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index eae40765b3..5d0379254b 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -94,10 +94,10 @@ class MessageHandler(BaseHandler):
                 event.room_id
             )
 
-            yield self.hs.get_federation().handle_new_event(event)
-
             self.notifier.on_new_room_event(event, store_id)
 
+        yield self.hs.get_federation().handle_new_event(event)
+
     @defer.inlineCallbacks
     def get_messages(self, user_id=None, room_id=None, pagin_config=None,
                      feedback=False):
-- 
cgit 1.4.1