diff options
author | David Baker <dave@matrix.org> | 2016-08-15 18:34:53 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-08-15 18:34:53 +0100 |
commit | 1c7c317df1124ff262d40b40966956a952d1e03b (patch) | |
tree | 9847f1d5a77bc41662b399bf14fc2b31533d30b3 /synapse/push/baserules.py | |
parent | Merge pull request #1009 from matrix-org/erikj/event_split (diff) | |
download | synapse-1c7c317df1124ff262d40b40966956a952d1e03b.tar.xz |
Move display name rule
As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
Diffstat (limited to 'synapse/push/baserules.py')
-rw-r--r-- | synapse/push/baserules.py | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 024c14904f..9d60f76968 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -217,45 +217,49 @@ BASE_APPEND_OVERRIDE_RULES = [ 'dont_notify' ] }, -] - - -BASE_APPEND_UNDERRIDE_RULES = [ + # This was changed from underride to override so it's closer in priority + # to the content rules where the user name highlight rule lives. This + # way a room rule is lower priority than both but a custom override rule + # is higher priority than both. { - 'rule_id': 'global/underride/.m.rule.call', + 'rule_id': 'global/underride/.m.rule.contains_display_name', 'conditions': [ { - 'kind': 'event_match', - 'key': 'type', - 'pattern': 'm.call.invite', - '_id': '_call', + 'kind': 'contains_display_name' } ], 'actions': [ 'notify', { 'set_tweak': 'sound', - 'value': 'ring' + 'value': 'default' }, { - 'set_tweak': 'highlight', - 'value': False + 'set_tweak': 'highlight' } ] }, +] + + +BASE_APPEND_UNDERRIDE_RULES = [ { - 'rule_id': 'global/underride/.m.rule.contains_display_name', + 'rule_id': 'global/underride/.m.rule.call', 'conditions': [ { - 'kind': 'contains_display_name' + 'kind': 'event_match', + 'key': 'type', + 'pattern': 'm.call.invite', + '_id': '_call', } ], 'actions': [ 'notify', { 'set_tweak': 'sound', - 'value': 'default' + 'value': 'ring' }, { - 'set_tweak': 'highlight' + 'set_tweak': 'highlight', + 'value': False } ] }, |