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

models: Rename receives_online_notifications function.

Browse Source 
Prep for later when we will have a similar setting for
online email notifications.
This commit is contained in:
Abhijeet Prasad Bodas
2021-05-27 17:51:32 +05:30
committed by Tim Abbott
parent e11648f22e
commit 518deb7b9e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/push_notifications.py
View File

@@ -31,7 +31,7 @@ from zerver.models import (
get_display_recipient, get_display_recipient,
get_user_profile_by_id, get_user_profile_by_id,
receives_offline_push_notifications, receives_offline_push_notifications,
receives_online_notifications, receives_online_push_notifications,
) )
if TYPE_CHECKING: if TYPE_CHECKING:
@@ -852,7 +852,7 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any
user_profile = get_user_profile_by_id(user_profile_id) user_profile = get_user_profile_by_id(user_profile_id)
if not ( if not (
receives_offline_push_notifications(user_profile) receives_offline_push_notifications(user_profile)
or receives_online_notifications(user_profile) or receives_online_push_notifications(user_profile)
): ):
return return

2
zerver/models.py
View File

@@ -1661,7 +1661,7 @@ def receives_offline_email_notifications(user_profile: UserProfile) -> bool:
return user_profile.enable_offline_email_notifications and not user_profile.is_bot return user_profile.enable_offline_email_notifications and not user_profile.is_bot
def receives_online_notifications(user_profile: UserProfile) -> bool: def receives_online_push_notifications(user_profile: UserProfile) -> bool:
return user_profile.enable_online_push_notifications and not user_profile.is_bot return user_profile.enable_online_push_notifications and not user_profile.is_bot

10
zerver/tests/test_push_notifications.py
View File

@@ -72,7 +72,7 @@ from zerver.models import (
get_stream, get_stream,
receives_offline_email_notifications, receives_offline_email_notifications,
receives_offline_push_notifications, receives_offline_push_notifications,
receives_online_notifications, receives_online_push_notifications,
receives_stream_notifications, receives_stream_notifications,
) )
@@ -2197,19 +2197,19 @@ class TestReceivesNotificationsFunctions(ZulipTestCase):
self.user.is_bot = True self.user.is_bot = True
self.user.enable_online_push_notifications = True self.user.enable_online_push_notifications = True
self.assertFalse(receives_online_notifications(self.user)) self.assertFalse(receives_online_push_notifications(self.user))
self.user.enable_online_push_notifications = False self.user.enable_online_push_notifications = False
self.assertFalse(receives_online_notifications(self.user)) self.assertFalse(receives_online_push_notifications(self.user))
def test_receivers_online_notifications_when_user_is_not_a_bot(self) -> None: def test_receivers_online_notifications_when_user_is_not_a_bot(self) -> None:
self.user.is_bot = False self.user.is_bot = False
self.user.enable_online_push_notifications = True self.user.enable_online_push_notifications = True
self.assertTrue(receives_online_notifications(self.user)) self.assertTrue(receives_online_push_notifications(self.user))
self.user.enable_online_push_notifications = False self.user.enable_online_push_notifications = False
self.assertFalse(receives_online_notifications(self.user)) self.assertFalse(receives_online_push_notifications(self.user))
def test_receivers_offline_notifications_when_user_is_a_bot(self) -> None: def test_receivers_offline_notifications_when_user_is_a_bot(self) -> None:
self.user.is_bot = True self.user.is_bot = True