Skip to content
Snippets Groups Projects
Commit 71318d66 authored by Ciarán Ainsworth's avatar Ciarán Ainsworth Committed by Agate
Browse files

Resolve "The "radio - random" function also plays podcasts"

parent e58edad8
No related branches found
No related tags found
No related merge requests found
...@@ -102,7 +102,7 @@ class SessionRadio(SimpleRadio): ...@@ -102,7 +102,7 @@ class SessionRadio(SimpleRadio):
class RandomRadio(SessionRadio): class RandomRadio(SessionRadio):
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs) qs = super().get_queryset(**kwargs)
return qs.order_by("?") return qs.filter(artist__content_category="music").order_by("?")
@registry.register(name="favorites") @registry.register(name="favorites")
...@@ -116,7 +116,7 @@ class FavoritesRadio(SessionRadio): ...@@ -116,7 +116,7 @@ class FavoritesRadio(SessionRadio):
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs) qs = super().get_queryset(**kwargs)
track_ids = kwargs["user"].track_favorites.all().values_list("track", flat=True) track_ids = kwargs["user"].track_favorites.all().values_list("track", flat=True)
return qs.filter(pk__in=track_ids) return qs.filter(pk__in=track_ids, artist__content_category="music")
@registry.register(name="custom") @registry.register(name="custom")
...@@ -271,7 +271,11 @@ class LessListenedRadio(SessionRadio): ...@@ -271,7 +271,11 @@ class LessListenedRadio(SessionRadio):
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
qs = super().get_queryset(**kwargs) qs = super().get_queryset(**kwargs)
listened = self.session.user.listenings.all().values_list("track", flat=True) listened = self.session.user.listenings.all().values_list("track", flat=True)
return qs.exclude(pk__in=listened).order_by("?") return (
qs.filter(artist__content_category="music")
.exclude(pk__in=listened)
.order_by("?")
)
@registry.register(name="actor_content") @registry.register(name="actor_content")
......
Fix random radio so that podcast content is not picked up (#1140)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment