MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply 12 suggestion(s) to 4 file(s) 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2658>
This commit is contained in:
Ciarán Ainsworth 2024-04-08 12:03:31 +00:00
parent 1b15fea1ab
commit 97e24bcaa6
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/config/plugins.py
View File

@ -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"
"""

14
api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
View File

@ -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",
},
],
)

8
api/funkwhale_api/contrib/listenbrainz/tasks.py
View File

@ -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")

2
api/tests/contrib/listenbrainz/test_listenbrainz.py
View File

@ -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",