paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

push: Move remove_push_device_token to library.

Browse Source
This commit is contained in:
Tim Abbott
2017-03-05 19:11:13 -08:00
parent c0ad9c02fd
commit 657dfcbddc
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/push_notifications.py
View File

@@ -8,6 +8,7 @@ from zerver.models import PushDeviceToken, Message, Recipient, UserProfile, \
receives_online_notifications receives_online_notifications
from zerver.models import get_user_profile_by_id from zerver.models import get_user_profile_by_id
from zerver.lib.avatar import avatar_url from zerver.lib.avatar import avatar_url
from zerver.lib.request import JsonableError
from zerver.lib.timestamp import datetime_to_timestamp, timestamp_to_datetime from zerver.lib.timestamp import datetime_to_timestamp, timestamp_to_datetime
from zerver.decorator import statsd_increment from zerver.decorator import statsd_increment
from zerver.lib.utils import generate_random_token from zerver.lib.utils import generate_random_token
@@ -355,3 +356,11 @@ def add_push_device_token(user_profile, token_str, kind, ios_app_id=None):
if not created: if not created:
token.last_updated = timezone.now() token.last_updated = timezone.now()
token.save(update_fields=['last_updated']) token.save(update_fields=['last_updated'])
def remove_push_device_token(request, user_profile, token_str, kind):
# type: (HttpRequest, UserProfile, str, int) -> None
try:
token = PushDeviceToken.objects.get(token=token_str, kind=kind)
token.delete()
except PushDeviceToken.DoesNotExist:
raise JsonableError(_("Token does not exist"))

19
zerver/views/push_notifications.py
View File

@@ -6,7 +6,8 @@ from django.conf import settings
from django.http import HttpRequest, HttpResponse from django.http import HttpRequest, HttpResponse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from zerver.lib.push_notifications import add_push_device_token from zerver.lib.push_notifications import add_push_device_token, \
remove_push_device_token
from zerver.lib.request import has_request_variables, REQ, JsonableError from zerver.lib.request import has_request_variables, REQ, JsonableError
from zerver.lib.response import json_success, json_error from zerver.lib.response import json_success, json_error
from zerver.lib.validator import check_string, check_list, check_bool from zerver.lib.validator import check_string, check_list, check_bool
@@ -32,24 +33,16 @@ def add_android_reg_id(request, user_profile, token=REQ()):
add_push_device_token(user_profile, token, PushDeviceToken.GCM) add_push_device_token(user_profile, token, PushDeviceToken.GCM)
return json_success() return json_success()
def remove_push_device_token(request, user_profile, token_str, kind):
# type: (HttpRequest, UserProfile, str, int) -> HttpResponse
try:
token = PushDeviceToken.objects.get(token=token_str, kind=kind)
token.delete()
except PushDeviceToken.DoesNotExist:
return json_error(_("Token does not exist"))
return json_success()
@has_request_variables @has_request_variables
def remove_apns_device_token(request, user_profile, token=REQ()): def remove_apns_device_token(request, user_profile, token=REQ()):
# type: (HttpRequest, UserProfile, str) -> HttpResponse # type: (HttpRequest, UserProfile, str) -> HttpResponse
validate_token(token) validate_token(token)
return remove_push_device_token(request, user_profile, token, PushDeviceToken.APNS) remove_push_device_token(request, user_profile, token, PushDeviceToken.APNS)
return json_success()
@has_request_variables @has_request_variables
def remove_android_reg_id(request, user_profile, token=REQ()): def remove_android_reg_id(request, user_profile, token=REQ()):
# type: (HttpRequest, UserProfile, str) -> HttpResponse # type: (HttpRequest, UserProfile, str) -> HttpResponse
validate_token(token) validate_token(token)
return remove_push_device_token(request, user_profile, token, PushDeviceToken.GCM) remove_push_device_token(request, user_profile, token, PushDeviceToken.GCM)
return json_success()