diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-21 13:22:26 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-21 13:22:26 +0000 |
| commit | 91a222c66dae86b3e82fb39a1558db89b030a055 (patch) | |
| tree | d4b8693facfc4dfd9a32e39433446bfd9d1f3cfe /synapse/notifier.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-91a222c66dae86b3e82fb39a1558db89b030a055.tar.xz | |
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.
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 3285487551..262a684f64 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, |