paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-24 00:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

push_notification: Remove is_removal param from send_push_notifications.

Browse Source 
We can determine whether the request is meant to revoke an already
sent push notification using the "type" field of the payload.

Passing `is_removal` parameter explicitly to `send_push_notifications`
is not required.
This commit is contained in:
Prakhar Pratyush
2025-08-07 16:02:49 +05:30
committed by Tim Abbott
parent 68ea286ced
commit f034a6c3b4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/push_notifications.py
View File

@@ -1328,7 +1328,7 @@ def handle_remove_push_notification(user_profile_id: int, message_ids: list[int]
# for sending mobile notifications, since we don't at this time # for sending mobile notifications, since we don't at this time
# know which mobile app version the user may be using. # know which mobile app version the user may be using.
send_push_notifications_legacy(user_profile, apns_payload, gcm_payload, gcm_options) send_push_notifications_legacy(user_profile, apns_payload, gcm_payload, gcm_options)
send_push_notifications(user_profile, payload_data_to_encrypt, is_removal=True) send_push_notifications(user_profile, payload_data_to_encrypt)
# We intentionally use the non-truncated message_ids here. We are # We intentionally use the non-truncated message_ids here. We are
# assuming in this very rare case that the user has manually # assuming in this very rare case that the user has manually
@@ -1463,7 +1463,6 @@ def get_encrypted_data(payload_data_to_encrypt: dict[str, Any], public_key_str:
def send_push_notifications( def send_push_notifications(
user_profile: UserProfile, user_profile: UserProfile,
payload_data_to_encrypt: dict[str, Any], payload_data_to_encrypt: dict[str, Any],
is_removal: bool = False,
) -> None: ) -> None:
# Uses 'zerver_pushdevice_user_bouncer_device_id_idx' index. # Uses 'zerver_pushdevice_user_bouncer_device_id_idx' index.
push_devices = PushDevice.objects.filter(user=user_profile, bouncer_device_id__isnull=False) push_devices = PushDevice.objects.filter(user=user_profile, bouncer_device_id__isnull=False)
@@ -1475,6 +1474,8 @@ def send_push_notifications(
) )
return return
is_removal = payload_data_to_encrypt["type"] == "remove"
# Note: The "Final" qualifier serves as a shorthand # Note: The "Final" qualifier serves as a shorthand
# for declaring that a variable is effectively Literal. # for declaring that a variable is effectively Literal.
fcm_priority: Final = "normal" if is_removal else "high" fcm_priority: Final = "normal" if is_removal else "high"