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

Merge branch '1140-the-radio-random-function-also-plays-podcasts' into 'develop' 

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

Closes #1140

See merge request funkwhale/funkwhale!1176
This commit is contained in:
Agate 2020-07-23 17:33:29 +02:00
parent b62e5d9f80 71318d66c3
commit 806912c05f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/funkwhale_api/radios/radios.py
View File

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

1
changes/changelog.d/1140.bugfix Normal file
View File

@ -0,0 +1 @@
Fix random radio so that podcast content is not picked up (#1140)