Merge pull request #515 from matrix-org/erikj/syn-606

SYN-606: Peeking does not wake up /events
2016-01-21 13:40:20 +00:00 · 2016-01-21 13:40:20 +00:00 · ed1d189e10
parent dfe1273d14 91a222c66d
commit ed1d189e10
1 changed files with 3 additions and 1 deletions
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@ -403,7 +403,9 @@ class Notifier(object):
            # over /events.
            #
            # I am sorry for what I have done.
-            user_id_for_stream = "_PEEKING_" + user_id_for_stream
+            user_id_for_stream = "_PEEKING_%s_%s" % (
+                explicit_room_id, user_id_for_stream
+            )

        result = yield self.wait_for_events(
            user_id_for_stream,