diff --git a/synapse/rest/pusher.py b/synapse/rest/pusher.py
index 85d0d1c8cd..a39341cd8b 100644
--- a/synapse/rest/pusher.py
+++ b/synapse/rest/pusher.py
@@ -31,30 +31,37 @@ class PusherRestServlet(RestServlet):
content = _parse_json(request)
- reqd = ['kind', 'app', 'app_display_name', 'device_display_name', 'data']
+ reqd = ['kind', 'app_id', 'app_instance_id', 'app_display_name',
+ 'device_display_name', 'data']
missing = []
for i in reqd:
if i not in content:
missing.append(i)
if len(missing):
- raise SynapseError(400, "Missing parameters: "+','.join(missing), errcode=Codes.MISSING_PARAM)
+ raise SynapseError(400, "Missing parameters: "+','.join(missing),
+ errcode=Codes.MISSING_PARAM)
pusher_pool = self.hs.get_pusherpool()
try:
- pusher_pool.add_pusher(user_name=user.to_string(),
- kind=content['kind'],
- app=content['app'],
- app_display_name=content['app_display_name'],
- device_display_name=content['device_display_name'],
- pushkey=pushkey,
- data=content['data'])
+ pusher_pool.add_pusher(
+ user_name=user.to_string(),
+ kind=content['kind'],
+ app_id=content['app_id'],
+ app_instance_id=content['app_instance_id'],
+ app_display_name=content['app_display_name'],
+ device_display_name=content['device_display_name'],
+ pushkey=pushkey,
+ data=content['data']
+ )
except PusherConfigException as pce:
- raise SynapseError(400, "Config Error: "+pce.message, errcode=Codes.MISSING_PARAM)
+ raise SynapseError(400, "Config Error: "+pce.message,
+ errcode=Codes.MISSING_PARAM)
defer.returnValue((200, {}))
- def on_OPTIONS(self, request):
- return (200, {})
+ def on_OPTIONS(self, _):
+ return 200, {}
+
# XXX: C+ped from rest/room.py - surely this should be common?
def _parse_json(request):
@@ -67,5 +74,6 @@ def _parse_json(request):
except ValueError:
raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)
+
def register_servlets(hs, http_server):
PusherRestServlet(hs).register(http_server)
|
