summary refs log tree commit diff
path: root/synapse/rest/client/v1/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 17:37:34 +0000
commit8046df6efa5509096c3b33c292f03f80c95b6481 (patch)
tree079a9ba974f0c3b5096438ca9cd12ac38c794390 /synapse/rest/client/v1/pusher.py
parentMerge branch 'signature_failures' of github.com:matrix-org/synapse into feder... (diff)
parentMore s/instance_handle/profile_tag/ (diff)
downloadsynapse-8046df6efa5509096c3b33c292f03f80c95b6481.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
-rw-r--r--synapse/rest/client/v1/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py

index 353a4a6589..e10d2576d2 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py
@@ -41,7 +41,7 @@ class PusherRestServlet(ClientV1RestServlet): ) defer.returnValue((200, {})) - reqd = ['instance_handle', 'kind', 'app_id', 'app_display_name', + reqd = ['profile_tag', 'kind', 'app_id', 'app_display_name', 'device_display_name', 'pushkey', 'lang', 'data'] missing = [] for i in reqd: @@ -54,7 +54,7 @@ class PusherRestServlet(ClientV1RestServlet): try: yield pusher_pool.add_pusher( user_name=user.to_string(), - instance_handle=content['instance_handle'], + profile_tag=content['profile_tag'], kind=content['kind'], app_id=content['app_id'], app_display_name=content['app_display_name'],