mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-05 00:52:20 +00:00
Merge pull request #166 from matrix-org/bugs/SYN-390
SYN-390: Don't modify the dictionary returned from the database here either
This commit is contained in:
commit
e7b25a649c
@ -74,15 +74,18 @@ class Pusher(object):
|
|||||||
|
|
||||||
rawrules = yield self.store.get_push_rules_for_user(self.user_name)
|
rawrules = yield self.store.get_push_rules_for_user(self.user_name)
|
||||||
|
|
||||||
for r in rawrules:
|
rules = []
|
||||||
r['conditions'] = json.loads(r['conditions'])
|
for rawrule in rawrules:
|
||||||
r['actions'] = json.loads(r['actions'])
|
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)
|
enabled_map = yield self.store.get_push_rules_enabled_for_user(self.user_name)
|
||||||
|
|
||||||
user = UserID.from_string(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']
|
room_id = ev['room_id']
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user