OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #166 from matrix-org/bugs/SYN-390 

SYN-390: Don't modify the dictionary returned from the database here either
erikj/theseus
Mark Haines 2015-05-26 10:40:50 +01:00
parent 9ba3c1ede4 804b732aab
commit e7b25a649c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/push/__init__.py
View File

@ -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']