summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-13 11:30:22 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-13 11:30:22 +0100
commit048b3ece36ed133365ab430d5a332ba2a72d7af5 (patch)
tree4ea9951d37367a8828d3fb28ccbadb599e6beba1 /synapse/notifier.py
parentMerge pull request #776 from matrix-org/markjh/lazy_signing_key (diff)
parentmissed a spot (diff)
downloadsynapse-048b3ece36ed133365ab430d5a332ba2a72d7af5.tar.xz
Merge pull request #777 from matrix-org/markjh/move_filter_for_client
move filter_events_for_client out of base handler
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index cb58dfffd4..33b79c0ec7 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -21,6 +21,7 @@ from synapse.util.logutils import log_function
 from synapse.util.async import ObservableDeferred
 from synapse.util.logcontext import PreserveLoggingContext
 from synapse.types import StreamToken
+from synapse.visibility import filter_events_for_client
 import synapse.metrics
 
 from collections import namedtuple
@@ -398,8 +399,8 @@ class Notifier(object):
                 )
 
                 if name == "room":
-                    room_member_handler = self.hs.get_handlers().room_member_handler
-                    new_events = yield room_member_handler.filter_events_for_client(
+                    new_events = yield filter_events_for_client(
+                        self.store,
                         user.to_string(),
                         new_events,
                         is_peeking=is_peeking,