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

cache: Avoid cache spam for push notifications.

Browse Source 
We don't need to call get_display_recipient for
non-stream messages.

I will rename display_recipient in the next commit;
if I were to combine the steps the diff would be too
hard to read.
This commit is contained in:
Steve Howell
2023-07-16 11:40:41 +00:00
committed by Tim Abbott
parent 538f498447
commit 6be2a08ed8
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
zerver/lib/push_notifications.py
View File

@@ -657,7 +657,6 @@ def get_gcm_alert(
Determine what alert string to display based on the missed messages. Determine what alert string to display based on the missed messages.
""" """
sender_str = message.sender.full_name sender_str = message.sender.full_name
display_recipient = get_display_recipient(message.recipient)
if ( if (
message.recipient.type == Recipient.HUDDLE message.recipient.type == Recipient.HUDDLE
and trigger == NotificationTriggers.DIRECT_MESSAGE and trigger == NotificationTriggers.DIRECT_MESSAGE
@@ -668,27 +667,25 @@ def get_gcm_alert(
and trigger == NotificationTriggers.DIRECT_MESSAGE and trigger == NotificationTriggers.DIRECT_MESSAGE
): ):
return f"New direct message from {sender_str}" return f"New direct message from {sender_str}"
elif message.is_stream_message() and trigger == NotificationTriggers.MENTION:
assert message.is_stream_message()
display_recipient = get_display_recipient(message.recipient)
if trigger == NotificationTriggers.MENTION:
if mentioned_user_group_name is None: if mentioned_user_group_name is None:
return f"{sender_str} mentioned you in #{display_recipient}" return f"{sender_str} mentioned you in #{display_recipient}"
else: else:
return f"{sender_str} mentioned @{mentioned_user_group_name} in #{display_recipient}" return f"{sender_str} mentioned @{mentioned_user_group_name} in #{display_recipient}"
elif ( elif trigger == NotificationTriggers.TOPIC_WILDCARD_MENTION_IN_FOLLOWED_TOPIC:
message.is_stream_message()
and trigger == NotificationTriggers.TOPIC_WILDCARD_MENTION_IN_FOLLOWED_TOPIC
):
return "TODO - 2" return "TODO - 2"
elif ( elif trigger == NotificationTriggers.STREAM_WILDCARD_MENTION_IN_FOLLOWED_TOPIC:
message.is_stream_message()
and trigger == NotificationTriggers.STREAM_WILDCARD_MENTION_IN_FOLLOWED_TOPIC
):
return "TODO" return "TODO"
elif message.is_stream_message() and trigger == NotificationTriggers.TOPIC_WILDCARD_MENTION: elif trigger == NotificationTriggers.TOPIC_WILDCARD_MENTION:
return f"{sender_str} mentioned all topic participants in #{display_recipient} > {message.topic_name()}" return f"{sender_str} mentioned all topic participants in #{display_recipient} > {message.topic_name()}"
elif message.is_stream_message() and trigger == NotificationTriggers.STREAM_WILDCARD_MENTION: elif trigger == NotificationTriggers.STREAM_WILDCARD_MENTION:
return f"{sender_str} mentioned everyone in #{display_recipient}" return f"{sender_str} mentioned everyone in #{display_recipient}"
else: else:
assert message.is_stream_message() and trigger == NotificationTriggers.STREAM_PUSH assert trigger == NotificationTriggers.STREAM_PUSH
return f"New stream message from {sender_str} in #{display_recipient}" return f"New stream message from {sender_str} in #{display_recipient}"