summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-05 15:01:33 +0100
committerErik Johnston <erik@matrix.org>2016-09-05 15:01:33 +0100
commit9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed (patch)
tree87ea6eaf5acc72908c09f9a249129bc252eae14d /synapse/push
parentTake value in a better way (diff)
parentMerge pull request #1070 from matrix-org/erikj/presence_stats (diff)
downloadsynapse-9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py

index 6ff9a06de1..f1bbe57dcb 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -38,7 +38,7 @@ def _get_rules(room_id, user_ids, store): @defer.inlineCallbacks def evaluator_for_event(event, hs, store, context): rules_by_user = yield store.bulk_get_push_rules_for_room( - event.room_id, context + event, context ) # if this event is an invite event, we may need to run rules for the user