Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-23 02:24:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Server default rules now of all kinds rather than all being at lowest prio.

Browse source
This commit is contained in:
David Baker 2015-02-05 14:46:06 +00:00
parent f90782a658
commit 2df41aa138
4 changed files with 98 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/push/__init__.py
View file

@ -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(