summary refs log tree commit diff
path: root/synapse/rest/client/v1/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/rest/client/v1/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/rest/client/v1/events.py')
-rw-r--r--synapse/rest/client/v1/events.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/events.py b/synapse/rest/client/v1/events.py
index e89118b37d..d1afa0f0d5 100644
--- a/synapse/rest/client/v1/events.py
+++ b/synapse/rest/client/v1/events.py
@@ -43,6 +43,7 @@ class EventStreamRestServlet(ClientV1RestServlet):
         if is_guest:
             if "room_id" not in request.args:
                 raise SynapseError(400, "Guest users must specify room_id param")
+        if "room_id" in request.args:
             room_id = request.args["room_id"][0]
         try:
             handler = self.handlers.event_stream_handler