Skip to content
Snippets Groups Projects
Verified Commit e8b2b94d authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fixed url escaping for good ;)

parent d7ea78d2
No related branches found
No related tags found
No related merge requests found
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): ...@@ -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): ...@@ -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): ...@@ -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))
), ),
} }
) )
......
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): ...@@ -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): ...@@ -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))
) )
), ),
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment