diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-05 15:32:45 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-05 15:32:45 +0000 |
| commit | fc8bcc809d91c461eacb9ce466adbba29d814042 (patch) | |
| tree | e85b9889a30926eef8f6a58744529431e3caea65 /synapse/push/__init__.py | |
| parent | Fix unit tests. (diff) | |
| parent | Give server default rules the 'default' attribute and fix various brokenness. (diff) | |
| download | synapse-fc8bcc809d91c461eacb9ce466adbba29d814042.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/push/__init__.py')
| -rw-r--r-- | synapse/push/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 8c6f0a6571..7293715293 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -77,15 +77,15 @@ class Pusher(object): if ev['state_key'] != self.user_name: defer.returnValue(['dont_notify']) - rules = yield self.store.get_push_rules_for_user_name(self.user_name) + rawrules = yield self.store.get_push_rules_for_user_name(self.user_name) - for r in rules: + for r in rawrules: r['conditions'] = json.loads(r['conditions']) r['actions'] = json.loads(r['actions']) - user_name_localpart = UserID.from_string(self.user_name).localpart + user = UserID.from_string(self.user_name) - rules.extend(baserules.make_base_rules(user_name_localpart)) + rules = baserules.list_with_base_rules(rawrules, user) # get *our* member event for display name matching member_events_for_room = yield self.store.get_current_state( |