From 91a222c66dae86b3e82fb39a1558db89b030a055 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 21 Jan 2016 13:22:26 +0000
Subject: [PATCH] SYN-606: Peeking does not wake up /events

If a real user attempted to first peek into one room, and then another,
their room event stream would not be woken up for events in the later
room.
---
 synapse/notifier.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/notifier.py b/synapse/notifier.py
index 328548755..262a684f6 100644
--- 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,