lint

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2658>

api/funkwhale_api/activity/utils.py

@@ -47,5 +47,7 @@ def get_activity(user, limit=20):
             "track", "user", "track__artist", "track__album__artist"
         ),
     ]
+    breakpoint()
     records = combined_recent(limit=limit, querysets=querysets)
+
     return [r["object"] for r in records]

api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py

@@ -1,14 +1,14 @@
-import funkwhale_api
 import liblistenbrainz
 
-from config import plugins
 from django.utils import timezone
 
-from funkwhale_api.history import models as history_models
+import funkwhale_api
+from config import plugins
 from funkwhale_api.favorites import models as favorites_models
+from funkwhale_api.history import models as history_models
 
-from .funkwhale_startup import PLUGIN
 from . import tasks
+from .funkwhale_startup import PLUGIN
 
 
 @plugins.register_hook(plugins.LISTENING_CREATED, PLUGIN)
@@ -73,7 +73,7 @@ def submit_favorite_creation(track_favorite, conf, **kwargs):
     track = track_favorite.track
     if not track.mbid:
         logger.warning(
-            "This tracks doesn't have a mbid. Feedback will not be submited to Listenbrainz"
+            "This tracks doesn't have a mbid. Feedback will not be submitted to Listenbrainz"
         )
         return
     client.submit_user_feedback(1, track.mbid)
@@ -90,7 +90,7 @@ def submit_favorite_deletion(track_favorite, conf, **kwargs):
     track = track_favorite.track
     if not track.mbid:
         logger.warning(
-            "This tracks doesn't have a mbid. Feedback will not be submited to Listenbrainz"
+            "This tracks doesn't have a mbid. Feedback will not be submitted to Listenbrainz"
         )
         return
     client.submit_user_feedback(0, track.mbid)

api/funkwhale_api/contrib/listenbrainz/tasks.py

@@ -1,7 +1,9 @@
 import datetime
+
 import liblistenbrainz
 
 from django.utils import timezone
+
 from config import plugins
 from funkwhale_api.favorites import models as favorites_models
 from funkwhale_api.history import models as history_models

api/funkwhale_api/favorites/factories.py

@@ -10,7 +10,6 @@ from funkwhale_api.users.factories import UserFactory
 class TrackFavorite(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     track = factory.SubFactory(TrackFactory)
     user = factory.SubFactory(UserFactory)
-    creation_date = factory.Faker("date_time_this_decade", tzinfo=timezone.utc)
 
     class Meta:
         model = "favorites.TrackFavorite"

api/tests/conftest.py

@@ -27,7 +27,6 @@ from funkwhale_api.activity import record
 from funkwhale_api.federation import actors
 from funkwhale_api.moderation import mrf
 from funkwhale_api.music import licenses
-from funkwhale_api.contrib import listenbrainz
 from . import utils as test_utils
 
 pytest_plugins = "aiohttp.pytest_plugin"

api/tests/contrib/listenbrainz/test_listenbrainz.py

@@ -1,9 +1,9 @@
 import datetime
 import logging
 
-import pytest
 import liblistenbrainz
 
+import pytest
 from django.urls import reverse
 from django.utils import timezone