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

remove privacy_levelcheck from playlist vieset to follow playlist.privacy_level instead of user.privacy_level

This commit is contained in:
Petitminion 2025-05-07 16:09:04 +02:00 committed by petitminion
parent 0b7d6abc18
commit 8e28ef4408
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/funkwhale_api/federation/views.py
View File

@ -726,7 +726,6 @@ class PlaylistViewSet(
FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet
): ):
authentication_classes = [authentication.SignatureAuthentication] authentication_classes = [authentication.SignatureAuthentication]
permission_classes = [common_permissions.PrivacyLevelPermission]
renderer_classes = renderers.get_ap_renderers() renderer_classes = renderers.get_ap_renderers()
queryset = playlists_models.Playlist.objects.local().select_related("actor") queryset = playlists_models.Playlist.objects.local().select_related("actor")
serializer_class = serializers.PlaylistCollectionSerializer serializer_class = serializers.PlaylistCollectionSerializer
@ -759,7 +758,6 @@ class PlaylistTrackViewSet(
FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet
): ):
authentication_classes = [authentication.SignatureAuthentication] authentication_classes = [authentication.SignatureAuthentication]
permission_classes = [common_permissions.PrivacyLevelPermission]
renderer_classes = renderers.get_ap_renderers() renderer_classes = renderers.get_ap_renderers()
queryset = playlists_models.PlaylistTrack.objects.local().select_related("actor") queryset = playlists_models.PlaylistTrack.objects.local().select_related("actor")
serializer_class = serializers.PlaylistTrackSerializer serializer_class = serializers.PlaylistTrackSerializer
@ -767,6 +765,8 @@ class PlaylistTrackViewSet(
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
plt = self.get_object() plt = self.get_object()
if not has_playlist_access(request, plt.playlist):
return response.Response(status=403)
if utils.should_redirect_ap_to_html(request.headers.get("accept")): if utils.should_redirect_ap_to_html(request.headers.get("accept")):
return redirect_to_html(plt.get_absolute_url()) return redirect_to_html(plt.get_absolute_url())

2
api/funkwhale_api/playlists/serializers.py
View File

@ -72,10 +72,8 @@ class PlaylistSerializer(serializers.ModelSerializer):
): ):
actor = self.context["request"].user.actor actor = self.context["request"].user.actor
lib_qs = obj.library.received_follows.filter(actor=actor) lib_qs = obj.library.received_follows.filter(actor=actor)
logger.info(f"lib_qs is {str(lib_qs)}")
if lib_qs.exists(): if lib_qs.exists():
logger.info(f"lib_qs exiiiiiist {str(lib_qs[0].approved)}")
if lib_qs[0].approved is None: if lib_qs[0].approved is None:
return False return False
else: else: