MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-17 23:42:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1

Browse source
This commit is contained in:
Erik Johnston 2015-05-26 11:05:50 +01:00
commit 2651fd5e24
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) 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']