diff options
| author | David Baker <dave@matrix.org> | 2015-02-03 16:06:31 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-02-03 16:06:31 +0000 |
| commit | 9a71add1c077130bf2cf3998ab0dd2226ba0c75b (patch) | |
| tree | 59f5fc35f764476b9e08022717af6a1fe267bf49 /synapse | |
| parent | Merge pull request #46 from matrix-org/identicons (diff) | |
| download | synapse-9a71add1c077130bf2cf3998ab0dd2226ba0c75b.tar.xz | |
Use set_tweak instead of set_sound
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/push/__init__.py | 4 | ||||
| -rw-r--r-- | synapse/push/baserules.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 28e5dae81d..00f3513c23 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -400,8 +400,8 @@ def _tweaks_for_actions(actions): for a in actions: if not isinstance(a, dict): continue - if 'set_sound' in a: - tweaks['sound'] = a['set_sound'] + if 'set_tweak' in a and 'value' in a: + tweaks[a['set_tweak']] = a['value'] return tweaks diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 382de118e0..376d1d4d33 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -38,7 +38,8 @@ def make_base_rules(user_name): 'actions': [ 'notify', { - 'set_sound': 'default' + 'set_tweak': 'sound', + 'value': 'default' } ] } |