diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-19 10:50:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 10:50:26 +0100 |
| commit | 6f0c5e5d9bcc6e23a8490a1814f776e267c26eda (patch) | |
| tree | dfa79226c3d3bc4bbc012d8b867ada14aad26c40 /synapse | |
| parent | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag (diff) | |
| parent | _id field must uniquely identify different conditions (diff) | |
| download | synapse-6f0c5e5d9bcc6e23a8490a1814f776e267c26eda.tar.xz | |
Merge pull request #1131 from matrix-org/matthew/e2e-notifs
Notify on e2e events
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/push/baserules.py | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index edb00ed206..85effdfa46 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -263,6 +263,8 @@ BASE_APPEND_UNDERRIDE_RULES = [ } ] }, + # XXX: once m.direct is standardised everywhere, we should use it to detect + # a DM from the user's perspective rather than this heuristic. { 'rule_id': 'global/underride/.m.rule.room_one_to_one', 'conditions': [ @@ -289,6 +291,34 @@ BASE_APPEND_UNDERRIDE_RULES = [ } ] }, + # XXX: this is going to fire for events which aren't m.room.messages + # but are encrypted (e.g. m.call.*)... + { + 'rule_id': 'global/underride/.m.rule.encrypted_room_one_to_one', + 'conditions': [ + { + 'kind': 'room_member_count', + 'is': '2', + '_id': 'member_count', + }, + { + 'kind': 'event_match', + 'key': 'type', + 'pattern': 'm.room.encrypted', + '_id': '_encrypted', + } + ], + 'actions': [ + 'notify', + { + 'set_tweak': 'sound', + 'value': 'default' + }, { + 'set_tweak': 'highlight', + 'value': False + } + ] + }, { 'rule_id': 'global/underride/.m.rule.message', 'conditions': [ @@ -305,6 +335,25 @@ BASE_APPEND_UNDERRIDE_RULES = [ 'value': False } ] + }, + # XXX: this is going to fire for events which aren't m.room.messages + # but are encrypted (e.g. m.call.*)... + { + 'rule_id': 'global/underride/.m.rule.encrypted', + 'conditions': [ + { + 'kind': 'event_match', + 'key': 'type', + 'pattern': 'm.room.encrypted', + '_id': '_encrypted', + } + ], + 'actions': [ + 'notify', { + 'set_tweak': 'highlight', + 'value': False + } + ] } ] |