diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 11:37:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 11:37:05 +0000 |
| commit | 9a8949f0221b0487e42830c57873bddae40c056a (patch) | |
| tree | bc6d459a0e5ea88432af7d253daf7e0e46c1f645 /synapse/rest/client/v1/pusher.py | |
| parent | Change default pushrules back to notifying for all messages. (diff) | |
| parent | Merge pull request #502 from matrix-org/erikj/push_notif_perf (diff) | |
| download | synapse-9a8949f0221b0487e42830c57873bddae40c056a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into default_notify
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index b162b210bc..e218ed215c 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -41,7 +41,7 @@ class PusherRestServlet(ClientV1RestServlet): and 'kind' in content and content['kind'] is None): yield pusher_pool.remove_pusher( - content['app_id'], content['pushkey'], user_name=user.to_string() + content['app_id'], content['pushkey'], user_id=user.to_string() ) defer.returnValue((200, {})) @@ -71,7 +71,7 @@ class PusherRestServlet(ClientV1RestServlet): try: yield pusher_pool.add_pusher( - user_name=user.to_string(), + user_id=user.to_string(), access_token=requester.access_token_id, profile_tag=content['profile_tag'], kind=content['kind'], |