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

maloja: fix submission of artist names 

Payload must be submitted as JSON and artist must be an array

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2328>
This commit is contained in:
Philipp Wolfer 2023-01-20 20:35:18 +01:00 committed by Marge
parent 097f803fab
commit 7da78afa43
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/funkwhale_api/contrib/maloja/funkwhale_ready.py
View File

@ -22,7 +22,7 @@ def submit_listen(listening, conf, **kwargs):
logger.debug("Majola payload: %r", payload) logger.debug("Majola payload: %r", payload)
url = server_url.rstrip("/") + "/apis/mlj_1/newscrobble" url = server_url.rstrip("/") + "/apis/mlj_1/newscrobble"
session = plugins.get_session() session = plugins.get_session()
response = session.post(url, payload) response = session.post(url, json=payload)
response.raise_for_status() response.raise_for_status()
details = json.loads(response.text) details = json.loads(response.text)
if details["status"] == "success": if details["status"] == "success":
@ -35,12 +35,13 @@ def get_payload(listening, api_key):
track = listening.track track = listening.track
payload = { payload = {
"key": api_key, "key": api_key,
"artists": track.artist.name, "artists": [track.artist.name],
"title": track.title, "title": track.title,
"time": int(listening.creation_date.timestamp()), "time": int(listening.creation_date.timestamp()),
} }
if track.album: if track.album:
payload["album"] = track.album.title if track.album.title:
payload["album"] = track.album.title
return payload return payload

2
api/funkwhale_api/contrib/maloja/funkwhale_startup.py
View File

@ -5,7 +5,7 @@ PLUGIN = plugins.get_plugin_config(
label="Maloja", label="Maloja",
description="A plugin that allows you to submit your listens to your Maloja server.", description="A plugin that allows you to submit your listens to your Maloja server.",
homepage="https://docs.funkwhale.audio/users/builtinplugins.html#maloja-plugin", homepage="https://docs.funkwhale.audio/users/builtinplugins.html#maloja-plugin",
version="0.1", version="0.1.1",
user=True, user=True,
conf=[ conf=[
{"name": "server_url", "type": "text", "label": "Maloja server URL"}, {"name": "server_url", "type": "text", "label": "Maloja server URL"},

1
changes/changelog.d/maloja-fix-submission.bugfix Normal file
View File

@ -0,0 +1 @@
Fix artist name submission in Maloja plugin