diff --git a/src/data/music.js b/src/data/music.js index ae9c94ed..6ab2069e 100644 --- a/src/data/music.js +++ b/src/data/music.js @@ -43,10 +43,6 @@ export default async function fetchMusicData() { monthArtists, monthAlbums, monthGenres, - threeMonthTracks, - threeMonthArtists, - threeMonthAlbums, - threeMonthGenres, ] = await Promise.all([ fetchDataFromView('recent_tracks'), fetchDataFromView('week_tracks'), @@ -57,10 +53,6 @@ export default async function fetchMusicData() { fetchDataFromView('month_artists'), fetchDataFromView('month_albums'), fetchDataFromView('month_genres'), - fetchDataFromView('three_month_tracks'), - fetchDataFromView('three_month_artists'), - fetchDataFromView('three_month_albums'), - fetchDataFromView('three_month_genres'), ]) return { @@ -83,15 +75,6 @@ export default async function fetchMusicData() { .reduce((acc, track) => acc + track.plays, 0) .toLocaleString('en-US'), }, - threeMonth: { - tracks: threeMonthTracks, - artists: threeMonthArtists, - albums: threeMonthAlbums, - genres: threeMonthGenres, - totalTracks: threeMonthTracks - .reduce((acc, track) => acc + track.plays, 0) - .toLocaleString('en-US'), - }, } } catch (error) { console.error('Error fetching and processing music data:', error) diff --git a/src/pages/dynamic/music/albums/3-months.html b/src/pages/dynamic/music/albums/3-months.html deleted file mode 100644 index adec2b1c..00000000 --- a/src/pages/dynamic/music/albums/3-months.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Albums / 3 months -description: All of the albums I've listened to over the last 3 months. -layout: default -pagination: - data: music.threeMonth.albums - size: 24 -permalink: "/music/albums/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.threeMonth.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.threeMonth.artists.size }} artists, {{ music.threeMonth.albums.size }} albums and {{ music.threeMonth.totalTracks }} tracks over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.

-

See the artists or tracks I've listened to over the last 3 months. Or take a look at what I've listened to this week or this month.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/albums/this-month.html b/src/pages/dynamic/music/albums/this-month.html deleted file mode 100644 index 055f90dc..00000000 --- a/src/pages/dynamic/music/albums/this-month.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Albums / This month -description: All of the albums I've listened to over the past month. -layout: default -pagination: - data: music.month.albums - size: 24 -permalink: "/music/albums/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.month.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.month.artists.size }} artists, {{ music.month.albums.size }} albums and {{ music.month.totalTracks }} tracks this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.

-

See the artists or tracks I've listened to this month. Or take a look at what I've listened to this week or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/albums/this-week.html b/src/pages/dynamic/music/albums/this-week.html deleted file mode 100644 index 182b34c4..00000000 --- a/src/pages/dynamic/music/albums/this-week.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Albums / This week -description: All of the albums I've listened to this week. -layout: default -pagination: - data: music.week.albums - size: 24 -permalink: "/music/albums/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.week.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.

-

See the artists or tracks I've listened to this week. Or take a look at what I've listened to this month or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/3-months.html b/src/pages/dynamic/music/artists/3-months.html deleted file mode 100644 index 8e1eb85e..00000000 --- a/src/pages/dynamic/music/artists/3-months.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Artists / 3 months -description: All of the artists I've listened to over the last 3 months. -layout: default -pagination: - data: music.threeMonth.artists - size: 24 -permalink: "/music/artists/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.threeMonth.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.threeMonth.artists.size }} artists, {{ music.threeMonth.albums.size }} albums and {{ music.threeMonth.totalTracks }} tracks over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.

-

See the albums or tracks I've listened to over the last 3 months. Or take a look at what I've listened to this week or this month.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/this-month.html b/src/pages/dynamic/music/artists/this-month.html deleted file mode 100644 index 4d5a0335..00000000 --- a/src/pages/dynamic/music/artists/this-month.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Artists / This month -description: All of the artists I've listened to over the past month. -layout: default -pagination: - data: music.month.artists - size: 24 -permalink: "/music/artists/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.month.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.month.artists.size }} artists, {{ music.month.albums.size }} albums and {{ music.month.totalTracks }} tracks this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.

-

See the albums or tracks I've listened to this month. Or take a look at what I've listened to this week or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/this-week.html b/src/pages/dynamic/music/artists/this-week.html deleted file mode 100644 index 584a9cba..00000000 --- a/src/pages/dynamic/music/artists/this-week.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Artists / This week -description: All of the artists I've listened to this week. -layout: default -pagination: - data: music.week.artists - size: 24 -permalink: "/music/artists/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.week.artists[0].grid.image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.

-

See the albums or tracks I've listened to this week. Or take a look at what I've listened to this month or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/genre.html b/src/pages/dynamic/music/genre.html deleted file mode 100644 index f47a893c..00000000 --- a/src/pages/dynamic/music/genre.html +++ /dev/null @@ -1,40 +0,0 @@ ---- -layout: default -pagination: - data: genres - size: 1 - alias: genre -permalink: "{{ genre.url }}/index.html" -updated: "now" -schema: genre ---- -{% assign artistCount = genre.artists.size %} -{%- capture connectingWords -%} - {% if artistCount > 1 %} - artists are - {% else %} - artist is - {% endif %} -{%- endcapture -%} -{%- assign mediaLinks = genre.artists | mediaLinks: "artist", 5 -%} - -{% tablericon "arrow-left" %} Back to music -

{{ genre.name }}

-
- {%- if mediaLinks -%} -

My top {{ genre.name }} {{ connectingWords }} {{ mediaLinks }}. I've listened to {{ genre.total_plays | formatNumber }} tracks form this genre.

-
- {%- endif -%} - {% render "partials/blocks/associated-media.liquid", posts:genre.posts %} - {% render "partials/blocks/associated-media.liquid", books:genre.books %} - {% render "partials/blocks/associated-media.liquid", movies:genre.movies %} - {%- if genre.description -%} -

Overview

-
- {{ genre.description | markdown }} -

Continue reading at Wikipedia.

-

Wikipedia content provided under the terms of the Creative Commons BY-SA license

-
- - {%- endif -%} -
\ No newline at end of file diff --git a/src/pages/dynamic/music/index.html b/src/pages/dynamic/music/index.html index e9bc0e67..4bb709fc 100644 --- a/src/pages/dynamic/music/index.html +++ b/src/pages/dynamic/music/index.html @@ -8,29 +8,22 @@ schema: music-index ---

{{ title }}

I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.

-

See more of the artists, albums or tracks I've listened to this week. Or take a look at what I've listened to this month or over the last 3 months.

-

You can also take a look at the concerts I've been to.

+

Take a look at what I've listened to this month or check out the concerts I've been to.

{% render "partials/blocks/now-playing.liquid", music:music %}

- - {% tablericon "microphone-2" %} - Artists - + {% tablericon "microphone-2" %} + Artists

{% render "partials/media/grid.liquid", globals:globals, data:music.week.artists, shape:"square", count: 8, loading: "eager" %}

- - {% tablericon "vinyl" %} - Albums - + {% tablericon "vinyl" %} + Albums

{% render "partials/media/grid.liquid", globals:globals, data:music.week.albums, shape:"square", count: 8 %}

- - {% tablericon "playlist" %} - Tracks - + {% tablericon "playlist" %} + Tracks

diff --git a/src/pages/dynamic/music/periods/3-months.html b/src/pages/dynamic/music/periods/3-months.html deleted file mode 100644 index 1b8c5595..00000000 --- a/src/pages/dynamic/music/periods/3-months.html +++ /dev/null @@ -1,35 +0,0 @@ ---- -title: 3 months -description: This is everything I've been listening to over the last 3 months — it's collected in a database as I listen to it and displayed here. -layout: default -permalink: "/music/three-months/index.html" -updated: "now" -image: music.threeMonth.artists[0].image -schema: music-period ---- -

{{ title }}

-

I've listened to {{ music.threeMonth.artists.size }} artists, {{ music.threeMonth.albums.size }} albums and {{ music.threeMonth.totalTracks }} tracks over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.

-

See more of the artists, albums or tracks I've listened to over the last 3 months. Or take a look at what I've listened to this week or this month.

-

You can also take a look at the concerts I've been to.

-
-

- - {% tablericon "microphone-2" %} - Artists - -

-{% render "partials/media/grid.liquid", globals:globals, data:music.threeMonth.artists, shape:"square", count: 8, loading: "eager" %} -

- - {% tablericon "vinyl" %} - Albums - -

-{% render "partials/media/grid.liquid", globals:globals, data:music.threeMonth.albums, shape:"square", count: 8 %} -

- - {% tablericon "playlist" %} - Tracks - -

-{% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, count: 10 %} \ No newline at end of file diff --git a/src/pages/dynamic/music/periods/this-month.html b/src/pages/dynamic/music/this-month.html similarity index 56% rename from src/pages/dynamic/music/periods/this-month.html rename to src/pages/dynamic/music/this-month.html index 5485dc8f..b5285aa8 100644 --- a/src/pages/dynamic/music/periods/this-month.html +++ b/src/pages/dynamic/music/this-month.html @@ -9,27 +9,20 @@ schema: music-period ---

{{ title }}

I've listened to {{ music.month.artists.size }} artists, {{ music.month.albums.size }} albums and {{ music.month.totalTracks }} tracks this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.

-

See more of the artists, albums or tracks I've listened to this month. Or take a look at what I've listened to this week or over the last 3 months.

-

You can also take a look at the concerts I've been to.

+

Take a look at what I've listened to this week or check out the concerts I've been to.

- - {% tablericon "microphone-2" %} - Artists - + {% tablericon "microphone-2" %} + Artists

{% render "partials/media/grid.liquid", globals:globals, data:music.month.artists, shape:"square", count: 8, loading: "eager" %}

- - {% tablericon "vinyl" %} - Albums - + {% tablericon "vinyl" %} + Albums

{% render "partials/media/grid.liquid", globals:globals, data:music.month.albums, shape:"square", count: 8 %}

- - {% tablericon "playlist" %} - Tracks - + {% tablericon "playlist" %} + Tracks

{% render "partials/media/music/chart.liquid", data:music.month.tracks, count: 10 %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/3-months.html b/src/pages/dynamic/music/tracks/3-months.html deleted file mode 100644 index 30666332..00000000 --- a/src/pages/dynamic/music/tracks/3-months.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Tracks / 3 months -description: All of the tracks I've listened to over the last 3 months. -layout: default -pagination: - data: music.threeMonth.tracks - size: 50 -permalink: "/music/tracks/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.threeMonth.artists[0].image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.threeMonth.artists.size }} artists, {{ music.threeMonth.albums.size }} albums and {{ music.threeMonth.totalTracks }} tracks over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.

-

See the artists or albums I've listened to over the last 3 months. Or take a look at what I've listened to this week or this month.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/music/chart.liquid" data:pagination.items, pagination:pagination %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/this-month.html b/src/pages/dynamic/music/tracks/this-month.html deleted file mode 100644 index 76bde75c..00000000 --- a/src/pages/dynamic/music/tracks/this-month.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Tracks / This month -description: All of the tracks I've listened to over the past month. -layout: default -pagination: - data: music.month.tracks - size: 50 -permalink: "/music/tracks/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.month.artists[0].image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.month.artists.size }} artists, {{ music.month.albums.size }} albums and {{ music.month.totalTracks }} tracks this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.

