Merge branch 'attachment-urls' into 'develop'

Fixed attachments URL not honoring media URL

See merge request funkwhale/funkwhale!1092

api/funkwhale_api/common/models.py

@@ -256,14 +256,14 @@ class Attachment(models.Model):
     @property
     def download_url_original(self):
         if self.file:
-            return federation_utils.full_url(self.file.url)
+            return utils.media_url(self.file.url)
         proxy_url = reverse("api:v1:attachments-proxy", kwargs={"uuid": self.uuid})
         return federation_utils.full_url(proxy_url + "?next=original")
 
     @property
     def download_url_medium_square_crop(self):
         if self.file:
-            return federation_utils.full_url(self.file.crop["200x200"].url)
+            return utils.media_url(self.file.crop["200x200"].url)
         proxy_url = reverse("api:v1:attachments-proxy", kwargs={"uuid": self.uuid})
         return federation_utils.full_url(proxy_url + "?next=medium_square_crop")
 

api/funkwhale_api/common/utils.py

@@ -134,6 +134,17 @@ def join_url(start, end):
     return start + end
 
 
+def media_url(path):
+    if settings.MEDIA_URL.startswith("http://") or settings.MEDIA_URL.startswith(
+        "https://"
+    ):
+        return join_url(settings.MEDIA_URL, path)
+
+    from funkwhale_api.federation import utils as federation_utils
+
+    return federation_utils.full_url(path)
+
+
 def spa_reverse(name, args=[], kwargs={}):
     return urls.reverse(name, urlconf=settings.SPA_URLCONF, args=args, kwargs=kwargs)