From 2b5d444e60eb19672e573b3c32030d68a4e64b8f Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 3 Dec 2015 11:00:34 +0800 Subject: [PATCH] [api] return avatar url when search user --- seahub/api2/views.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/seahub/api2/views.py b/seahub/api2/views.py index 6e93fd0ab9..5f8540342f 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -361,16 +361,23 @@ class SearchUser(APIView): if is_valid_username(q) and q not in search_result: search_result.insert(0, q) - formated_result = format_user_result(search_result)[:10] + try: + size = int(request.GET.get('avatar_size', 32)) + except ValueError: + size = 32 + + formated_result = format_user_result(search_result, size)[:10] return HttpResponse(json.dumps({"users": formated_result}), status=200, content_type=json_content_type) -def format_user_result(users): +def format_user_result(users, size): results = [] for email in users: + url, is_default, date_uploaded = api_avatar_url(email, size) results.append({ "email": email, - "avatar": avatar(email, 32), + "avatar": avatar(email, size), + "avatar_url": url, "name": email2nickname(email), }) return results