From 3bbeea69c6356edd5792ac7898b9623c2e1519de Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 5 Mar 2022 21:34:59 -0400
Subject: non-jpg full res art links, artist avatars

---
 src/page/album.js  | 13 +++++++------
 src/page/artist.js |  9 +++++----
 src/page/track.js  |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/page')

diff --git a/src/page/album.js b/src/page/album.js
index 6478cce2..d7447a4c 100644
--- a/src/page/album.js
+++ b/src/page/album.js
@@ -74,10 +74,10 @@ export function write(album, {wikiData}) {
             duration: albumDuration,
             color: album.color,
             cover: serializeCover(album, getAlbumCover),
-            artistContribs: serializeContribs(album.artistContribs || []),
-            coverArtistContribs: serializeContribs(album.coverArtistContribs || []),
-            wallpaperArtistContribs: serializeContribs(album.wallpaperArtistContribs || []),
-            bannerArtistContribs: serializeContribs(album.bannerArtistContribs || []),
+            artistContribs: serializeContribs(album.artistContribs),
+            coverArtistContribs: serializeContribs(album.coverArtistContribs),
+            wallpaperArtistContribs: serializeContribs(album.wallpaperArtistContribs),
+            bannerArtistContribs: serializeContribs(album.bannerArtistContribs),
             groups: serializeGroupsForAlbum(album),
             trackGroups: album.trackGroups?.map(trackGroup => ({
                 name: trackGroup.name,
@@ -98,6 +98,7 @@ export function write(album, {wikiData}) {
             fancifyURL,
             generateChronologyLinks,
             generateCoverLink,
+            getAlbumCover,
             getAlbumStylesheet,
             getArtistString,
             getLinkThemeString,
@@ -120,7 +121,7 @@ export function write(album, {wikiData}) {
                     `--album-directory: ${album.directory}`
                 ]),
 
-                banner: album.bannerArtistContribs && {
+                banner: album.bannerArtistContribs.length && {
                     dimensions: album.bannerDimensions,
                     path: ['media.albumBanner', album.directory, album.bannerFileExtension],
                     alt: strings('misc.alt.albumBanner'),
@@ -130,7 +131,7 @@ export function write(album, {wikiData}) {
                 main: {
                     content: fixWS`
                         ${generateCoverLink({
-                            path: ['media.albumCover', album.directory],
+                            src: getAlbumCover(album),
                             alt: strings('misc.alt.albumCover'),
                             tags: album.artTags
                         })}
diff --git a/src/page/artist.js b/src/page/artist.js
index 6a465604..dae0e198 100644
--- a/src/page/artist.js
+++ b/src/page/artist.js
@@ -272,6 +272,7 @@ export function write(artist, {wikiData}) {
             fancifyURL,
             generateCoverLink,
             generateInfoGalleryLinks,
+            getArtistAvatar,
             getArtistString,
             link,
             strings,
@@ -290,7 +291,7 @@ export function write(artist, {wikiData}) {
                 main: {
                     content: fixWS`
                         ${artist.hasAvatar && generateCoverLink({
-                            path: ['localized.artistAvatar', artist.directory],
+                            src: getArtistAvatar(artist),
                             alt: strings('misc.alt.artistAvatar')
                         })}
                         <h1>${strings('artistPage.title', {artist: name})}</h1>
@@ -369,9 +370,9 @@ export function write(artist, {wikiData}) {
                                                         track: link.track(track)
                                                     })
                                                     : `<i>${strings('artistPage.creditList.entry.album.' + {
-                                                        wallpaperArtists: 'wallpaperArt',
-                                                        bannerArtists: 'bannerArt',
-                                                        coverArtists: 'coverArt'
+                                                        wallpaperArtistContribs: 'wallpaperArt',
+                                                        bannerArtistContribs: 'bannerArt',
+                                                        coverArtistContribs: 'coverArt'
                                                     }[key])}</i>`),
                                                 ...props
                                             }))
diff --git a/src/page/track.js b/src/page/track.js
index 264195da..9a3307b4 100644
--- a/src/page/track.js
+++ b/src/page/track.js
@@ -149,7 +149,7 @@ export function write(track, {wikiData}) {
 
                 // disabled for now! shifting banner position per height of page is disorienting
                 /*
-                banner: album.bannerArtistContribs && {
+                banner: album.bannerArtistContribs.length && {
                     classes: ['dim'],
                     dimensions: album.bannerDimensions,
                     path: ['media.albumBanner', album.directory, album.bannerFileExtension],
-- 
cgit 1.3.0-6-gf8a5