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

push_notification: Use 'get_mentioned_user_group' function.

Browse Source 
This commit updates the code in 'handle_push_notifications'
to use a common lib function 'get_mentioned_user_group'.

The code logically does the same thing in both the places,
hence the change.
This commit is contained in:
Prakhar Pratyush
2024-04-22 16:14:22 +05:30
committed by Tim Abbott
parent e1ad0e87dd
commit 43136abb70
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/email_notifications.py
View File

@@ -25,7 +25,7 @@ from confirmation.models import one_click_unsubscribe_link
from zerver.lib.display_recipient import get_display_recipient
from zerver.lib.markdown.fenced_code import FENCE_RE
from zerver.lib.message import bulk_access_messages
from zerver.lib.notification_data import get_mentioned_user_group_name
from zerver.lib.notification_data import get_mentioned_user_group
from zerver.lib.queue import queue_json_publish
from zerver.lib.send_email import FromAddress, send_future_email
from zerver.lib.soft_deactivation import soft_reactivate_if_personal_notification
@@ -413,7 +413,11 @@ def do_send_missedmessage_events_reply_in_zulip(
),
)
mentioned_user_group_name = get_mentioned_user_group_name(missed_messages, user_profile)
mentioned_user_group_name = None
mentioned_user_group = get_mentioned_user_group(missed_messages, user_profile)
if mentioned_user_group is not None:
mentioned_user_group_name = mentioned_user_group.name
triggers = [message["trigger"] for message in missed_messages]
unique_triggers = set(triggers)