diff --git a/api/funkwhale_api/music/filters.py b/api/funkwhale_api/music/filters.py index d69dd13a3d3b095cabbc5730b78a970c35c88adf..08a3783bec8407e8b6ca5de38e1402eaf08faa89 100644 --- a/api/funkwhale_api/music/filters.py +++ b/api/funkwhale_api/music/filters.py @@ -85,8 +85,6 @@ class ArtistFilter( model = models.Artist fields = { "name": ["exact", "iexact", "startswith", "icontains"], - "playable": ["exact"], - "scope": ["exact"], "mbid": ["exact"], } hidden_content_fields_mapping = moderation_filters.USER_FILTER_CONFIG["ARTIST"] @@ -122,11 +120,9 @@ class TrackFilter( model = models.Track fields = { "title": ["exact", "iexact", "startswith", "icontains"], - "playable": ["exact"], "id": ["exact"], "album": ["exact"], "license": ["exact"], - "scope": ["exact"], "mbid": ["exact"], } hidden_content_fields_mapping = moderation_filters.USER_FILTER_CONFIG["TRACK"] @@ -173,7 +169,6 @@ class UploadFilter(audio_filters.IncludeChannelsFilterSet): class Meta: model = models.Upload fields = [ - "playable", "import_status", "mimetype", "track", @@ -181,7 +176,6 @@ class UploadFilter(audio_filters.IncludeChannelsFilterSet): "album_artist", "library", "import_reference", - "scope", "channel", ] include_channels_field = "track__artist__channel" @@ -209,7 +203,7 @@ class AlbumFilter( class Meta: model = models.Album - fields = ["playable", "q", "artist", "scope", "mbid"] + fields = ["artist", "mbid"] hidden_content_fields_mapping = moderation_filters.USER_FILTER_CONFIG["ALBUM"] include_channels_field = "artist__channel" channel_filter_field = "track__album" @@ -226,4 +220,4 @@ class LibraryFilter(filters.FilterSet): class Meta: model = models.Library - fields = ["privacy_level", "q", "scope"] + fields = ["privacy_level"] diff --git a/api/funkwhale_api/playlists/filters.py b/api/funkwhale_api/playlists/filters.py index f49e9bd1a149d925715cfff61624726f57cf26b6..e12813b38d17cbf4c46080ae111f619149f68916 100644 --- a/api/funkwhale_api/playlists/filters.py +++ b/api/funkwhale_api/playlists/filters.py @@ -33,9 +33,6 @@ class PlaylistFilter(filters.FilterSet): fields = { "user": ["exact"], "name": ["exact", "icontains"], - "q": "exact", - "playable": "exact", - "scope": "exact", } def filter_playable(self, queryset, name, value): diff --git a/api/funkwhale_api/radios/filtersets.py b/api/funkwhale_api/radios/filtersets.py index 6f548dbeaff579f6080ed2953788218fab705889..f570b2d547758c7e606d90774120aba4a3dfbc6f 100644 --- a/api/funkwhale_api/radios/filtersets.py +++ b/api/funkwhale_api/radios/filtersets.py @@ -11,5 +11,4 @@ class RadioFilter(django_filters.FilterSet): model = models.Radio fields = { "name": ["exact", "iexact", "startswith", "icontains"], - "scope": "exact", } diff --git a/api/funkwhale_api/tags/filters.py b/api/funkwhale_api/tags/filters.py index e0ac9675ab7511f043195aaea83b31a1e9fe462b..fe2c566393bb2f4119f1dba4d99b4341bca7b364 100644 --- a/api/funkwhale_api/tags/filters.py +++ b/api/funkwhale_api/tags/filters.py @@ -18,4 +18,4 @@ class TagFilter(filters.FilterSet): class Meta: model = models.Tag - fields = {"q": ["exact"], "name": ["exact", "startswith"]} + fields = {"name": ["exact", "startswith"]}