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

soft-deactivation: Rename maybe_catch_up_soft_deactivated_user.

Browse Source 
Rename `maybe_catch_up_soft_deactivated_user` to
`reactivate_user_if_soft_deactivated`.
This commit is contained in:
Puneeth Chaganti
2019-03-12 07:18:01 +05:30
committed by Tim Abbott
parent 7f06f6bd73
commit 52afbe5e8d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/events.py
View File

@@ -26,7 +26,7 @@ from zerver.lib.message import (
) )
from zerver.lib.narrow import check_supported_events_narrow_filter, read_stop_words from zerver.lib.narrow import check_supported_events_narrow_filter, read_stop_words
from zerver.lib.push_notifications import push_notifications_enabled from zerver.lib.push_notifications import push_notifications_enabled
from zerver.lib.soft_deactivation import maybe_catch_up_soft_deactivated_user from zerver.lib.soft_deactivation import reactivate_user_if_soft_deactivated
from zerver.lib.realm_icon import realm_icon_url from zerver.lib.realm_icon import realm_icon_url
from zerver.lib.realm_logo import realm_logo_url from zerver.lib.realm_logo import realm_logo_url
from zerver.lib.request import JsonableError from zerver.lib.request import JsonableError
@@ -768,7 +768,7 @@ def do_events_register(user_profile: UserProfile, user_client: Client,
event_types_set = None event_types_set = None
# Fill up the UserMessage rows if a soft-deactivated user has returned # Fill up the UserMessage rows if a soft-deactivated user has returned
maybe_catch_up_soft_deactivated_user(user_profile) reactivate_user_if_soft_deactivated(user_profile)
ret = fetch_initial_state_data(user_profile, event_types_set, queue_id, ret = fetch_initial_state_data(user_profile, event_types_set, queue_id,
client_gravatar=client_gravatar, client_gravatar=client_gravatar,

4
zerver/lib/soft_deactivation.py
View File

@@ -210,7 +210,7 @@ def do_soft_deactivate_users(users: List[UserProfile]) -> List[UserProfile]:
return users_soft_deactivated return users_soft_deactivated
def maybe_catch_up_soft_deactivated_user(user_profile: UserProfile) -> Union[UserProfile, None]: def reactivate_user_if_soft_deactivated(user_profile: UserProfile) -> Union[UserProfile, None]:
if user_profile.long_term_idle: if user_profile.long_term_idle:
add_missing_messages(user_profile) add_missing_messages(user_profile)
user_profile.long_term_idle = False user_profile.long_term_idle = False
@@ -245,7 +245,7 @@ def get_users_for_soft_deactivation(inactive_for_days: int, filter_kwargs: Any)
def do_soft_activate_users(users: List[UserProfile]) -> List[UserProfile]: def do_soft_activate_users(users: List[UserProfile]) -> List[UserProfile]:
users_soft_activated = [] users_soft_activated = []
for user_profile in users: for user_profile in users:
user_activated = maybe_catch_up_soft_deactivated_user(user_profile) user_activated = reactivate_user_if_soft_deactivated(user_profile)
if user_activated: if user_activated:
users_soft_activated.append(user_activated) users_soft_activated.append(user_activated)
return users_soft_activated return users_soft_activated

2
zerver/tests/test_events.py
View File

@@ -185,7 +185,7 @@ class EventsEndpointTest(ZulipTestCase):
return_user_events = [] # type: (List[Any]) return_user_events = [] # type: (List[Any])
# Test that call is made to deal with a returning soft deactivated user. # Test that call is made to deal with a returning soft deactivated user.
with mock.patch('zerver.lib.events.maybe_catch_up_soft_deactivated_user') as fa: with mock.patch('zerver.lib.events.reactivate_user_if_soft_deactivated') as fa:
with stub_event_queue_user_events(return_event_queue, return_user_events): with stub_event_queue_user_events(return_event_queue, return_user_events):
result = self.api_post(email, '/json/register', dict(event_types=ujson.dumps(['pointer']))) result = self.api_post(email, '/json/register', dict(event_types=ujson.dumps(['pointer'])))
self.assertEqual(fa.call_count, 1) self.assertEqual(fa.call_count, 1)

6
zerver/tests/test_messages.py
View File

@@ -76,7 +76,7 @@ from zerver.lib.soft_deactivation import (
add_missing_messages, add_missing_messages,
do_soft_activate_users, do_soft_activate_users,
do_soft_deactivate_users, do_soft_deactivate_users,
maybe_catch_up_soft_deactivated_user, reactivate_user_if_soft_deactivated,
) )
from zerver.models import ( from zerver.models import (
@@ -3639,7 +3639,7 @@ class DeleteMessageTest(ZulipTestCase):
class SoftDeactivationMessageTest(ZulipTestCase): class SoftDeactivationMessageTest(ZulipTestCase):
def test_maybe_catch_up_soft_deactivated_user(self) -> None: def test_reactivate_user_if_soft_deactivated(self) -> None:
recipient_list = [self.example_user("hamlet"), self.example_user("iago")] recipient_list = [self.example_user("hamlet"), self.example_user("iago")]
for user_profile in recipient_list: for user_profile in recipient_list:
self.subscribe(user_profile, "Denmark") self.subscribe(user_profile, "Denmark")
@@ -3666,7 +3666,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
idle_user_msg_count = len(idle_user_msg_list) idle_user_msg_count = len(idle_user_msg_list)
self.assertNotEqual(idle_user_msg_list[-1].content, message) self.assertNotEqual(idle_user_msg_list[-1].content, message)
with queries_captured() as queries: with queries_captured() as queries:
maybe_catch_up_soft_deactivated_user(long_term_idle_user) reactivate_user_if_soft_deactivated(long_term_idle_user)
self.assert_length(queries, 8) self.assert_length(queries, 8)
self.assertFalse(long_term_idle_user.long_term_idle) self.assertFalse(long_term_idle_user.long_term_idle)
self.assertEqual(last_realm_audit_log_entry( self.assertEqual(last_realm_audit_log_entry(