Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

push notif: Factor out a helper parse_gcm_options. 

Looks a bit silly as is, but this will give us a good home for
logic to start parsing more than zero allowed options.
This commit is contained in:
Greg Price 2019-02-07 17:38:13 -08:00 committed by Tim Abbott
parent 9ebad5d505
commit 575f320009
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/lib/push_notifications.py
View File

@ -189,6 +189,17 @@ def send_android_push_notification_to_user(user_profile: UserProfile, data: Dict
kind=PushDeviceToken.GCM))
send_android_push_notification(devices, data, options)
def parse_gcm_options(options: Dict[str, Any], data: Dict[str, Any]) -> None:
"""
Parse GCM options, raising an error if invalid.
"""
if options:
# We're strict about the API; there is no use case for a newer Zulip
# server talking to an older bouncer, so we only need to provide
# one-way compatibility.
raise JsonableError(_("Invalid GCM options to bouncer: %s")
% (ujson.dumps(options),))
@statsd_increment("android_push_notification")
def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, Any],
options: Dict[str, Any], remote: bool=False) -> None:
@ -210,15 +221,12 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
"PUSH_NOTIFICATION_BOUNCER_URL and ANDROID_GCM_API_KEY are both unset")
return
if options:
# We're strict about the API; there is no use case for a newer Zulip
# server talking to an older bouncer, so we only need to provide
# one-way compatibility.
raise JsonableError(_("Invalid GCM options to bouncer: %s")
% (ujson.dumps(options),))
reg_ids = [device.token for device in devices]
parse_gcm_options(options, data)
try:
# See https://developers.google.com/cloud-messaging/http-server-ref .
# Two kwargs `retries` and `session` get eaten by `json_request`;
# the rest pass through to the GCM server.
res = gcm.json_request(registration_ids=reg_ids,
data=data,
retries=10)