diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-26 11:05:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-26 11:05:50 +0100 |
| commit | 2651fd5e248e89e1d8fa7d6cbbf706c310390889 (patch) | |
| tree | 79d4bbc30758d01a469a9e5728279ee6cfa8754b /synapse | |
| parent | changelog (diff) | |
| parent | Merge pull request #166 from matrix-org/bugs/SYN-390 (diff) | |
| download | synapse-2651fd5e248e89e1d8fa7d6cbbf706c310390889.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/push/__init__.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index e3dd4ce76d..167b973b2b 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -74,15 +74,18 @@ class Pusher(object): rawrules = yield self.store.get_push_rules_for_user(self.user_name) - for r in rawrules: - r['conditions'] = json.loads(r['conditions']) - r['actions'] = json.loads(r['actions']) + rules = [] + for rawrule in rawrules: + rule = dict(rawrules) + rule['conditions'] = json.loads(rawrule['conditions']) + rule['actions'] = json.loads(rawrule['actions']) + rules.append(rule) enabled_map = yield self.store.get_push_rules_enabled_for_user(self.user_name) user = UserID.from_string(self.user_name) - rules = baserules.list_with_base_rules(rawrules, user) + rules = baserules.list_with_base_rules(rules, user) room_id = ev['room_id'] |