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

push_notifications: Replace pm_users field with recipient_user_ids.

Browse Source 
The encrypted push notification payload previously included a `pm_users`
field for group direct messages.

This commit replaces the `pm_users` field with `recipient_user_ids`.
(new name to migrate from the old "private" keyword)

It's a sorted array of all user IDs participating in a 1:1 or group DM
conversation, including both `user_id` and `sender_id`.

* Previously, `pm_users` was included only for group DMs;
`recipient_user_ids` is present for both 1:1 and group DM conversations.

* The old `pm_users` field was a string containing a comma-separated
list of sorted user IDs. `recipient_user_ids` has a more structured
array format.

Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
This commit is contained in:
Prakhar Pratyush
2025-10-22 13:21:06 +05:30
committed by Tim Abbott
parent 9592d91b68
commit 7ebaa9f4e4
5 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zerver/lib/push_notifications.py
View File

@@ -1032,16 +1032,29 @@ def get_message_payload(
data["channel_id"] = channel_id
data["topic"] = get_topic_display_name(message.topic_name(), user_profile.default_language)
elif message.recipient.type == Recipient.DIRECT_MESSAGE_GROUP:
data["recipient_type"] = "private" if for_legacy_clients else "direct"
# For group DMs, we need to fetch the users for the pm_users field.
# Note that this doesn't do a separate database query, because both
# functions use the get_display_recipient_by_id cache.
recipients = get_display_recipient(message.recipient)
if len(recipients) > 2:
data["pm_users"] = direct_message_group_users(message.recipient.id)
else: # Recipient.PERSONAL
data["recipient_type"] = "private" if for_legacy_clients else "direct"
else:
assert message.recipient.type in [Recipient.PERSONAL, Recipient.DIRECT_MESSAGE_GROUP]
if for_legacy_clients:
data["recipient_type"] = "private"
if message.recipient.type == Recipient.DIRECT_MESSAGE_GROUP:
# For group DMs, we need to fetch the users for the pm_users field.
# Note that this doesn't do a separate database query, because both
# functions use the get_display_recipient_by_id cache.
recipients = get_display_recipient(message.recipient)
if len(recipients) > 2:
data["pm_users"] = direct_message_group_users(message.recipient.id)
else:
data["recipient_type"] = "direct"
# For 1:1 and group DMs, we need to fetch the users for the `recipient_user_ids`
# field. Note that this doesn't do a separate database query, because it uses
# the `get_display_recipient_by_id` cache.
display_recipients = get_display_recipient(message.recipient)
recipient_user_ids = set(
display_recipient["id"] for display_recipient in display_recipients
)
if len(recipient_user_ids) == 1: # Recipient.PERSONAL
recipient_user_ids.add(message.sender_id)
data["recipient_user_ids"] = sorted(recipient_user_ids)
return data