From bf3baa14ac4fc59895e213ac588666a69c49aac8 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Thu, 6 Feb 2020 16:52:12 +0000 Subject: [PATCH] presence: Rename get_status_dict_by_user(). --- zerver/lib/events.py | 4 ++-- zerver/lib/presence.py | 4 ++-- zerver/views/presence.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zerver/lib/events.py b/zerver/lib/events.py index ca14c2d590..41e069b271 100644 --- a/zerver/lib/events.py +++ b/zerver/lib/events.py @@ -29,7 +29,7 @@ from zerver.lib.message import ( from zerver.lib.narrow import check_supported_events_narrow_filter, read_stop_words from zerver.lib.presence import ( get_presences_for_realm, - get_status_dict_by_user + get_presence_for_user, ) from zerver.lib.push_notifications import push_notifications_enabled from zerver.lib.soft_deactivation import reactivate_user_if_soft_deactivated @@ -616,7 +616,7 @@ def apply_event(state: Dict[str, Any], user_key = str(event['user_id']) else: user_key = event['email'] - state['presences'][user_key] = get_status_dict_by_user( + state['presences'][user_key] = get_presence_for_user( event['user_id'], slim_presence)[user_key] elif event['type'] == "update_message": # We don't return messages in /register, so we don't need to diff --git a/zerver/lib/presence.py b/zerver/lib/presence.py index a84477d8b0..42494781a9 100644 --- a/zerver/lib/presence.py +++ b/zerver/lib/presence.py @@ -77,8 +77,8 @@ def get_status_dicts_for_rows(presence_rows: List[Dict[str, Any]], return user_statuses -def get_status_dict_by_user(user_profile_id: int, - slim_presence: bool=False) -> Dict[str, Dict[str, Any]]: +def get_presence_for_user(user_profile_id: int, + slim_presence: bool=False) -> Dict[str, Dict[str, Any]]: query = UserPresence.objects.filter(user_profile_id=user_profile_id).values( 'client__name', 'status', diff --git a/zerver/views/presence.py b/zerver/views/presence.py index 7b79ee2d29..03940afd81 100644 --- a/zerver/views/presence.py +++ b/zerver/views/presence.py @@ -14,7 +14,7 @@ from zerver.lib.actions import ( ) from zerver.lib.presence import ( get_presence_response, - get_status_dict_by_user, + get_presence_for_user, ) from zerver.lib.request import has_request_variables, REQ, JsonableError from zerver.lib.response import json_success, json_error @@ -35,7 +35,7 @@ def get_presence_backend(request: HttpRequest, user_profile: UserProfile, if target.is_bot: return json_error(_('Presence is not supported for bot users.')) - presence_dict = get_status_dict_by_user(target.id) + presence_dict = get_presence_for_user(target.id) if len(presence_dict) == 0: return json_error(_('No presence data for %s') % (target.email,))