summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-06 11:38:09 +0000
committerDavid Baker <dave@matrix.org>2016-01-06 11:38:09 +0000
commitc79f221192044203b9d32cfbd416a7fefeb34cd5 (patch)
tree4465211af0ca7add866429dcb224017bb5d9962c /synapse/handlers/_base.py
parentMerge remote-tracking branch 'origin/develop' into store_event_actions (diff)
downloadsynapse-c79f221192044203b9d32cfbd416a7fefeb34cd5.tar.xz
Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index 3115a5065d..66e35de6e4 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py
@@ -23,8 +23,6 @@ from synapse.push.action_generator import ActionGenerator from synapse.util.logcontext import PreserveLoggingContext -from synapse.events.utils import serialize_event - import logging @@ -256,9 +254,9 @@ class BaseHandler(object): ) action_generator = ActionGenerator(self.store) - yield action_generator.handle_push_actions_for_event(serialize_event( - event, self.clock.time_msec() - )) + yield action_generator.handle_push_actions_for_event( + event, self + ) destinations = set(extra_destinations) for k, s in context.current_state.items():