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

Fix #1217: Fixed "scope=subscribed" on albums, artists, uploads and libraries API

This commit is contained in:
Agate 2020-09-03 15:58:26 +02:00
parent 83fde07afd
commit bf611f2ecd
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/funkwhale_api/music/filters.py
View File

@ -104,7 +104,9 @@ class ArtistFilter(
has_albums = filters.BooleanFilter(field_name="_", method="filter_has_albums") has_albums = filters.BooleanFilter(field_name="_", method="filter_has_albums")
tag = TAG_FILTER tag = TAG_FILTER
scope = common_filters.ActorScopeFilter( scope = common_filters.ActorScopeFilter(
actor_field="tracks__uploads__library__actor", distinct=True actor_field="tracks__uploads__library__actor",
distinct=True,
library_field="tracks__uploads__library",
) )
ordering = django_filters.OrderingFilter( ordering = django_filters.OrderingFilter(
fields=( fields=(
@ -207,7 +209,9 @@ class UploadFilter(audio_filters.IncludeChannelsFilterSet):
album_artist = filters.UUIDFilter("track__album__artist__uuid") album_artist = filters.UUIDFilter("track__album__artist__uuid")
library = filters.UUIDFilter("library__uuid") library = filters.UUIDFilter("library__uuid")
playable = filters.BooleanFilter(field_name="_", method="filter_playable") playable = filters.BooleanFilter(field_name="_", method="filter_playable")
scope = common_filters.ActorScopeFilter(actor_field="library__actor", distinct=True) scope = common_filters.ActorScopeFilter(
actor_field="library__actor", distinct=True, library_field="library",
)
import_status = common_filters.MultipleQueryFilter(coerce=str) import_status = common_filters.MultipleQueryFilter(coerce=str)
q = fields.SmartSearchFilter( q = fields.SmartSearchFilter(
config=search.SearchConfig( config=search.SearchConfig(
@ -255,7 +259,9 @@ class AlbumFilter(
) )
tag = TAG_FILTER tag = TAG_FILTER
scope = common_filters.ActorScopeFilter( scope = common_filters.ActorScopeFilter(
actor_field="tracks__uploads__library__actor", distinct=True actor_field="tracks__uploads__library__actor",
distinct=True,
library_field="tracks__uploads__library",
) )
ordering = django_filters.OrderingFilter( ordering = django_filters.OrderingFilter(
@ -284,7 +290,9 @@ class AlbumFilter(
class LibraryFilter(filters.FilterSet): class LibraryFilter(filters.FilterSet):
q = fields.SearchFilter(search_fields=["name"],) q = fields.SearchFilter(search_fields=["name"],)
scope = common_filters.ActorScopeFilter(actor_field="actor", distinct=True) scope = common_filters.ActorScopeFilter(
actor_field="actor", distinct=True, library_field="pk",
)
class Meta: class Meta:
model = models.Library model = models.Library

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

@ -0,0 +1 @@
Fixed "scope=subscribed" on albums, artists, uploads and libraries API (#1217)