Merge branch 'stable' into develop

api/funkwhale_api/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.2.6"
+__version__ = "1.2.7"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

api/funkwhale_api/contrib/scrobbler/scrobbler.py

@@ -17,7 +17,7 @@ def handshake_v1(session, url, username, password):
     params = {
         "hs": "true",
         "p": "1.2",
-        "c": PLUGIN["name"],
+        "c": "fw",
         "v": PLUGIN["version"],
         "u": username,
         "t": timestamp,

api/funkwhale_api/federation/utils.py

@@ -67,11 +67,7 @@ def slugify_username(username):
 
 
 def retrieve_ap_object(
-    fid,
-    actor,
-    serializer_class=None,
-    queryset=None,
-    apply_instance_policies=True,
+    fid, actor, serializer_class=None, queryset=None, apply_instance_policies=True,
 ):
     # we have a duplicate check here because it's less expensive to do those checks
     # twice than to trigger a HTTP request