yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 17:45:18 +02:00
Code Issues Releases Wiki Activity

Fix #563: unplayable radios for anonymous users

Browse source
This commit is contained in:
Eliot Berriot 2019-05-02 10:01:02 +02:00
parent 1a639a8fde
commit 0be93ec05b
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
8 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,8 @@ class SessionRadio(SimpleRadio):
qs = Track.objects.all()
if not self.session:
return qs
if not self.session.user:
return qs
query = moderation_filters.get_filtered_content_query(
config=moderation_filters.USER_FILTER_CONFIG["TRACK"],
user=self.session.user,
@ -62,7 +64,9 @@ class SessionRadio(SimpleRadio):
if self.session:
queryset = self.filter_from_session(queryset)
if kwargs.pop("filter_playable", True):
queryset = queryset.playable_by(self.session.user.actor)
queryset = queryset.playable_by(
self.session.user.actor if self.session.user else None
)
queryset = self.filter_queryset(queryset)
return queryset
@ -129,7 +133,7 @@ class CustomRadio(SessionRadio):
try:
user = data["user"]
except KeyError:
user = context["user"]
user = context.get("user")
try:
assert data["custom_radio"].user == user or data["custom_radio"].is_public
except KeyError: