Err, defer.gatherResults ftw

1 files changed, 12 insertions, 21 deletions

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index 6a1b25d112..867fdbefb0 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -303,27 +303,18 @@ class MessageHandler(BaseHandler):
             if event.membership != Membership.JOIN:
                 return
             try:
-                # (messages, token), current_state = yield defer.gatherResults(
-                #     [
-                #         self.store.get_recent_events_for_room(
-                #             event.room_id,
-                #             limit=limit,
-                #             end_token=now_token.room_key,
-                #         ),
-                #         self.state_handler.get_current_state(
-                #             event.room_id
-                #         ),
-                #     ]
-                # ).addErrback(unwrapFirstError)
-
-                messages, token = yield self.store.get_recent_events_for_room(
-                    event.room_id,
-                    limit=limit,
-                    end_token=now_token.room_key,
-                )
-                current_state = yield self.state_handler.get_current_state(
-                    event.room_id
-                )
+                (messages, token), current_state = yield defer.gatherResults(
+                    [
+                        self.store.get_recent_events_for_room(
+                            event.room_id,
+                            limit=limit,
+                            end_token=now_token.room_key,
+                        ),
+                        self.state_handler.get_current_state(
+                            event.room_id
+                        ),
+                    ]
+                ).addErrback(unwrapFirstError)
 
                 start_token = now_token.copy_and_replace("room_key", token[0])
                 end_token = now_token.copy_and_replace("room_key", token[1])