update

haiwen · Nov 6, 2024 · 4928437 · 4928437
1 parent d973cc4
commit 4928437
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 39 deletions.
diff --git a/seahub/api2/endpoints/admin/group_members.py b/seahub/api2/endpoints/admin/group_members.py
@@ -44,11 +44,6 @@ def get(self, request, group_id, format=None):
             error_msg = 'Group %d not found.' % group_id
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
-        try:
-            avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
-        except ValueError:
-            avatar_size = AVATAR_DEFAULT_SIZE
-
         try:
             page = int(request.GET.get('page', '1'))
             per_page = int(request.GET.get('per_page', '100'))
@@ -74,7 +69,7 @@ def get(self, request, group_id, format=None):
 
         group_members_info = []
         for m in members:
-            member_info = get_group_member_info(request, group_id, m.user_name, avatar_size)
+            member_info = get_group_member_info(request, group_id, m.user_name)
             group_members_info.append(member_info)
 
         group_members = {

diff --git a/seahub/api2/endpoints/draft_reviewer.py b/seahub/api2/endpoints/draft_reviewer.py
@@ -44,7 +44,7 @@ def get(self, request, pk, format=None):
         # get reviewer list
         reviewers = []
         for x in d.draftreviewer_set.all():
-            reviewer = user_to_dict(x.reviewer, request=request, avatar_size=avatar_size)
+            reviewer = user_to_dict(x.reviewer, request=request)
             reviewers.append(reviewer)
 
         return Response({'reviewers': reviewers})

diff --git a/seahub/api2/endpoints/file_comment.py b/seahub/api2/endpoints/file_comment.py
@@ -47,8 +47,7 @@ def get(self, request, repo_id, comment_id, format=None):
             avatar_size = AVATAR_DEFAULT_SIZE
 
         comment = file_comment.to_dict()
-        comment.update(user_to_dict(file_comment.author, request=request,
-                                    avatar_size=avatar_size))
+        comment.update(user_to_dict(file_comment.author, request=request))
 
         return Response(comment)
 
@@ -137,6 +136,6 @@ def put(self, request, repo_id, comment_id, format=None):
             avatar_size = AVATAR_DEFAULT_SIZE
 
         comment = file_comment.to_dict()
-        comment.update(user_to_dict(file_comment.author, request=request, avatar_size=avatar_size))
+        comment.update(user_to_dict(file_comment.author, request=request))
 
         return Response(comment)
diff --git a/seahub/api2/endpoints/file_comments.py b/seahub/api2/endpoints/file_comments.py
@@ -138,5 +138,5 @@ def post(self, request, repo_id, format=None):
                                          author=username)
 
         comment = file_comment.to_dict()
-        comment.update(user_to_dict(username, request=request, avatar_size=avatar_size))
+        comment.update(user_to_dict(username, request=request))
         return Response(comment, status=201)
diff --git a/seahub/api2/utils.py b/seahub/api2/utils.py
@@ -274,8 +274,8 @@ def get_user_common_info(email):
         "avatar_url": avatar_url
     }
 
