yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 11:39:16 +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

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

@ -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)