diff options
| author | David Baker <dave@matrix.org> | 2015-12-22 17:25:09 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-12-22 17:25:09 +0000 |
| commit | 9b4cd0cd0f31803657018bf0ac9178787d796912 (patch) | |
| tree | 527c53db2309b790ec23fd021d65d4e02ee133c2 /synapse/push | |
| parent | Merge remote-tracking branch 'origin/develop' into store_event_actions (diff) | |
| download | synapse-9b4cd0cd0f31803657018bf0ac9178787d796912.tar.xz | |
pep8 & unused variable
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/push/action_generator.py | 2 | ||||
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 635dedd523..250f22a168 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -26,6 +26,7 @@ import random logger = logging.getLogger(__name__) + # Pushers could now be moved to pull out of the event_actions table instead # of listening on the event stream: this would avoid them having to run the # rules again. diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py index 148b1bda8e..00f518f609 100644 --- a/synapse/push/action_generator.py +++ b/synapse/push/action_generator.py @@ -35,8 +35,6 @@ class ActionGenerator: @defer.inlineCallbacks def handle_event(self, event): - users = yield self.store.get_users_in_room(event['room_id']) - bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id( event['room_id'], self.hs, self.store ) diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 1c0fa72b25..c489bfc8d4 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -54,7 +54,7 @@ def evaluator_for_room_id(room_id, hs, store): display_names[ev.state_key] = ev.content.get("displayname") defer.returnValue(BulkPushRuleEvaluator( - room_id, rules_by_user, display_names, users + room_id, rules_by_user, display_names, users )) @@ -104,4 +104,4 @@ class BulkPushRuleEvaluator: matches &= PushRuleEvaluator._event_fulfills_condition( event, cond, display_name, room_member_count, profile_tag ) - return matches \ No newline at end of file + return matches |