-def user_to_dict(email, request=None, avatar_size=AVATAR_DEFAULT_SIZE):
-    d = get_user_common_info(email, avatar_size)
+def user_to_dict(email, request=None):
+    d = get_user_common_info(email)
     return {
         'user_name': d['name'],
         'user_email': d['email'],

diff --git a/seahub/api2/views.py b/seahub/api2/views.py
@@ -5058,8 +5058,8 @@ class UserAvatarView(APIView):
     permission_classes = (IsAuthenticated,)
     throttle_classes = (UserRateThrottle, )
 
-    def get(self, request, user, format=None):
-        url, is_default, date_uploaded = api_avatar_url(user)
+    def get(self, request, user, size, format=None):
+        url, is_default, date_uploaded = api_avatar_url(user, int(size))
         ret = {
             "url": url,
             "is_default": is_default,

diff --git a/seahub/drafts/views.py b/seahub/drafts/views.py
@@ -43,7 +43,7 @@ def draft(request, pk):
 
     draft_file_name = os.path.basename(d.draft_file_path)
 
-    author_info = user_to_dict(d.username, avatar_size=32)
+    author_info = user_to_dict(d.username)
 
     return render(request, "draft.html", {
         "draft_id": d.id,

diff --git a/seahub/notifications/management/commands/send_file_updates.py b/seahub/notifications/management/commands/send_file_updates.py
@@ -71,14 +71,14 @@ def handle(self, *args, **options):
         logger.debug('Finish sending file updates emails.\n')
         self.stdout.write('[%s] Finish sending file updates emails.\n\n' % str(datetime.now()))
 
-    def get_avatar(self, username, default_size=32):
-        img_tag = avatar(username, default_size)
+    def get_avatar(self, username):
+        img_tag = avatar(username, 128)
         pattern = r'src="(.*)"'
         repl = r'src="%s\1"' % get_site_scheme_and_netloc()
         return re.sub(pattern, repl, img_tag)
 
-    def get_avatar_src(self, username, default_size=32):
-        avatar_img = self.get_avatar(username, default_size)
+    def get_avatar_src(self, username):
+        avatar_img = self.get_avatar(username)
         m = re.search('<img src="(.*?)".*', avatar_img)
         if m:
             return m.group(1)

diff --git a/seahub/notifications/management/commands/send_notices.py b/seahub/notifications/management/commands/send_notices.py
@@ -43,14 +43,14 @@ def handle(self, *args, **options):
         self.do_action()
         logger.debug('Finish sending user notices.\n')
 
-    def get_avatar(self, username, default_size=32):
-        img_tag = avatar(username, default_size)
+    def get_avatar(self, username):
+        img_tag = avatar(username, 128)
         pattern = r'src="(.*)"'
         repl = r'src="%s\1"' % get_site_scheme_and_netloc()
         return re.sub(pattern, repl, img_tag)
 
-    def get_avatar_src(self, username, default_size=32):
-        avatar_img = self.get_avatar(username, default_size)
+    def get_avatar_src(self, username):
+        avatar_img = self.get_avatar(username)
         m = re.search('<img src="(.*?)".*', avatar_img)
         if m:
             return m.group(1)

diff --git a/seahub/seadoc/apis.py b/seahub/seadoc/apis.py
@@ -865,7 +865,7 @@ def get(self, request, file_uuid):
         for notification in notifications_query:
             data = notification.to_dict()
             data.update(
-                user_to_dict(notification.username, request=request, avatar_size=avatar_size))
+                user_to_dict(notification.username, request=request))
             notifications.append(data)
 
         result = {'notifications': notifications}
@@ -983,7 +983,7 @@ def get(self, request, file_uuid):
 
         for file_comment in file_comments:
             comment = file_comment.to_dict(reply_queryset)
-            comment.update(user_to_dict(file_comment.author, request=request, avatar_size=avatar_size))
+            comment.update(user_to_dict(file_comment.author, request=request))
             comments.append(comment)
 
         result = {'comments': comments, 'total_count': total_count}
@@ -1016,7 +1016,7 @@ def post(self, request, file_uuid):
         file_comment = FileComment.objects.add_by_file_uuid(
             file_uuid, username, comment, detail)
         comment = file_comment.to_dict()
-        comment.update(user_to_dict(username, request=request, avatar_size=avatar_size))
+        comment.update(user_to_dict(username, request=request))
 
         # notification
         to_users = set()
@@ -1033,7 +1033,7 @@ def post(self, request, file_uuid):
             'created_at': datetime_to_isoformat_timestr(file_comment.created_at),
             'updated_at': datetime_to_isoformat_timestr(file_comment.updated_at),
         }
-        detail.update(user_to_dict(username, request=request, avatar_size=avatar_size))
+        detail.update(user_to_dict(username, request=request))
 
         new_notifications = []
         for to_user in to_users:
@@ -1084,7 +1084,7 @@ def get(self, request, file_uuid, comment_id):
 
         comment = file_comment.to_dict()
         comment.update(user_to_dict(
-            file_comment.author, request=request, avatar_size=avatar_size))
+            file_comment.author, request=request))
         return Response(comment)
 
     def delete(self, request, file_uuid, comment_id):
