diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-02-18 16:05:13 +0000 |
|---|---|---|
| committer | review.rocks <nobody@review.rocks> | 2016-02-18 16:05:13 +0000 |
| commit | b9977ea667889f6cf89464c92fc57cbcae7cca28 (patch) | |
| tree | 5abc257a763ac3a0a180b24e874b1ca9c4bd3edc /synapse/rest/client/v1/pusher.py | |
| parent | Merge pull request #583 from matrix-org/daniel/roomcleanupincremental (diff) | |
| download | synapse-b9977ea667889f6cf89464c92fc57cbcae7cca28.tar.xz | |
Remove dead code for setting device specific rules.
It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code.
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 5547f1b112..4c662e6e3c 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -45,7 +45,7 @@ class PusherRestServlet(ClientV1RestServlet): ) defer.returnValue((200, {})) - reqd = ['profile_tag', 'kind', 'app_id', 'app_display_name', + reqd = ['kind', 'app_id', 'app_display_name', 'device_display_name', 'pushkey', 'lang', 'data'] missing = [] for i in reqd: @@ -73,14 +73,14 @@ class PusherRestServlet(ClientV1RestServlet): yield pusher_pool.add_pusher( user_id=user.to_string(), access_token=requester.access_token_id, - profile_tag=content['profile_tag'], kind=content['kind'], app_id=content['app_id'], app_display_name=content['app_display_name'], device_display_name=content['device_display_name'], pushkey=content['pushkey'], lang=content['lang'], - data=content['data'] + data=content['data'], + profile_tag=content.get('profile_tag', ""), ) except PusherConfigException as pce: raise SynapseError(400, "Config Error: " + pce.message, |