summary refs log tree commit diff
path: root/synapse/push/action_generator.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-08 15:29:59 +0100
committerDavid Baker <dave@matrix.org>2016-04-08 15:29:59 +0100
commited3979df5faac6d63990f4230662ff8cdcf59584 (patch)
tree37e6f6928bfd6ed183d40de36d0e53812678af3c /synapse/push/action_generator.py
parentMake sure max stream ordering only increases (diff)
downloadsynapse-ed3979df5faac6d63990f4230662ff8cdcf59584.tar.xz
Fix invite pushes
 * If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc)
 * Move invite_for_me to be higher prio than member events otherwise member events matches them
 * Spell override right
Diffstat (limited to 'synapse/push/action_generator.py')
-rw-r--r--synapse/push/action_generator.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py
index 84efcdd184..59e512f507 100644
--- a/synapse/push/action_generator.py
+++ b/synapse/push/action_generator.py
@@ -15,7 +15,7 @@
 
 from twisted.internet import defer
 
-from .bulk_push_rule_evaluator import evaluator_for_room_id
+from .bulk_push_rule_evaluator import evaluator_for_event
 
 import logging
 
@@ -35,8 +35,8 @@ class ActionGenerator:
 
     @defer.inlineCallbacks
     def handle_push_actions_for_event(self, event, context, handler):
-        bulk_evaluator = yield evaluator_for_room_id(
-            event.room_id, self.hs, self.store
+        bulk_evaluator = yield evaluator_for_event(
+            event, self.hs, self.store
         )
 
         actions_by_user = yield bulk_evaluator.action_for_event_by_user(