Redéfinition de Profile.get_avatar_url()

zds/member/api/tests.py

@@ -400,7 +400,7 @@ def test_detail_of_the_member(self):
         self.assertEqual(profile.user.is_active, response.data.get("is_active"))
         self.assertIsNotNone(response.data.get("date_joined"))
         self.assertEqual(profile.site, response.data.get("site"))
-        self.assertEqual(profile.get_avatar_url(), response.data.get("avatar_url"))
+        self.assertEqual(profile.get_absolute_avatar_url(), response.data.get("avatar_url"))
         self.assertEqual(profile.biography, response.data.get("biography"))
         self.assertEqual(profile.sign, response.data.get("sign"))
         self.assertFalse(response.data.get("show_email"))
@@ -442,7 +442,7 @@ def test_detail_of_a_member(self):
         self.assertEqual(self.profile.user.is_active, response.data.get("is_active"))
         self.assertIsNotNone(response.data.get("date_joined"))
         self.assertEqual(self.profile.site, response.data.get("site"))
-        self.assertEqual(self.profile.get_avatar_url(), response.data.get("avatar_url"))
+        self.assertEqual(self.profile.get_absolute_avatar_url(), response.data.get("avatar_url"))
         self.assertEqual(self.profile.biography, response.data.get("biography"))
         self.assertEqual(self.profile.sign, response.data.get("sign"))
         self.assertFalse(response.data.get("show_email"))

zds/member/models.py

@@ -105,20 +105,14 @@ def get_city(self):
 
         return geo_location
 
-    def get_avatar_url(self, size=80):
-        """Get the avatar URL for this profile.
-        If the user has defined a custom URL, use it.
-        If not, use Gravatar.
-        :return: The avatar URL for this profile
-        :rtype: str
-        """
-        if self.avatar_url:
-            if self.avatar_url.startswith(settings.MEDIA_URL):
-                return "{}{}".format(settings.ZDS_APP["site"]["url"], self.avatar_url)
-            else:
-                return self.avatar_url
-        else:
-            return ""
+    def get_absolute_avatar_url(self):
+        """Gets the avatar URL of this profile.
+        :return: The absolute URL of this profile's avatar
+        :rtype: str or None
+        """
+        if self.avatar_url and self.avatar_url.startswith(settings.MEDIA_URL):
+            return settings.ZDS_APP["site"]["url"] + self.avatar_url
+        return self.avatar_url
 
     def get_post_count(self):
         """

zds/member/tests/tests_models.py

@@ -31,20 +31,21 @@ def test_get_absolute_url_for_details_of_member(self):
 
     def test_get_avatar_url(self):
         # if no url was specified -> nothing !
-        self.assertEqual("", self.user1.get_avatar_url())
+        self.assertEqual(self.user1.get_absolute_avatar_url(), None)
 
         # if an url is specified -> take it !
         user2 = ProfileFactory()
         testurl = "http://test.com/avatar.jpg"
         user2.avatar_url = testurl
-        self.assertEqual(user2.get_avatar_url(), testurl)
+        self.assertEqual(user2.get_absolute_avatar_url(), testurl)
 
         # if url is relative, send absolute url
-        gallerie_avtar = GalleryFactory()
-        image_avatar = ImageFactory(gallery=gallerie_avtar)
+        gallerie_avatar = GalleryFactory()
+        image_avatar = ImageFactory(gallery=gallerie_avatar)
         user2.avatar_url = image_avatar.physical.url
-        self.assertNotEqual(user2.get_avatar_url(), image_avatar.physical.url)
-        self.assertIn("http", user2.get_avatar_url())
+        self.assertNotEqual(user2.get_absolute_avatar_url(), image_avatar.physical.url)
+        self.assertIn(image_avatar.physical.url, user2.get_absolute_avatar_url())
+        self.assertIn("http", user2.get_absolute_avatar_url())
 
     def test_get_post_count(self):
         # Start with 0

zds/mp/api/tests.py

@@ -211,7 +211,7 @@ def test_expand_list_of_private_topics_for_author(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         author = response.data.get("results")[0].get("author")
         self.assertEqual(author.get("username"), self.profile.user.username)
-        self.assertEqual(author.get("avatar_url"), self.profile.get_avatar_url())
+        self.assertEqual(author.get("avatar_url"), self.profile.get_absolute_avatar_url())
 
     def test_create_private_topics_with_client_unauthenticated(self):
         """

zds/utils/templatetags/profile.py

@@ -5,7 +5,6 @@
 from django.core.cache import cache
 
 from zds.member.models import Profile
-from zds.utils.templatetags.remove_url_scheme import remove_url_scheme
 
 register = template.Library()
 
@@ -77,7 +76,7 @@ def state(current_user):
 def avatar(profile: Profile, size=80) -> dict:
     if profile is not None:
         return {
-            "avatar_url": remove_url_scheme(profile.get_avatar_url(size)),
+            "avatar_url": profile.avatar_url,
             "avatar_size": size,
             "username": profile.user.username,
         }