From c60bc93930514bde133e8dfb9edf8a5d29194f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <ciaranainsworth@outlook.com>
Date: Wed, 19 May 2021 12:59:14 +0000
Subject: [PATCH] Fix recently listened widget and simple artist serializer
(cherry picked from commit 071ff89a4f52d31090a4a23603a66356e1e47c0c)
---
api/funkwhale_api/history/views.py | 4 +++-
front/src/components/audio/track/Widget.vue | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/api/funkwhale_api/history/views.py b/api/funkwhale_api/history/views.py
index a14917fc1b..0a79927568 100644
--- a/api/funkwhale_api/history/views.py
+++ b/api/funkwhale_api/history/views.py
@@ -56,7 +56,9 @@ class ListeningViewSet(
)
tracks = Track.objects.with_playable_uploads(
music_utils.get_actor_from_request(self.request)
- ).select_related("artist", "album__artist", "attributed_to")
+ ).select_related(
+ "artist", "album__artist", "attributed_to", "artist__attachment_cover"
+ )
return queryset.prefetch_related(Prefetch("track", queryset=tracks))
def get_serializer_context(self):
diff --git a/front/src/components/audio/track/Widget.vue b/front/src/components/audio/track/Widget.vue
index 4092d054d5..68d6988a9a 100644
--- a/front/src/components/audio/track/Widget.vue
+++ b/front/src/components/audio/track/Widget.vue
@@ -8,6 +8,8 @@
<div :class="['item', itemClasses]" v-for="object in objects" :key="object.id">
<div class="ui tiny image">
<img alt="" v-if="object.track.album && object.track.album.cover" v-lazy="$store.getters['instance/absoluteUrl'](object.track.album.cover.urls.medium_square_crop)">
+ <img alt="" v-else-if="object.track.cover" v-lazy="$store.getters['instance/absoluteUrl'](object.track.cover.urls.medium_square_crop)"/>
+ <img alt="" v-else-if="object.track.artist.cover" v-lazy="$store.getters['instance/absoluteUrl'](object.track.artist.cover.urls.medium_square_crop)"/>
<img alt="" v-else src="../../../assets/audio/default-cover.png">
<play-button class="play-overlay" :icon-only="true" :button-classes="['ui', 'circular', 'tiny', 'vibrant', 'icon', 'button']" :track="object.track"></play-button>
</div>
--
GitLab