summary refs log tree commit diff
path: root/synapse/handlers/events.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-02 15:10:59 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-02 15:10:59 +0000
commit192241cf2abc54b10ba77408808794bb728ddb70 (patch)
tree450a753759d071cd26ff7937f5aa07db3d9f76f5 /synapse/handlers/events.py
parentMerge pull request #338 from matrix-org/daniel/fixdb (diff)
downloadsynapse-192241cf2abc54b10ba77408808794bb728ddb70.tar.xz
Remove unused arguments and code
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r--synapse/handlers/events.py13
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
             )