MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'attachment-urls' into 'develop' 

Fixed attachments URL not honoring media URL

See merge request funkwhale/funkwhale!1092
This commit is contained in:
Agate 2020-04-15 12:11:18 +02:00
parent 975e281d15 96086df156
commit 1a752287b7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/funkwhale_api/common/models.py
View File

@ -256,14 +256,14 @@ class Attachment(models.Model):
@property @property
def download_url_original(self): def download_url_original(self):
if self.file: 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}) proxy_url = reverse("api:v1:attachments-proxy", kwargs={"uuid": self.uuid})
return federation_utils.full_url(proxy_url + "?next=original") return federation_utils.full_url(proxy_url + "?next=original")
@property @property
def download_url_medium_square_crop(self): def download_url_medium_square_crop(self):
if self.file: 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}) proxy_url = reverse("api:v1:attachments-proxy", kwargs={"uuid": self.uuid})
return federation_utils.full_url(proxy_url + "?next=medium_square_crop") return federation_utils.full_url(proxy_url + "?next=medium_square_crop")

11
api/funkwhale_api/common/utils.py
View File

@ -134,6 +134,17 @@ def join_url(start, end):
return 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={}): def spa_reverse(name, args=[], kwargs={}):
return urls.reverse(name, urlconf=settings.SPA_URLCONF, args=args, kwargs=kwargs) return urls.reverse(name, urlconf=settings.SPA_URLCONF, args=args, kwargs=kwargs)