From d4fb1c8a924911ea7a24b927157f8ae21087f631 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 19 Aug 2014 17:18:19 +0100 Subject: [PATCH] Only hit get_room_events_stream if we have a valid user_id --- synapse/storage/stream.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 895a61fbc1..f2be275641 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -112,8 +112,11 @@ class StreamStore(SQLBaseStore): @log_function def get_room_events(self, user_id, from_key, to_key, room_id, limit=0, direction='f', with_feedback=False): + # We deal with events request in two different ways depending on if + # this looks like an /events request or a pagination request. is_events = ( direction == 'f' + and user_id and is_stream_token(from_key) and to_key and is_stream_token(to_key) )