novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Random and less listened radio filter out un-owned content on library section (#2007)

Browse source 
Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2285>
This commit is contained in:
Petitminion 2022-12-16 00:10:58 +01:00 • committed by Marge
commit 03a5a83a3b
4 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
api/funkwhale_api/radios/radios.py
View file

@ -119,6 +119,17 @@ class RandomRadio(SessionRadio):
return qs.filter(artist__content_category="music").order_by("?")
@registry.register(name="random_library")
class RandomLibraryRadio(SessionRadio):
def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs)
tracks_ids = self.session.user.actor.attributed_tracks.all().values_list(
"id", flat=True
)
query = Q(artist__content_category="music") & Q(pk__in=tracks_ids)
return qs.filter(query).order_by("?")
@registry.register(name="favorites")
class FavoritesRadio(SessionRadio):
def get_queryset_kwargs(self):
@ -323,6 +334,22 @@ class LessListenedRadio(SessionRadio):
)
@registry.register(name="less-listened_library")
class LessListenedLibraryRadio(SessionRadio):
def clean(self, instance):
instance.related_object = instance.user
super().clean(instance)
def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs)
listened = self.session.user.listenings.all().values_list("track", flat=True)
tracks_ids = self.session.user.actor.attributed_tracks.all().values_list(
"id", flat=True
)
query = Q(artist__content_category="music") & Q(pk__in=tracks_ids)
return qs.filter(query).exclude(pk__in=listened).order_by("?")
@registry.register(name="actor-content")
class ActorContentRadio(RelatedObjectRadio):
"""