refactor(front): change artist cover to correct type

This commit is contained in:
ArneBo 2025-02-14 02:32:35 +01:00
parent a1a58eb767
commit 7c094c83a2
9 changed files with 48 additions and 57 deletions

View File

@ -1,16 +1,12 @@
<script setup lang="ts">
import { useRouter } from 'vue-router'
import { computed, ref } from 'vue'
import { useStore } from '~/store'
import { useI18n } from 'vue-i18n'
import PlayButton from '~/components/audio/PlayButton.vue'
import Card from '~/components/ui/Card.vue'
import Spacer from '~/components/ui/Spacer.vue'
import type { Artist, Cover, Track } from '~/types'
const play = defineEmit<[artist: Artist]>()
import type { Artist, Cover, Track, Album } from '~/types'
const albums = ref([] as Album[])
const tracks = ref([] as Track[])
@ -25,42 +21,27 @@ const props = defineProps<Props>()
const { artist } = props
let navigate = () => {}
const cover = computed(() => {
const artistCover = artist.attachment_cover ?? undefined
if (import.meta.env.PROD) {
const router = useRouter()
navigate = () =>
router.push({ name: 'library.artists.detail', params: { id: artist.id } })
}
const albumCover = albums.value?.find(
(album: Album) => album.cover?.urls.medium_square_crop
)?.cover
const store = useStore()
const trackCover = tracks.value?.find(
(track: Track) => track.cover
)?.cover
const cover = computed(() => {
const artistCover: Cover | undefined = artist.cover
const albumCover: Cover | undefined = artist.albums
.find(album => album.cover?.urls.medium_square_crop)?.cover
const trackCover: Cover | undefined =
tracks.value?.find(
track => track.cover
)
?.cover
const fallback : Cover = {
uuid: '',
urls: {
original: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`,
medium_square_crop: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`,
large_square_crop: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`
}
const fallback: Cover = {
uuid: '',
urls: {
original: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`,
medium_square_crop: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`,
large_square_crop: `${import.meta.env.BASE_URL}embed-default-cover.jpeg`
}
}
return artistCover
|| albumCover
|| trackCover
|| fallback
return artistCover || albumCover || trackCover || fallback
})
</script>
@ -76,7 +57,7 @@ const cover = computed(() => {
<template #topright>
<PlayButton
icon-only
:is-playable="artist.is_playable"
:is-playable="Boolean(albums.find(album => album.is_playable))"
:artist="artist"
/>
</template>
@ -99,7 +80,7 @@ const cover = computed(() => {
<Spacer style="flex-grow: 1" />
<PlayButton
:dropdown-only="true"
:is-playable="artist.is_playable"
:is-playable="Boolean(albums.find(album => album.is_playable))"
:artist="artist"
discrete
/>

View File

@ -32,8 +32,8 @@ const getRoute = (ac: ArtistCredit) => {
:to="getRoute(ac)"
>
<img
v-if="ac.index === 0 && ac.artist.cover && ac.artist.cover.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](ac.artist.cover.urls.medium_square_crop)"
v-if="ac.index === 0 && ac.artist.attachment_cover && ac.artist.attachment_cover.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](ac.artist.attachment_cover.urls.medium_square_crop)"
alt=""
:class="[{circular: ac.artist.content_category != 'podcast'}]"
>

View File

@ -24,8 +24,8 @@ const route = computed(() => props.artist.channel
:to="route"
>
<img
v-if="artist.cover && artist.cover.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](artist.cover.urls.medium_square_crop)"
v-if="artist.attachment_cover && artist.attachment_cover.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](artist.attachment_cover.urls.medium_square_crop)"
alt=""
:class="[{circular: artist.content_category != 'podcast'}]"
>

View File

@ -17,9 +17,9 @@ const { t } = useI18n()
const props = defineProps<Props>()
const cover = computed(() => !props.artist.cover?.urls.original
const cover = computed(() => !props.artist.attachment_cover?.urls.original
? props.artist.albums.find(album => !!album.cover?.urls.original)?.cover
: props.artist.cover
: props.artist.attachment_cover
)
const store = useStore()

View File

@ -114,7 +114,7 @@ const labels = computed(() => ({
class="ui centered image"
>
<img
v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.cover"
v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
v-lazy="getArtistCoverUrl(track.artist_credit)"
alt=""
class="ui centered image"

View File

@ -139,8 +139,8 @@ const hover = ref(false)
class="ui artist-track mini image"
>
<img
v-else-if="showArt && track.artist_credit?.length && track.artist_credit[0].artist.cover?.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](track.artist_credit[0].artist.cover.urls.medium_square_crop) "
v-else-if="showArt && track.artist_credit?.length && track.artist_credit[0].artist.attachment_cover?.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](track.artist_credit[0].artist.attachment_cover.urls.medium_square_crop) "
alt=""
class="ui artist-track mini image"
>

View File

@ -165,10 +165,10 @@ const remove = async () => {
class="channel-image"
>
<img
v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.cover"
v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.attachment_cover"
alt=""
class="channel-image"
:src="object.artist_credit[0].artist.cover.urls.large_square_crop"
v-lazy="object.artist_credit[0].artist.attachment_cover.urls.large_square_crop"
/>
<img
v-else
@ -177,9 +177,10 @@ const remove = async () => {
src="../../assets/audio/default-cover.png"
>
<!-- ({target}) => target -->
<!-- Header (TODO: Put into Header component) -->
<!-- Header (TODO: Put into Header component) Hint: Header is heavier fontweight than h1! -->
<Layout stack style="flex: 1; gap: 8px;">
<h1>{{ object.title }}</h1>
<Header :h1="object.title" />
<artist-credit-label
v-if="artistCredit"
:artist-credit="artistCredit"
@ -232,6 +233,17 @@ const remove = async () => {
>
{{ labels.shuffle }}
</Button>
<DangerousButton
v-if="artistCredit[0] &&
store.state.auth.authenticated &&
artistCredit[0].artist.channel &&
artistCredit[0].artist.attributed_to?.full_username === store.state.auth.fullUsername"
:is-loading="isLoading"
@confirm="remove()"
icon="bi-trash"
>
{{ t('components.library.AlbumDropdown.button.delete') }}
</DangerousButton>
<Spacer h grow />
<TrackFavoriteIcon v-if="store.state.auth.authenticated" :album="object" />
<TrackPlaylistIcon v-if="store.state.auth.authenticated" :album="object" />

View File

@ -59,16 +59,14 @@ const publicLibraries = computed(() => libraries.value?.filter(library => librar
const cover = computed(() => {
const artistCover: Cover | undefined = object.value?.cover
const artistCover: Cover | undefined = object.value?.attachment_cover
const albumCover: Cover | undefined = object.value?.albums
.find(album => album.cover?.urls.large_square_crop)?.cover
const trackCover: Cover | undefined =
tracks.value?.find(
track => track.cover
)
?.cover
const trackCover = tracks.value?.find(
(track: Track) => track.cover
)?.cover
const fallback : Cover = {
uuid: '',

View File

@ -125,7 +125,7 @@ export const useQueue = createGlobalState(() => {
coverUrl: (
(track.cover?.urls)
|| (track.album?.cover?.urls)
|| ((track.artist_credit && track.artist_credit[0] && track.artist_credit[0].artist && track.artist_credit[0].artist.cover?.urls))
|| ((track.artist_credit && track.artist_credit[0] && track.artist_credit[0].artist && track.artist_credit[0].artist.attachment_cover?.urls))
|| {}
)?.original ?? new URL('../../assets/audio/default-cover.png', import.meta.url).href,
sources: track.uploads.map(upload => ({