Merge branch '1498-fix-scrobber-empty-mbid' into 'develop'

Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID

Closes #1498

See merge request funkwhale/funkwhale!1326

(cherry picked from commit 8273feb581)

572efc79 Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID

api/funkwhale_api/contrib/scrobbler/scrobbler.py

@@ -90,7 +90,7 @@ def get_scrobble_payload(track, date, suffix="[0]"):
         "l{}".format(suffix): upload.duration if upload else 0,
         "b{}".format(suffix): (track.album.title if track.album else "") or "",
         "n{}".format(suffix): track.position or "",
-        "m{}".format(suffix): str(track.mbid) or "",
+        "m{}".format(suffix): str(track.mbid or ""),
         "o{}".format(suffix): "P",  # Source: P = chosen by user
     }
     if date:
@@ -115,7 +115,7 @@ def get_scrobble2_payload(track, date, suffix="[0]"):
     if track.position:
         data["trackNumber"] = track.position
     if track.mbid:
-        data["mbid"] = str(track.mbid)
+        data["mbid"] = str(track.mbid or "")
     if date:
         offset = upload.duration / 2 if upload.duration else 0
         data["timestamp"] = int(int(date.timestamp()) - offset)

changes/changelog.d/1498.bug

@@ -0,0 +1 @@
+Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)