diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-04 17:31:01 +0000 |
| commit | 4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch) | |
| tree | 21928f0803225e707532b477f581c6f4f1885ac9 /synapse/handlers/events.py | |
| parent | Allow guests to register and call /events?room_id= (diff) | |
| parent | Merge pull request #339 from matrix-org/daniel/removesomelies (diff) | |
| download | synapse-4e62ffdb21c17817a56c1d864d1f8dc91131b8ef.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 92afa35d57..53c8ca3a26 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -111,17 +111,6 @@ class EventStreamHandler(BaseHandler): if affect_presence: yield self.started_stream(auth_user) - rm_handler = self.hs.get_handlers().room_member_handler - - app_service = yield self.store.get_app_service_by_user_id( - auth_user.to_string() - ) - if app_service: - rooms = yield self.store.get_app_service_rooms(app_service) - room_ids = set(r.room_id for r in rooms) - else: - room_ids = yield rm_handler.get_joined_rooms_for_user(auth_user) - if timeout: # If they've set a timeout set a minimum limit. timeout = max(timeout, 500) @@ -131,7 +120,7 @@ class EventStreamHandler(BaseHandler): timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) events, tokens = yield self.notifier.get_events_for( - auth_user, room_ids, pagin_config, timeout, + auth_user, pagin_config, timeout, only_room_events=only_room_events ) |