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

Added HTML link in non-channel Audio JSON-LD representations

This commit is contained in:
Eliot Berriot 2019-12-09 14:13:28 +01:00
parent e20ef24c4c
commit 806ab2b3f0
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/funkwhale_api/federation/serializers.py
View File

@ -1157,11 +1157,18 @@ class UploadSerializer(jsonld.JsonLdSerializer):
"bitrate": instance.bitrate, "bitrate": instance.bitrate,
"size": instance.size, "size": instance.size,
"duration": instance.duration, "duration": instance.duration,
"url": { "url": [
{
"href": utils.full_url(instance.listen_url), "href": utils.full_url(instance.listen_url),
"type": "Link", "type": "Link",
"mediaType": instance.mimetype, "mediaType": instance.mimetype,
}, },
{
"type": "Link",
"mediaType": "text/html",
"href": utils.full_url(instance.track.get_absolute_url()),
},
],
"track": TrackSerializer(track, context={"include_ap_context": False}).data, "track": TrackSerializer(track, context={"include_ap_context": False}).data,
} }
if instance.modification_date: if instance.modification_date:

9
api/tests/federation/test_serializers.py
View File

@ -944,11 +944,18 @@ def test_activity_pub_audio_serializer_to_ap(factories):
"duration": upload.duration, "duration": upload.duration,
"bitrate": upload.bitrate, "bitrate": upload.bitrate,
"size": upload.size, "size": upload.size,
"url": { "url": [
{
"href": utils.full_url(upload.listen_url), "href": utils.full_url(upload.listen_url),
"type": "Link", "type": "Link",
"mediaType": "audio/mp3", "mediaType": "audio/mp3",
}, },
{
"type": "Link",
"mediaType": "text/html",
"href": utils.full_url(upload.track.get_absolute_url()),
},
],
"library": upload.library.fid, "library": upload.library.fid,
"track": serializers.TrackSerializer( "track": serializers.TrackSerializer(
upload.track, context={"include_ap_context": False} upload.track, context={"include_ap_context": False}