move filter_events_for_client out of base handler

This commit is contained in:
Mark Haines 2016-05-11 13:42:37 +01:00
parent 260b498ee5
commit 7e23476814
10 changed files with 251 additions and 214 deletions

View file

@ -22,6 +22,7 @@ from synapse.util.logcontext import LoggingContext
from synapse.util.metrics import Measure
from synapse.util.caches.response_cache import ResponseCache
from synapse.push.clientformat import format_push_rules_for_user
from synapse.visibility import filter_events_for_client
from twisted.internet import defer
@ -697,7 +698,8 @@ class SyncHandler(BaseHandler):
if recents is not None:
recents = sync_config.filter_collection.filter_room_timeline(recents)
recents = yield self.filter_events_for_client(
recents = yield filter_events_for_client(
self.store,
sync_config.user.to_string(),
recents,
)
@ -718,7 +720,8 @@ class SyncHandler(BaseHandler):
loaded_recents = sync_config.filter_collection.filter_room_timeline(
events
)
loaded_recents = yield self.filter_events_for_client(
loaded_recents = yield filter_events_for_client(
self.store,
sync_config.user.to_string(),
loaded_recents,
)