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

Fix #1059: fixed some broken RSS feeds

This commit is contained in:
Eliot Berriot 2020-04-01 16:21:41 +02:00
parent 02f5e9f531
commit 133e2e4f07
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,11 @@ class ChannelFilterSet(filters.FilterSet):
if not value: if not value:
return queryset 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: if not channel:
return queryset.none() return queryset.none()
@ -38,7 +42,7 @@ class ChannelFilterSet(filters.FilterSet):
actor = utils.get_actor_from_request(self.request) actor = utils.get_actor_from_request(self.request)
uploads = uploads.playable_by(actor) uploads = uploads.playable_by(actor)
ids = uploads.values_list(self.Meta.channel_filter_field, flat=True) 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): class LibraryFilterSet(filters.FilterSet):

1
api/funkwhale_api/music/utils.py
View File

@ -38,6 +38,7 @@ def compute_status(jobs):
AUDIO_EXTENSIONS_AND_MIMETYPE = [ AUDIO_EXTENSIONS_AND_MIMETYPE = [
# keep the most correct mimetype for each extension at the bottom # keep the most correct mimetype for each extension at the bottom
("mp3", "audio/mp3"),
("mp3", "audio/mpeg3"), ("mp3", "audio/mpeg3"),
("mp3", "audio/x-mp3"), ("mp3", "audio/x-mp3"),
("mp3", "audio/mpeg"), ("mp3", "audio/mpeg"),

2
front/src/views/channels/DetailEpisodes.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section> <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> </channel-entries>
</section> </section>
</template> </template>

2
front/src/views/channels/DetailOverview.vue
View File

@ -49,7 +49,7 @@
:can-update="false"></rendered-description> :can-update="false"></rendered-description>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
</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"> <h2 class="ui header">
<translate translate-context="Content/Channel/Paragraph">Latest episodes</translate> <translate translate-context="Content/Channel/Paragraph">Latest episodes</translate>
</h2> </h2>