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

fix(front): replace artist.attachment_cover with cover

This commit is contained in:
ArneBo 2025-02-21 10:33:58 +01:00
parent 19206d696e
commit 8ac7503654
15 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/components/Queue.vue
View File

@ -305,8 +305,8 @@ if (!isWebGLSupported) {
@click.stop.prevent=""
>
<Pill>
<template #image v-if="ac.artist.attachment_cover">
<img v-lazy="ac.artist.attachment_cover?.urls.medium_square_crop">
<template #image v-if="ac.artist.cover">
<img v-lazy="ac.artist.cover?.urls.medium_square_crop">
</template>
{{ ac.credit ?? t('components.Queue.meta.unknownArtist') }}
</Pill>

2
front/src/components/artist/Card.vue
View File

@ -22,7 +22,7 @@ const props = defineProps<Props>()
const { artist } = props
const cover = computed(() => {
const artistCover = artist.attachment_cover ?? undefined
const artistCover = artist.cover ?? undefined
const albumCover = albums.value?.find(
(album: Album) => album.cover?.urls

4
front/src/components/audio/ArtistCreditLabel.vue
View File

@ -32,8 +32,8 @@ const getRoute = (ac: ArtistCredit) => {
:to="getRoute(ac)"
>
<img
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)"
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)"
alt=""
:class="[{circular: ac.artist.content_category != 'podcast'}]"
>

4
front/src/components/audio/ArtistLabel.vue
View File

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

4
front/src/components/audio/artist/Card.vue
View File

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

2
front/src/components/audio/podcast/MobileRow.vue
View File

@ -86,7 +86,7 @@ const actionsButtonLabel = computed(() => t('components.audio.podcast.MobileRow.
class="ui artist-track mini image"
>
<img
v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.cover"
v-lazy="getArtistCoverUrl(track.artist_credit)"
alt=""
class="ui artist-track mini image"

2
front/src/components/audio/podcast/Modal.vue
View File

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

2
front/src/components/audio/podcast/Row.vue
View File

@ -97,7 +97,7 @@ await fetchData()
class="ui artist-track mini image"
>
<img
v-else-if="track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
v-else-if="track.artist_credit.length && track.artist_credit[0].artist.cover"
v-lazy="getArtistCoverUrl(track.artist_credit)"
alt=""
class="ui artist-track mini image"

2
front/src/components/audio/track/Modal.vue
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.attachment_cover"
v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.cover"
v-lazy="getArtistCoverUrl(track.artist_credit)"
alt=""
class="ui centered image"

4
front/src/components/audio/track/Row.vue
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.attachment_cover?.urls.original"
v-lazy="store.getters['instance/absoluteUrl'](track.artist_credit[0].artist.attachment_cover.urls.medium_square_crop) "
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) "
alt=""
class="ui artist-track mini image"
>

4
front/src/components/library/AlbumBase.vue
View File

@ -164,10 +164,10 @@ const remove = async () => {
class="channel-image"
/>
<img
v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.attachment_cover"
v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.cover"
:alt="object.artist_credit[0].artist.name"
class="channel-image"
v-lazy="object.artist_credit[0].artist.attachment_cover.urls.large_square_crop"
v-lazy="object.artist_credit[0].artist.cover.urls.large_square_crop"
/>
<img
v-else

2
front/src/components/library/ArtistBase.vue
View File

@ -58,7 +58,7 @@ const publicLibraries = computed(() => libraries.value?.filter(library => librar
const cover = computed(() => {
const artistCover: Cover | undefined = object.value?.attachment_cover
const artistCover: Cover | undefined = object.value?.cover
const albumCover: Cover | undefined = object.value?.albums
.find(album => album.cover?.urls.large_square_crop)?.cover

2
front/src/composables/audio/queue.ts
View File

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

1
front/src/composables/moderation/useEditConfigs.ts
View File

@ -79,6 +79,7 @@ export default (): Configs => {
description,
{
id: 'release_date',
// TODO: Change type to date and offer date select input in form
type: 'text',
required: false,
label: t('composables.moderation.useEditConfigs.album.releaseDate'),

4
front/src/utils/utils.ts
View File

@ -41,8 +41,8 @@ export function getArtistCoverUrl (artistCredits: ArtistCredit[]): string | unde
const getSimpleArtistCover = ( artist: SimpleArtist ) =>
( field: 'original' | 'small_square_crop' | 'medium_square_crop' | 'large_square_crop' ) =>
artist.attachment_cover ?
( field in artist.attachment_cover ? artist.attachment_cover.urls[field] : null )
artist.cover ?
( field in artist.cover ? artist.cover.urls[field] : null )
: null
/** Returns the absolute Url of this artist's cover on this instance