yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 17:29:17 +02:00
Code Issues Releases Wiki Activity

Fixed attachments URL not honoring media URL

Browse source
This commit is contained in:
Agate 2020-04-15 12:07:04 +02:00
parent 975e281d15
commit 96086df156
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
2 changed files with 13 additions and 2 deletions
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
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")