From a03cc1db24fdf523bfb42b6b8f55ecb8985ccc9a Mon Sep 17 00:00:00 2001
From: Petitminion <petitminion@riseup.net>
Date: Mon, 5 Feb 2024 18:30:44 +0100
Subject: [PATCH] lint

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2658>
---
 api/funkwhale_api/activity/utils.py                  |  2 ++
 .../contrib/listenbrainz/funkwhale_ready.py          | 12 ++++++------
 api/funkwhale_api/contrib/listenbrainz/tasks.py      |  2 ++
 api/funkwhale_api/favorites/factories.py             |  1 -
 api/tests/conftest.py                                |  1 -
 api/tests/contrib/listenbrainz/test_listenbrainz.py  |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/api/funkwhale_api/activity/utils.py b/api/funkwhale_api/activity/utils.py
index 8d7cb3bd3..233f15a81 100644
--- a/api/funkwhale_api/activity/utils.py
+++ b/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]
diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
index 5848ca746..d5d68e13e 100644
--- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
+++ b/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)
diff --git a/api/funkwhale_api/contrib/listenbrainz/tasks.py b/api/funkwhale_api/contrib/listenbrainz/tasks.py
index f23cd1cce..5b60f74ba 100644
--- a/api/funkwhale_api/contrib/listenbrainz/tasks.py
+++ b/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
diff --git a/api/funkwhale_api/favorites/factories.py b/api/funkwhale_api/favorites/factories.py
index c568a5a1d..871381eb4 100644
--- a/api/funkwhale_api/favorites/factories.py
+++ b/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"
diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index 11496af7e..41d9f63d7 100644
--- a/api/tests/conftest.py
+++ b/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"
diff --git a/api/tests/contrib/listenbrainz/test_listenbrainz.py b/api/tests/contrib/listenbrainz/test_listenbrainz.py
index 1efd6abd8..a9802d509 100644
--- a/api/tests/contrib/listenbrainz/test_listenbrainz.py
+++ b/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