diff --git a/zerver/views/users.py b/zerver/views/users.py index b17559976e..9a032af534 100644 --- a/zerver/views/users.py +++ b/zerver/views/users.py @@ -753,22 +753,32 @@ def get_user_data( @typed_endpoint -def get_members_backend( +def get_member_backend( request: HttpRequest, user_profile: UserProfile, - user_id: int | None = None, + user_id: int, *, include_custom_profile_fields: Json[bool] = False, client_gravatar: Json[bool] = True, ) -> HttpResponse: - target_user = None - if user_id is not None: - target_user = access_user_by_id( - user_profile, user_id, allow_deactivated=True, allow_bots=True, for_admin=False - ) - + target_user = access_user_by_id( + user_profile, user_id, allow_deactivated=True, allow_bots=True, for_admin=False + ) data = get_user_data(user_profile, include_custom_profile_fields, client_gravatar, target_user) + return json_success(request, data) + +@typed_endpoint +def get_members_backend( + request: HttpRequest, + user_profile: UserProfile, + *, + include_custom_profile_fields: Json[bool] = False, + client_gravatar: Json[bool] = True, +) -> HttpResponse: + data = get_user_data( + user_profile, include_custom_profile_fields, client_gravatar + ) return json_success(request, data) diff --git a/zproject/urls.py b/zproject/urls.py index c3a32bc623..e8884b32ca 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -232,6 +232,7 @@ from zerver.views.users import ( deactivate_user_backend, deactivate_user_own_backend, get_bots_backend, + get_member_backend, get_members_backend, get_profile_backend, get_subscription_backend, @@ -323,7 +324,7 @@ v1_api_and_json_patterns = [ rest_path("users//reactivate", POST=reactivate_user_backend), rest_path( "users/", - GET=get_members_backend, + GET=get_member_backend, PATCH=update_user_by_id_api, DELETE=deactivate_user_backend, ),