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

Added missing attributes in oembed data

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

10
api/funkwhale_api/music/serializers.py
View File

@ -404,11 +404,9 @@ class OembedSerializer(serializers.Serializer):
"Invalid URL {}".format(validated_data["url"]) "Invalid URL {}".format(validated_data["url"])
) )
data = { data = {
"version": 1.0, "version": "1.0",
"type": "rich", "type": "rich",
"provider_name": "{} - {}".format( "provider_name": settings.APP_NAME,
preferences.get("instance__name"), settings.APP_NAME
),
"provider_url": settings.FUNKWHALE_URL, "provider_url": settings.FUNKWHALE_URL,
"height": validated_data.get("maxheight") or 400, "height": validated_data.get("maxheight") or 400,
"width": validated_data.get("maxwidth") or 600, "width": validated_data.get("maxwidth") or 600,
@ -432,6 +430,8 @@ class OembedSerializer(serializers.Serializer):
data["thumbnail_url"] = federation_utils.full_url( data["thumbnail_url"] = federation_utils.full_url(
track.album.cover.crop["400x400"].url track.album.cover.crop["400x400"].url
) )
data['thumbnail_width'] = 400
data['thumbnail_height'] = 400
data["description"] = track.full_name data["description"] = track.full_name
data["author_name"] = track.artist.name data["author_name"] = track.artist.name
data["height"] = 150 data["height"] = 150
@ -456,6 +456,8 @@ class OembedSerializer(serializers.Serializer):
data["thumbnail_url"] = federation_utils.full_url( data["thumbnail_url"] = federation_utils.full_url(
album.cover.crop["400x400"].url album.cover.crop["400x400"].url
) )
data['thumbnail_width'] = 400
data['thumbnail_height'] = 400
data["title"] = "{} by {}".format(album.title, album.artist.name) data["title"] = "{} by {}".format(album.title, album.artist.name)
data["description"] = "{} by {}".format(album.title, album.artist.name) data["description"] = "{} by {}".format(album.title, album.artist.name)
data["author_name"] = album.artist.name data["author_name"] = album.artist.name

22
api/tests/music/test_views.py
View File

@ -574,20 +574,17 @@ def test_detail_license(api_client, preferences):
assert response.data == expected 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_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed" settings.FUNKWHALE_EMBED_URL = "http://embed"
preferences["instance__name"] = "Hello"
track = factories["music.Track"]() track = factories["music.Track"]()
url = reverse("api:v1:oembed") url = reverse("api:v1:oembed")
track_url = "https://test.com/library/tracks/{}".format(track.pk) track_url = "https://test.com/library/tracks/{}".format(track.pk)
iframe_src = "http://embed?type=track&id={}".format(track.pk) iframe_src = "http://embed?type=track&id={}".format(track.pk)
expected = { expected = {
"version": 1.0, "version": "1.0",
"type": "rich", "type": "rich",
"provider_name": "{} - {}".format( "provider_name": settings.APP_NAME,
preferences["instance__name"], settings.APP_NAME
),
"provider_url": settings.FUNKWHALE_URL, "provider_url": settings.FUNKWHALE_URL,
"height": 150, "height": 150,
"width": 600, "width": 600,
@ -596,6 +593,8 @@ def test_oembed_track(factories, no_api_auth, api_client, settings, preferences)
"thumbnail_url": federation_utils.full_url( "thumbnail_url": federation_utils.full_url(
track.album.cover.crop["400x400"].url track.album.cover.crop["400x400"].url
), ),
"thumbnail_height": 400,
"thumbnail_width": 400,
"html": '<iframe width="600" height="150" scrolling="no" frameborder="no" src="{}"></iframe>'.format( "html": '<iframe width="600" height="150" scrolling="no" frameborder="no" src="{}"></iframe>'.format(
iframe_src iframe_src
), ),
@ -610,27 +609,26 @@ def test_oembed_track(factories, no_api_auth, api_client, settings, preferences)
assert response.data == expected 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_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed" settings.FUNKWHALE_EMBED_URL = "http://embed"
preferences["instance__name"] = "Hello"
track = factories["music.Track"]() track = factories["music.Track"]()
album = track.album album = track.album
url = reverse("api:v1:oembed") url = reverse("api:v1:oembed")
album_url = "https://test.com/library/albums/{}".format(album.pk) album_url = "https://test.com/library/albums/{}".format(album.pk)
iframe_src = "http://embed?type=album&id={}".format(album.pk) iframe_src = "http://embed?type=album&id={}".format(album.pk)
expected = { expected = {
"version": 1.0, "version": "1.0",
"type": "rich", "type": "rich",
"provider_name": "{} - {}".format( "provider_name": settings.APP_NAME,
preferences["instance__name"], settings.APP_NAME
),
"provider_url": settings.FUNKWHALE_URL, "provider_url": settings.FUNKWHALE_URL,
"height": 400, "height": 400,
"width": 600, "width": 600,
"title": "{} by {}".format(album.title, album.artist.name), "title": "{} by {}".format(album.title, album.artist.name),
"description": "{} 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_url": federation_utils.full_url(album.cover.crop["400x400"].url),
"thumbnail_height": 400,
"thumbnail_width": 400,
"html": '<iframe width="600" height="400" scrolling="no" frameborder="no" src="{}"></iframe>'.format( "html": '<iframe width="600" height="400" scrolling="no" frameborder="no" src="{}"></iframe>'.format(
iframe_src iframe_src
), ),