paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

push_notifications: Skip enqueuing notif for users without push devices.

Browse Source 
Previously, we enqueued events to "missedmessage_mobile_notifications"
even for users who had no registered push devices.
'handle_push_notification' later used to perform the check & skip
if there were no registered devices.

This commit avoids putting such events into the
"missedmessage_mobile_notifications" queue at all. By doing so,
we reduce unnecessary churn.
This commit is contained in:
Prakhar Pratyush
2025-09-05 21:27:09 +05:30
committed by Tim Abbott
parent aa317ee844
commit 421637ce31
13 changed files with 236 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
zerver/lib/notification_data.py
View File

@@ -71,6 +71,7 @@ class UserMessageNotificationsData:
stream_wildcard_mention_in_followed_topic_user_ids: set[int],
muted_sender_user_ids: set[int],
all_bot_user_ids: set[int],
push_device_registered_user_ids: set[int],
) -> "UserMessageNotificationsData":
if user_id in all_bot_user_ids:
# Don't send any notifications to bots
@@ -126,30 +127,46 @@ class UserMessageNotificationsData:
and "stream_wildcard_mentioned" in flags
)
dm_push_notify = user_id not in dm_mention_push_disabled_user_ids and private_message
push_device_registered = user_id in push_device_registered_user_ids
dm_push_notify = (
push_device_registered
and user_id not in dm_mention_push_disabled_user_ids
and private_message
)
mention_push_notify = (
user_id not in dm_mention_push_disabled_user_ids and "mentioned" in flags
push_device_registered
and user_id not in dm_mention_push_disabled_user_ids
and "mentioned" in flags
)
topic_wildcard_mention_push_notify = (
user_id in topic_wildcard_mention_user_ids
push_device_registered
and user_id in topic_wildcard_mention_user_ids
and user_id not in dm_mention_push_disabled_user_ids
and "topic_wildcard_mentioned" in flags
)
stream_wildcard_mention_push_notify = (
user_id in stream_wildcard_mention_user_ids
push_device_registered
and user_id in stream_wildcard_mention_user_ids
and user_id not in dm_mention_push_disabled_user_ids
and "stream_wildcard_mentioned" in flags
)
topic_wildcard_mention_in_followed_topic_push_notify = (
user_id in topic_wildcard_mention_in_followed_topic_user_ids
push_device_registered
and user_id in topic_wildcard_mention_in_followed_topic_user_ids
and user_id not in dm_mention_push_disabled_user_ids
and "topic_wildcard_mentioned" in flags
)
stream_wildcard_mention_in_followed_topic_push_notify = (
user_id in stream_wildcard_mention_in_followed_topic_user_ids
push_device_registered
and user_id in stream_wildcard_mention_in_followed_topic_user_ids
and user_id not in dm_mention_push_disabled_user_ids
and "stream_wildcard_mentioned" in flags
)
online_push_enabled = push_device_registered and user_id in online_push_user_ids
stream_push_notify = push_device_registered and user_id in stream_push_user_ids
followed_topic_push_notify = (
push_device_registered and user_id in followed_topic_push_user_ids
)
return cls(
user_id=user_id,
dm_email_notify=dm_email_notify,
@@ -160,10 +177,10 @@ class UserMessageNotificationsData:
mention_push_notify=mention_push_notify,
topic_wildcard_mention_push_notify=topic_wildcard_mention_push_notify,
stream_wildcard_mention_push_notify=stream_wildcard_mention_push_notify,
online_push_enabled=user_id in online_push_user_ids,
stream_push_notify=user_id in stream_push_user_ids,
online_push_enabled=online_push_enabled,
stream_push_notify=stream_push_notify,
stream_email_notify=user_id in stream_email_user_ids,
followed_topic_push_notify=user_id in followed_topic_push_user_ids,
followed_topic_push_notify=followed_topic_push_notify,
followed_topic_email_notify=user_id in followed_topic_email_user_ids,
topic_wildcard_mention_in_followed_topic_push_notify=topic_wildcard_mention_in_followed_topic_push_notify,
topic_wildcard_mention_in_followed_topic_email_notify=topic_wildcard_mention_in_followed_topic_email_notify,