From 97e24bcaa647baa869d36e2817556b768020631c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= Date: Mon, 8 Apr 2024 12:03:31 +0000 Subject: [PATCH] Apply 12 suggestion(s) to 4 file(s) Part-of: --- api/config/plugins.py | 4 ++-- .../contrib/listenbrainz/funkwhale_startup.py | 14 +++++++------- api/funkwhale_api/contrib/listenbrainz/tasks.py | 8 ++++---- .../contrib/listenbrainz/test_listenbrainz.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/config/plugins.py b/api/config/plugins.py index 7df681d99..cfdeabb3e 100644 --- a/api/config/plugins.py +++ b/api/config/plugins.py @@ -309,11 +309,11 @@ Called by the task manager to trigger listening sync """ FAVORITE_CREATED = "favorite_created" """ -Called when a track is being liked +Called when a track is being favorited """ FAVORITE_DELETED = "favorite_deleted" """ -Called when a favorite track is being unliked +Called when a favorited track is being unfavorited """ FAVORITE_SYNC = "favorite_sync" """ diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py index 22b771e4c..fef3235ed 100644 --- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py +++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py @@ -34,24 +34,24 @@ PLUGIN = plugins.get_plugin_config( "type": "boolean", "default": False, "label": "Enable listenings sync", - "help": "If enable, your listening from Listenbrainz will be imported into Funkwhale. This means they \ - will be used has any other funkwhale listenings to filter out recently listened content or \ + "help": "If enabled, your listening from ListenBrainz will be imported into Funkwhale. This means they \ + will be used along with Funkwhale listenings to filter out recently listened content or \ generate recommendations", }, { - "name": "sync_facorites", + "name": "sync_favorites", "type": "boolean", "default": False, "label": "Enable favorite sync", - "help": "If enable, your favorites from Listenbrainz will be imported into Funkwhale. This means they \ - will be used has any other funkwhale favorites (Ui display, federatipon activity)", + "help": "If enabled, your favorites from ListenBrainz will be imported into Funkwhale. This means they \ + will be used along with Funkwhale favorites (UI display, federation activity)", }, { "name": "submit_favorites", "type": "boolean", "default": False, - "label": "Enable favorite submission to Listenbrainz services", - "help": "If enable, your favorites from Funkwhale will be submit to Listenbrainz", + "label": "Enable favorite submission to ListenBrainz services", + "help": "If enabled, your favorites from Funkwhale will be submitted to ListenBrainz", }, ], ) diff --git a/api/funkwhale_api/contrib/listenbrainz/tasks.py b/api/funkwhale_api/contrib/listenbrainz/tasks.py index b3ba243ce..d43786678 100644 --- a/api/funkwhale_api/contrib/listenbrainz/tasks.py +++ b/api/funkwhale_api/contrib/listenbrainz/tasks.py @@ -90,12 +90,12 @@ def add_lb_listenings_to_db(listens, user): ) if not mbid: - logger.info("Received listening doesn't have a mbid. Skipping...") + logger.info("Received listening that doesn't have a mbid. Skipping...") try: track = music_models.Track.objects.get(mbid=mbid) except music_models.Track.DoesNotExist: - logger.info("Received listening doesn't exist in fw database. Skipping...") + logger.info("Received listening that doesn't exist in fw database. Skipping...") continue user = user @@ -139,7 +139,7 @@ def add_lb_feedback_to_db(feedbacks, user): track = music_models.Track.objects.get(mbid=feedback["recording_mbid"]) except music_models.Track.DoesNotExist: logger.info( - "Received feedback track doesn't exist in fw database. Skipping..." + "Received feedback track that doesn't exist in fw database. Skipping..." ) continue @@ -160,4 +160,4 @@ def add_lb_feedback_to_db(feedbacks, user): except favorites_models.TrackFavorite.DoesNotExist: continue elif feedback["score"] == -1: - logger.info("Funkwhale doesn't support hate yet <3") + logger.info("Funkwhale doesn't support disliked tracks") diff --git a/api/tests/contrib/listenbrainz/test_listenbrainz.py b/api/tests/contrib/listenbrainz/test_listenbrainz.py index 2af27da06..e917be7c9 100644 --- a/api/tests/contrib/listenbrainz/test_listenbrainz.py +++ b/api/tests/contrib/listenbrainz/test_listenbrainz.py @@ -25,7 +25,7 @@ def test_listenbrainz_submit_listen(logged_in_client, mocker, factories): "listenbrainz", { "sync_listenings": True, - "sync_facorites": True, + "sync_favorites": True, "submit_favorites": True, "sync_favorites": True, "user_token": "blablabla",