From a56531e1117b8614ff80c5becb24e5eeea9a2cc6 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 19 Dec 2018 15:53:54 +0100
Subject: [PATCH] Added missing format in oembed discovery link
---
api/funkwhale_api/music/spa_views.py | 4 ++--
api/tests/music/test_spa_views.py | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/api/funkwhale_api/music/spa_views.py b/api/funkwhale_api/music/spa_views.py
index c1476e8a9..251c6e458 100644
--- a/api/funkwhale_api/music/spa_views.py
+++ b/api/funkwhale_api/music/spa_views.py
@@ -63,7 +63,7 @@ def library_track(request, pk):
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
- + "?url={}".format(track_url)
+ + "?url={}&format=json".format(track_url)
),
}
)
@@ -120,7 +120,7 @@ def library_album(request, pk):
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
- + "?url={}".format(album_url)
+ + "?url={}&format=json".format(album_url)
),
}
)
diff --git a/api/tests/music/test_spa_views.py b/api/tests/music/test_spa_views.py
index a60da50df..e75dbc46f 100644
--- a/api/tests/music/test_spa_views.py
+++ b/api/tests/music/test_spa_views.py
@@ -59,7 +59,9 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
- + "?url={}".format(utils.join_url(settings.FUNKWHALE_URL, url))
+ + "?url={}&format=json".format(
+ utils.join_url(settings.FUNKWHALE_URL, url)
+ )
),
},
]
@@ -109,7 +111,9 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
- + "?url={}".format(utils.join_url(settings.FUNKWHALE_URL, url))
+ + "?url={}&format=json".format(
+ utils.join_url(settings.FUNKWHALE_URL, url)
+ )
),
},
]
--
GitLab