diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
| commit | 4bbef62124f0fb249e314e94a1b9c15204c8daa9 (patch) | |
| tree | cc2e7458da160915f7224c0487f185e2433eaadb /synapse/push/action_generator.py | |
| parent | More 0_0 in tests (diff) | |
| parent | Merge pull request #1048 from matrix-org/erikj/fix_mail_name (diff) | |
| download | synapse-4bbef62124f0fb249e314e94a1b9c15204c8daa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/push/action_generator.py')
| -rw-r--r-- | synapse/push/action_generator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py index ed2ccc4dfb..3f75d3f921 100644 --- a/synapse/push/action_generator.py +++ b/synapse/push/action_generator.py @@ -40,12 +40,12 @@ class ActionGenerator: def handle_push_actions_for_event(self, event, context): with Measure(self.clock, "evaluator_for_event"): bulk_evaluator = yield evaluator_for_event( - event, self.hs, self.store, context.state_group, context.current_state + event, self.hs, self.store, context ) with Measure(self.clock, "action_for_event_by_user"): actions_by_user = yield bulk_evaluator.action_for_event_by_user( - event, context.current_state + event, context ) context.push_actions = [ |