diff --git a/api/funkwhale_api/music/filters.py b/api/funkwhale_api/music/filters.py index ca22467cb701d9174658b98f1f65400684f163cd..feae9b81ca8c9c4092ba9ab9e79cfb3819ad0bbf 100644 --- a/api/funkwhale_api/music/filters.py +++ b/api/funkwhale_api/music/filters.py @@ -29,7 +29,11 @@ class ChannelFilterSet(filters.FilterSet): if not value: return queryset - channel = audio_models.Channel.objects.filter(uuid=value).first() + channel = ( + audio_models.Channel.objects.filter(uuid=value) + .select_related("library") + .first() + ) if not channel: return queryset.none() @@ -38,7 +42,7 @@ class ChannelFilterSet(filters.FilterSet): actor = utils.get_actor_from_request(self.request) uploads = uploads.playable_by(actor) ids = uploads.values_list(self.Meta.channel_filter_field, flat=True) - return queryset.filter(pk__in=ids) + return queryset.filter(pk__in=ids).distinct() class LibraryFilterSet(filters.FilterSet): diff --git a/api/funkwhale_api/music/utils.py b/api/funkwhale_api/music/utils.py index 599e4ae4d22f9c45f22f79206f089c4d395d65b2..14f245aaa4d8fca84ef2c6e04452990b9a2d64d3 100644 --- a/api/funkwhale_api/music/utils.py +++ b/api/funkwhale_api/music/utils.py @@ -38,6 +38,7 @@ def compute_status(jobs): AUDIO_EXTENSIONS_AND_MIMETYPE = [ # keep the most correct mimetype for each extension at the bottom + ("mp3", "audio/mp3"), ("mp3", "audio/mpeg3"), ("mp3", "audio/x-mp3"), ("mp3", "audio/mpeg"), diff --git a/front/src/views/channels/DetailEpisodes.vue b/front/src/views/channels/DetailEpisodes.vue index ab5920eb462ca520122d7f6f301c7e82120267ae..7535d7edf640b260ddf3f95ebda8cdd8a406ef61 100644 --- a/front/src/views/channels/DetailEpisodes.vue +++ b/front/src/views/channels/DetailEpisodes.vue @@ -1,6 +1,6 @@ <template> <section> - <channel-entries :limit="25" :filters="{channel: object.uuid, ordering: '-creation_date', playable: 'true'}"> + <channel-entries :limit="25" :filters="{channel: object.uuid, ordering: '-creation_date'}"> </channel-entries> </section> </template> diff --git a/front/src/views/channels/DetailOverview.vue b/front/src/views/channels/DetailOverview.vue index 9d35b1d1756ce817520abe1bbc93a7bca4e28623..8a739028afd5d1670a5183f39ec577ad0554356a 100644 --- a/front/src/views/channels/DetailOverview.vue +++ b/front/src/views/channels/DetailOverview.vue @@ -49,7 +49,7 @@ :can-update="false"></rendered-description> <div class="ui hidden divider"></div> </div> - <channel-entries :key="String(episodesKey) + 'entries'" :filters="{channel: object.uuid, ordering: '-creation_date', playable: 'true'}"> + <channel-entries :key="String(episodesKey) + 'entries'" :filters="{channel: object.uuid, ordering: '-creation_date'}"> <h2 class="ui header"> <translate translate-context="Content/Channel/Paragraph">Latest episodes</translate> </h2>