-

See the artists or albums this month. Or take a look at what I've listened to this week or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/music/chart.liquid" data:pagination.items, pagination:pagination %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/this-week.html b/src/pages/dynamic/music/tracks/this-week.html deleted file mode 100644 index 6532ba96..00000000 --- a/src/pages/dynamic/music/tracks/this-week.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Tracks / This week -description: All of the tracks I've listened to this week. -layout: default -pagination: - data: music.week.tracks - size: 50 -permalink: "/music/tracks/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.week.artists[0].image -schema: music ---- -{% tablericon "arrow-left" %} Back to music -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.

-

See the artists or albums I've listened to this week. Or take a look at what I've listened to this month or over the last 3 months.

-

You can also take a look at the concerts I've been to.

-
-{% endif %} -{% render "partials/media/music/chart.liquid" data:pagination.items, pagination:pagination %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/index.html b/src/pages/dynamic/watching/index.html index 2b6c309d..597160a1 100644 --- a/src/pages/dynamic/watching/index.html +++ b/src/pages/dynamic/watching/index.html @@ -13,17 +13,13 @@ schema: watching {% render "partials/blocks/banners/rss.liquid", url: "/feeds/movies", text: "Subscribe to my movies feed or follow along on this page" %}

- - {% tablericon "movie" %} - Recent movies - + {% tablericon "movie" %} + Recent movies

{% render "partials/media/grid.liquid", globals:globals, data:movies.recentlyWatched, shape:"vertical", count: 6 %}

- - {% tablericon "device-tv-old" %} - Recent shows - + {% tablericon "device-tv-old" %} + Recent shows

{% render "partials/media/grid.liquid", globals:globals, data:tv.recentlyWatched, shape:"vertical", count: 6 %}

diff --git a/src/pages/dynamic/watching/recent/movies.html b/src/pages/dynamic/watching/recent/movies.html deleted file mode 100644 index c27eeeae..00000000 --- a/src/pages/dynamic/watching/recent/movies.html +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Recent movies -description: These are the movies I've watched recently. There are many like them, but these are mine. -layout: default -pagination: - data: movies.recentlyWatched - size: 24 -permalink: "/watching/recent/movies/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -schema: watching ---- -{% tablericon "arrow-left" %} Back to watching -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

These are the movies I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/recent/shows.html b/src/pages/dynamic/watching/recent/shows.html deleted file mode 100644 index 7563b266..00000000 --- a/src/pages/dynamic/watching/recent/shows.html +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Recent shows -description: These are the shows I've watched recently. There are many like them, but these are mine. -layout: default -pagination: - data: tv.recentlyWatched - size: 24 -permalink: "/watching/recent/shows/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -schema: watching-shows ---- -{% tablericon "arrow-left" %} Back to watching -{% if pagination.pageNumber == 0 %} -

{{ title }}

-

These are the shows I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

-
-{% endif %} -{% render "partials/media/grid.liquid", globals:globals, data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/workers/dynamic-pages/index.js b/workers/dynamic-pages/index.js index 565a8edd..1dcc95ce 100644 --- a/workers/dynamic-pages/index.js +++ b/workers/dynamic-pages/index.js @@ -86,9 +86,9 @@ async function fetchGlobals(supabase) { function generateMetadata(data, type, globals) { let title = globals['site_name'] - let description = data.description || globals.site_description - const canonicalUrl = data.url ? `${globals.url}${data.url}` : globals.url - const ogImage = `${globals['cdn_url']}${data.image || globals.avatar}?class=w800` + let description = data['description'] || globals['site_description'] + const canonicalUrl = data['url'] ? `${globals['url']}${data['url']}` : globals['url'] + const ogImage = `${globals['cdn_url']}${data['image'] || globals['avatar']}?class=w800` description = convert(truncateHtml(md.render(description), 100, { byWords: true, @@ -140,14 +140,14 @@ function updateDynamicContent(html, metadata, mediaHtml) { const { document } = parseHTML(html) const titleTag = document.querySelector('title[data-dynamic="title"]') - if (titleTag) titleTag.textContent = metadata['title'] + if (titleTag) titleTag['textContent'] = metadata['title'] const dynamicMetaSelectors = [ - { selector: 'meta[data-dynamic="description"]', attribute: 'content', value: metadata.description }, + { selector: 'meta[data-dynamic="description"]', attribute: 'content', value: metadata['description'] }, { selector: 'meta[data-dynamic="og:title"]', attribute: 'content', value: metadata['og:title'] }, { selector: 'meta[data-dynamic="og:description"]', attribute: 'content', value: metadata['og:description'] }, { selector: 'meta[data-dynamic="og:image"]', attribute: 'content', value: metadata['og:image'] }, - { selector: 'meta[data-dynamic="og:url"]', attribute: 'content', value: metadata.canonical }, + { selector: 'meta[data-dynamic="og:url"]', attribute: 'content', value: metadata['canonical'] }, ] dynamicMetaSelectors.forEach(({ selector, attribute, value }) => { @@ -156,7 +156,7 @@ function updateDynamicContent(html, metadata, mediaHtml) { }) const canonicalLink = document.querySelector('link[rel="canonical"]') - if (canonicalLink) canonicalLink.setAttribute('href', metadata.canonical) + if (canonicalLink) canonicalLink.setAttribute('href', metadata['canonical']) const pageElement = document.querySelector('[data-dynamic="page"]') if (pageElement) pageElement.innerHTML = mediaHtml @@ -182,7 +182,7 @@ function generateAssociatedMediaHTML(data, isGenre = false) { data[key] && data[key].length ? `

${ICON_MAP[icon]} ${title}

- +
` : '' ) @@ -192,22 +192,22 @@ function generateAssociatedMediaHTML(data, isGenre = false) { function generateWatchingHTML(media, globals, type) { const isShow = type === 'show' const label = isShow ? 'show' : 'movie' - const lastWatched = media.last_watched || (isShow && media.episode?.last_watched_at) + const lastWatched = media['last_watched'] || (isShow && media['episode']?.['last_watched_at']) return ` ${ICON_MAP.arrowLeft} Back to watching
${media.title} / ${media.year}
-

${media.title} (${media.year})

- ${media.favorite ? `

${ICON_MAP.heart} This is one of my favorite ${label}s!

` : ''} - ${media.tattoo ? `

${ICON_MAP.needle} I have a tattoo inspired by this ${label}!

` : ''} - ${media.collected ? `

${ICON_MAP.circleCheck} This ${label} is in my collection!

` : ''} +

${media['title']} (${media['year']})

+ ${media['favorite'] ? `

${ICON_MAP['heart']} This is one of my favorite ${label}s!

` : ''} + ${media['tattoo'] ? `

${ICON_MAP['needle']} I have a tattoo inspired by this ${label}!

` : ''} + ${media['collected'] ? `

${ICON_MAP['circleCheck']} This ${label} is in my collection!

` : ''} ${lastWatched ? `

Last watched on ${formatDate(lastWatched)}

` : ''}
- ${media.review ? `${warningBanner}

My thoughts

${md.render(media.review)}

` : ''} + ${media['review'] ? `${warningBanner}

My thoughts

${md.render(media['review'])}

` : ''} ${generateAssociatedMediaHTML(media)} - ${media.description ? `

Overview

${md.render(media.description)}

` : ''} + ${media['description'] ? `

Overview

${md.render(media['description'])}

` : ''}
` } function generateConcertModal(concert) { - const venue = concert.venue_name - ? concert.venue_latitude && concert.venue_longitude - ? `${concert.venue_name_short}` - : concert.venue_name_short + const venue = concert['venue_name'] + ? concert['venue_latitude'] && concert['venue_longitude'] + ? `${concert['venue_name_short']}` + : concert['venue_name_short'] : '' - const notesModal = concert.notes - ? ` - + const notesModal = concert['notes'] + ? ` +
- +

Notes

- ${md.render(concert.notes)} + ${md.render(concert['notes'])}
` @@ -251,30 +251,30 @@ function generateConcertModal(concert) { return `
  • - ${formatDate(concert.date)} at ${venue} + ${formatDate(concert['date'])} at ${venue} ${notesModal}
    • ` } function generateArtistHTML(artist, globals) { - const playLabel = artist?.total_plays === 1 ? 'play' : 'plays' - const concertsList = artist.concerts?.length + const playLabel = artist?.['total_plays'] === 1 ? 'play' : 'plays' + const concertsList = artist['concerts']?.length ? `

    ${ICON_MAP['deviceSpeaker']} I've seen this artist live!

    - ` + ` : '' - const albumsTable = artist.albums?.length + const albumsTable = artist['albums']?.length ? ` - ${artist.albums.map(album => ` + ${artist['albums'].map(album => ` - - - + + + `).join('')}
    AlbumPlaysYear
    ${album.name}${album.total_plays || 0}${album.release_year}${album['name']}${album['total_plays'] || 0}${album['release_year']}

    These are the albums by this artist that are in my collection, not necessarily a comprehensive discography.

    @@ -287,32 +287,32 @@ function generateArtistHTML(artist, globals) {
    ${artist.name} / ${artist.country}
    -

    ${artist.name}

    -

    ${ICON_MAP['mapPin']} ${parseCountryField(artist.country)}

    - ${artist.favorite ? `

    ${ICON_MAP['heart']} This is one of my favorite artists!

    ` : ''} - ${artist.tattoo ? `

    ${ICON_MAP['needle']} I have a tattoo inspired by this artist!

    ` : ''} - ${artist.total_plays ? `

    ${artist.total_plays} ${playLabel}

    ` : ''} -

    ${artist.genre ? `${artist.genre.name}` : ''}

    +

    ${artist['name']}

    +

    ${ICON_MAP['mapPin']} ${parseCountryField(artist['country'])}

    + ${artist['favorite'] ? `

    ${ICON_MAP['heart']} This is one of my favorite artists!

    ` : ''} + ${artist['tattoo'] ? `

    ${ICON_MAP['needle']} I have a tattoo inspired by this artist!

    ` : ''} + ${artist['total_plays'] ? `

    ${artist['total_plays']} ${playLabel}

    ` : ''} +

    ${artist['genre'] ? `${artist['genre']['name']}` : ''}

    - ${artist.description ? ` + ${artist['description'] ? `

    Overview

    -
    ${md.render(artist.description)}
    +
    ${md.render(artist['description'])}
    ` : '' } ${concertsList} @@ -351,40 +351,40 @@ function generateBookHTML(book, globals) { height="307" />
    -

    ${book.title}

    - ${book.rating ? `

    ${book.rating}

    ` : ''} - ${book.author ? `

    By ${book.author}

    ` : ''} - ${book.favorite ? `

    ${ICON_MAP.heart} This is one of my favorite books!

    ` : ''} - ${book.tattoo ? `

    ${ICON_MAP.needle} I have a tattoo inspired by this book!

    ` : ''} +

    ${book['title']}

    + ${book['rating'] ? `

    ${book['rating']}

    ` : ''} + ${book['author'] ? `

    By ${book['author']}

    ` : ''} + ${book['favorite'] ? `

    ${ICON_MAP['heart']} This is one of my favorite books!

    ` : ''} + ${book['tattoo'] ? `

    ${ICON_MAP['needle']} I have a tattoo inspired by this book!

    ` : ''} ${status ? `

    ${status}

    ` : ''}
    - ${book.review ? `${warningBanner}

    My thoughts

    ${book.review}

    ` : ''} + ${book['review'] ? `${warningBanner}

    My thoughts

    ${book['review']}

    ` : ''} ${generateAssociatedMediaHTML(book)}

    Overview

    -

    ${md.render(book.description)}

    +

    ${md.render(book['description'])}

    ` } function generateGenreHTML(genre) { - const artistCount = genre.artists?.length || 0 + const artistCount = genre['artists']?.length || 0 const connectingWords = artistCount > 1 ? 'artists are' : 'artist is' - const mediaLinks = generateMediaLinks(genre.artists, 'artist', 5) + const mediaLinks = generateMediaLinks(genre['artists'], 'artist', 5) return ` - ${ICON_MAP.arrowLeft} Back to music -

    ${genre.name}

    + ${ICON_MAP['arrowLeft']} Back to music +

    ${genre['name']}

    ${mediaLinks ? ` -

    My top ${genre.name} ${connectingWords} ${mediaLinks}. I've listened to ${genre.total_plays} tracks from this genre.

    +

    My top ${genre['name']} ${connectingWords} ${mediaLinks}. I've listened to ${genre['total_plays']} tracks from this genre.

    ` : ''} ${generateAssociatedMediaHTML(genre, true)} - ${genre.description ? ` + ${genre['description'] ? `

    Overview

    - ${md.render(genre.description)} -

    Continue reading at Wikipedia.

    + ${md.render(genre['description'])} +

    Continue reading at Wikipedia.

    Wikipedia content provided under the terms of the Creative Commons BY-SA license.

    ` : ''}