diff options
| author | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
| commit | afb7b377f23b275bf0274d6cbbfae462362cfc8c (patch) | |
| tree | 212e275af6f3d52dba6e4367553ea649d9965d33 /synapse/rest/client/v1/pusher.py | |
| parent | Use the unread notification count to send accurate badge counts in push notif... (diff) | |
| parent | Merge pull request #505 from matrix-org/erikj/push_fast (diff) | |
| download | synapse-afb7b377f23b275bf0274d6cbbfae462362cfc8c.tar.xz | |
Merge branch 'develop' into push_badge_counts
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'], |