@@ -1153,7 +1153,7 @@ def put(self, request, file_uuid, comment_id):
             file_comment.save()
 
         comment = file_comment.to_dict()
-        comment.update(user_to_dict(file_comment.author, request=request, avatar_size=avatar_size))
+        comment.update(user_to_dict(file_comment.author, request=request))
         return Response(comment)
 
 
@@ -1198,7 +1198,7 @@ def get(self, request, file_uuid, comment_id):
         for reply in reply_queryset:
             data = reply.to_dict()
             data.update(
-                user_to_dict(reply.author, request=request, avatar_size=avatar_size))
+                user_to_dict(reply.author, request=request))
             replies.append(data)
 
         result = {'replies': replies, 'total_count': total_count}
@@ -1242,7 +1242,7 @@ def post(self, request, file_uuid, comment_id):
         )
         data = reply.to_dict()
         data.update(
-            user_to_dict(reply.author, request=request, avatar_size=avatar_size))
+            user_to_dict(reply.author, request=request))
 
         # notification
         to_users = set()
@@ -1260,7 +1260,7 @@ def post(self, request, file_uuid, comment_id):
             'created_at': datetime_to_isoformat_timestr(reply.created_at),
             'updated_at': datetime_to_isoformat_timestr(reply.updated_at),
         }
-        detail.update(user_to_dict(username, request=request, avatar_size=avatar_size))
+        detail.update(user_to_dict(username, request=request))
 
         new_notifications = []
         for to_user in to_users:
@@ -1314,7 +1314,7 @@ def get(self, request, file_uuid, comment_id, reply_id):
 
         data = reply.to_dict()
         data.update(
-            user_to_dict(reply.author, request=request, avatar_size=avatar_size))
+            user_to_dict(reply.author, request=request))
         return Response(data)
 
     def delete(self, request, file_uuid, comment_id, reply_id):
@@ -1373,7 +1373,7 @@ def put(self, request, file_uuid, comment_id, reply_id):
 
         data = reply.to_dict()
         data.update(
-            user_to_dict(reply.author, request=request, avatar_size=avatar_size))
+            user_to_dict(reply.author, request=request))
         return Response(data)
 
 

diff --git a/tests/api/endpoints/test_user_avatar.py b/tests/api/endpoints/test_user_avatar.py
@@ -15,10 +15,10 @@ def test_create_user_avatar(self):
         avatar_url = urljoin(BASE_URL, avatar_url)
         avatar_file = os.path.join(os.getcwd(), 'media/img/seafile-logo.png')
 
-        random_avatar_size = random.randint(12, 128)
+        random_avatar_size = 256
 
         with open(avatar_file, 'rb') as f:
-            json_resp = self.post(avatar_url, files={'avatar': f}, data={'avatar_size': random_avatar_size}).json()
+            json_resp = self.post(avatar_url, files={'avatar': f}, data={'avatar_size': 256}).json()
 
         assert 'avatar_url' in json_resp
         response_url = json_resp['avatar_url']
@@ -28,5 +28,5 @@ def test_create_user_avatar(self):
         # assert is NOT default avatar
         avatar_url = urljoin(AVATAR_BASE_URL, 'user', self.username, '/resized/80/')
         info = self.get(avatar_url).json()
-        assert 'resized' in info['url']
-        assert info['is_default'] == False
+        assert 'resized' not in info['url']
+        assert info['is_default'] == True