summary refs log tree commit diff
path: root/synapse/handlers/events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 14:03:27 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 14:03:27 +0100
commitbd16b93e8f7143b4d2e98794a01aa62a060505d8 (patch)
treeb07e6fa7f9fd6f95302f9a43ef276436f8aa73cb /synapse/handlers/events.py
parentEnable presence again. Fix up api to match old api. (diff)
downloadsynapse-bd16b93e8f7143b4d2e98794a01aa62a060505d8.tar.xz
Implement presence event source. Change the way the notifier indexes listeners
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r--synapse/handlers/events.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 8c34776245..aabec37fc0 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -50,7 +50,12 @@ class EventStreamHandler(BaseHandler):
         if pagin_config.from_token is None:
             pagin_config.from_token = None
 
-        events, tokens = yield self.notifier.get_events_for(auth_user, pagin_config, timeout)
+        rm_handler = self.hs.get_handlers().room_member_handler
+        room_ids = yield rm_handler.get_rooms_for_user(auth_user)
+
+        events, tokens = yield self.notifier.get_events_for(
+            auth_user, room_ids, pagin_config, timeout
+        )
 
         chunks = [
             e.get_dict() if isinstance(e, SynapseEvent) else e