diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
index 42e057654..231d2e10a 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -404,11 +404,9 @@ class OembedSerializer(serializers.Serializer):
"Invalid URL {}".format(validated_data["url"])
)
data = {
- "version": 1.0,
+ "version": "1.0",
"type": "rich",
- "provider_name": "{} - {}".format(
- preferences.get("instance__name"), settings.APP_NAME
- ),
+ "provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"height": validated_data.get("maxheight") or 400,
"width": validated_data.get("maxwidth") or 600,
@@ -432,6 +430,8 @@ class OembedSerializer(serializers.Serializer):
data["thumbnail_url"] = federation_utils.full_url(
track.album.cover.crop["400x400"].url
)
+ data['thumbnail_width'] = 400
+ data['thumbnail_height'] = 400
data["description"] = track.full_name
data["author_name"] = track.artist.name
data["height"] = 150
@@ -456,6 +456,8 @@ class OembedSerializer(serializers.Serializer):
data["thumbnail_url"] = federation_utils.full_url(
album.cover.crop["400x400"].url
)
+ data['thumbnail_width'] = 400
+ data['thumbnail_height'] = 400
data["title"] = "{} by {}".format(album.title, album.artist.name)
data["description"] = "{} by {}".format(album.title, album.artist.name)
data["author_name"] = album.artist.name
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index d954787b0..aa1214f83 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -574,20 +574,17 @@ def test_detail_license(api_client, preferences):
assert response.data == expected
-def test_oembed_track(factories, no_api_auth, api_client, settings, preferences):
+def test_oembed_track(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
- preferences["instance__name"] = "Hello"
track = factories["music.Track"]()
url = reverse("api:v1:oembed")
track_url = "https://test.com/library/tracks/{}".format(track.pk)
iframe_src = "http://embed?type=track&id={}".format(track.pk)
expected = {
- "version": 1.0,
+ "version": "1.0",
"type": "rich",
- "provider_name": "{} - {}".format(
- preferences["instance__name"], settings.APP_NAME
- ),
+ "provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"height": 150,
"width": 600,
@@ -596,6 +593,8 @@ def test_oembed_track(factories, no_api_auth, api_client, settings, preferences)
"thumbnail_url": federation_utils.full_url(
track.album.cover.crop["400x400"].url
),
+ "thumbnail_height": 400,
+ "thumbnail_width": 400,
"html": ''.format(
iframe_src
),
@@ -610,27 +609,26 @@ def test_oembed_track(factories, no_api_auth, api_client, settings, preferences)
assert response.data == expected
-def test_oembed_album(factories, no_api_auth, api_client, settings, preferences):
+def test_oembed_album(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
- preferences["instance__name"] = "Hello"
track = factories["music.Track"]()
album = track.album
url = reverse("api:v1:oembed")
album_url = "https://test.com/library/albums/{}".format(album.pk)
iframe_src = "http://embed?type=album&id={}".format(album.pk)
expected = {
- "version": 1.0,
+ "version": "1.0",
"type": "rich",
- "provider_name": "{} - {}".format(
- preferences["instance__name"], settings.APP_NAME
- ),
+ "provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"height": 400,
"width": 600,
"title": "{} by {}".format(album.title, album.artist.name),
"description": "{} by {}".format(album.title, album.artist.name),
"thumbnail_url": federation_utils.full_url(album.cover.crop["400x400"].url),
+ "thumbnail_height": 400,
+ "thumbnail_width": 400,
"html": ''.format(
iframe_src
),