diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-01-13 18:11:01 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-01-13 18:11:01 +0100 |
| commit | 806bae1ee7412af1bd54a3307f9802394be04aff (patch) | |
| tree | 0d4ed6019a7208e1e7c35015f5a33b7d0af89af8 /synapse/rest/client/v1/pusher.py | |
| parent | Merge pull request #482 from matrix-org/markjh/table_name (diff) | |
| parent | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... (diff) | |
| download | synapse-806bae1ee7412af1bd54a3307f9802394be04aff.tar.xz | |
Merge pull request #488 from matrix-org/markjh/user_name
Rename 'user_name' to 'user_id' in push
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'], |