diff options
author | David Baker <dave@matrix.org> | 2016-01-06 11:38:09 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-06 11:38:09 +0000 |
commit | c79f221192044203b9d32cfbd416a7fefeb34cd5 (patch) | |
tree | 4465211af0ca7add866429dcb224017bb5d9962c /synapse/push/action_generator.py | |
parent | Merge remote-tracking branch 'origin/develop' into store_event_actions (diff) | |
download | synapse-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/push/action_generator.py')
-rw-r--r-- | synapse/push/action_generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py index 5526324a6d..bcd40798f9 100644 --- a/synapse/push/action_generator.py +++ b/synapse/push/action_generator.py @@ -33,12 +33,12 @@ class ActionGenerator: # tag (ie. we just need all the users). @defer.inlineCallbacks - def handle_push_actions_for_event(self, event): + def handle_push_actions_for_event(self, event, handler): bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id( - event['room_id'], self.store + event.room_id, self.store ) - actions_by_user = bulk_evaluator.action_for_event_by_user(event) + actions_by_user = yield bulk_evaluator.action_for_event_by_user(event, handler) yield self.store.set_push_actions_for_event_and_users( event, |