summary refs log tree commit diff
path: root/synapse/handlers/events.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-01-20 15:34:07 +0000
committerreview.rocks <nobody@review.rocks>2016-01-20 15:34:07 +0000
commitda417aa56d3582ab91805b1a623c18691995a3e6 (patch)
treee0352a71a18f9ab5cdd52aa3e49d9cfcfd99c87d /synapse/handlers/events.py
parentMerge branch 'dbkr/no_push_for_own_events' into develop (diff)
downloadsynapse-da417aa56d3582ab91805b1a623c18691995a3e6.tar.xz
Allow non-guests to peek on rooms using /events
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r--synapse/handlers/events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index c73eec2b91..aca4b6754e 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -135,7 +135,7 @@ class EventStreamHandler(BaseHandler):
             events, tokens = yield self.notifier.get_events_for(
                 auth_user, pagin_config, timeout,
                 only_room_events=only_room_events,
-                is_guest=is_guest, guest_room_id=room_id
+                is_guest=is_guest, explicit_room_id=room_id
             )
 
             time_now = self.clock.time_msec()