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

push notifications: Reword APNs payload alert titles.

Browse Source 
Also, rename get_alert_from_message to get_gcm_alert.

With the implementation of the and get_apns_alert_title and
get_apns_alert_subtitle, the logic within get_alert_from_message
is only relevant to the GCM payload, so we adjust the name
accordingly.

Progresses #9949.
Resolves https://github.com/zulip/zulip-mobile/issues/1316.
This commit is contained in:
Jack Zhang
2018-10-04 14:31:04 -07:00
committed by Tim Abbott
parent 92a100798c
commit f116aba490
2 changed files with 99 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
zerver/lib/push_notifications.py
View File

@@ -10,7 +10,7 @@ import re
import time
import random
from typing import Any, Dict, List, Optional, SupportsInt, Tuple, Type, Union
from typing import Any, Dict, List, Optional, SupportsInt, Tuple, Type, Union, cast
from django.conf import settings
from django.db import IntegrityError, transaction
@@ -429,7 +429,7 @@ def push_notifications_enabled() -> bool:
return True
return False
def get_alert_from_message(message: Message) -> str:
def get_gcm_alert(message: Message) -> str:
"""
Determine what alert string to display based on the missed messages.
"""
@@ -519,6 +519,29 @@ def get_common_payload(message: Message) -> Dict[str, Any]:
return data
def get_apns_alert_title(message: Message) -> str:
"""
On an iOS notification, this is the first bolded line.
"""
if message.recipient.type == Recipient.HUDDLE:
recipients = cast(List[Dict[str, Any]], get_display_recipient(message.recipient))
return ', '.join(sorted(r['full_name'] for r in recipients))
elif message.is_stream_message():
return "#%s > %s" % (message.stream_name, message.topic_name(),)
# For personal PMs, we just show the sender name.
return message.sender.full_name
def get_apns_alert_subtitle(message: Message) -> str:
"""
On an iOS notification, this is the second bolded line.
"""
if message.trigger == "mentioned":
return message.sender.full_name + " mentioned you:"
elif message.recipient.type == Recipient.PERSONAL:
return ""
# For group PMs, or regular messages to a stream, just use a colon to indicate this is the sender.
return message.sender.full_name + ":"
def get_apns_payload(user_profile: UserProfile, message: Message) -> Dict[str, Any]:
zulip_data = get_common_payload(message)
zulip_data.update({
@@ -528,7 +551,8 @@ def get_apns_payload(user_profile: UserProfile, message: Message) -> Dict[str, A
content, _ = truncate_content(get_mobile_push_content(message.rendered_content))
apns_data = {
'alert': {
'title': get_alert_from_message(message),
'title': get_apns_alert_title(message),
'subtitle': get_apns_alert_subtitle(message),
'body': content,
},
'badge': 0, # TODO: set badge count in a better way
@@ -542,7 +566,7 @@ def get_gcm_payload(user_profile: UserProfile, message: Message) -> Dict[str, An
data.update({
'user': user_profile.email,
'event': 'message',
'alert': get_alert_from_message(message),
'alert': get_gcm_alert(message),
'zulip_message_id': message.id, # message_id is reserved for CCS
'time': datetime_to_timestamp(message.pub_date),
'content': content,