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

Fixed url escaping for good ;)

This commit is contained in:
Eliot Berriot 2018-12-19 16:45:40 +01:00
parent d7ea78d2bf
commit e8b2b94df4
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/funkwhale_api/music/spa_views.py
View File

@ -1,3 +1,5 @@
import urllib.parse
from django.conf import settings from django.conf import settings
from django.urls import reverse from django.urls import reverse
@ -58,6 +60,7 @@ def library_track(request, pk):
"content": utils.join_url(settings.FUNKWHALE_URL, obj.listen_url), "content": utils.join_url(settings.FUNKWHALE_URL, obj.listen_url),
} }
) )
metas.append( metas.append(
{ {
"tag": "link", "tag": "link",
@ -65,7 +68,7 @@ def library_track(request, pk):
"type": "application/json+oembed", "type": "application/json+oembed",
"href": ( "href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed")) utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+ "?url={}&format=json".format(track_url) + "?format=json&url={}".format(urllib.parse.quote_plus(track_url))
), ),
} }
) )
@ -124,7 +127,7 @@ def library_album(request, pk):
"type": "application/json+oembed", "type": "application/json+oembed",
"href": ( "href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed")) utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+ "?url={}&format=json".format(album_url) + "?format=json&url={}".format(urllib.parse.quote_plus(album_url))
), ),
} }
) )

10
api/tests/music/test_spa_views.py
View File

@ -1,3 +1,5 @@
import urllib.parse
from django.urls import reverse from django.urls import reverse
from funkwhale_api.common import utils from funkwhale_api.common import utils
@ -61,8 +63,8 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
"type": "application/json+oembed", "type": "application/json+oembed",
"href": ( "href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed")) utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+ "?url={}&format=json".format( + "?format=json&url={}".format(
utils.join_url(settings.FUNKWHALE_URL, url) urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
) )
), ),
}, },
@ -115,8 +117,8 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
"type": "application/json+oembed", "type": "application/json+oembed",
"href": ( "href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed")) utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+ "?url={}&format=json".format( + "?format=json&url={}".format(
utils.join_url(settings.FUNKWHALE_URL, url) urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
) )
), ),
}, },