From dbe5599cd0b473735424c05a9d1e82f3e0e4334f Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 26 May 2024 15:30:01 -0700 Subject: [PATCH] fix: sort + og --- config/filters/index.js | 3 ++- src/_includes/base.liquid | 7 +++++++ src/pages/main/music/albums/3-months.html | 2 +- src/pages/main/music/albums/all-time.html | 2 +- src/pages/main/music/albums/this-month.html | 2 +- src/pages/main/music/albums/this-week.html | 2 +- src/pages/main/music/artists/3-months.html | 2 +- src/pages/main/music/artists/all-time.html | 2 +- src/pages/main/music/artists/this-month.html | 2 +- src/pages/main/music/artists/this-week.html | 2 +- src/pages/main/music/genre.html | 2 +- src/pages/main/music/index.html | 2 +- 12 files changed, 19 insertions(+), 11 deletions(-) diff --git a/config/filters/index.js b/config/filters/index.js index 7ae8f105..e41ae127 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -32,6 +32,7 @@ export default { }) }, formatNumber: (number) => number.toLocaleString('en-US'), + shuffleArray, // navigation isLinkActive: (category, page) => { @@ -249,7 +250,7 @@ export default { }).length }, getLastWatched: (show) => show?.['episodes'][show['episodes']?.length - 1]?.['last_watched_at'], - sortByPlaysDescending: (data) => data.sort((a, b) => (b['total_plays'] || b['plays']) - (a['total_plays'] || a['plays'])), + sortByPlaysDescending: (data, key) => data.sort((a, b) => b[key] - a[key]), genreStrings: (genres, key) => genres.map(genre => genre[key]), mediaLinks: (data, type, count = 10) => { const dataSlice = data.slice(0, count) diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index c8e8b15d..a5373ebd 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -12,6 +12,8 @@ Movies • {{ movie.title }}{% if movie.rating %} ({{ movie.rating }}){% endif %} • {{ meta.siteName }} {% elsif show.title %} Shows • {{ show.title }} • {{ meta.siteName }} + {% elsif genre.title %} + Music • {{ genre.title }} • {{ meta.siteName }} {% else %} {{ meta.siteName }} {%- endif -%} @@ -27,6 +29,8 @@ {% if movie.review %}{{ movie.review | truncate: 300 }}{% else %}{{ movie.description }}{% endif %} {% elsif show.description %} {% if show.review %}{{ show.review | truncate: 300 }}{% else %}{{ show.description }}{% endif %} + {% elsif genre.description %} + {{ genre.description | markdown | strip_html | truncate: 300 }} {% elsif description %} {{ description }} {% else %} @@ -52,6 +56,9 @@ {{ movie.backdrop }} {%- elsif schema == 'show' -%} {{ meta.url }}/media/shows/backdrops/backdrop-{{ show.tmdb_id }}.jpg + {%- elsif schema == 'genre' -%} + {%- assign genreArtist = genre.artists | shuffleArray | first -%} + {{ genreArtist.image }} {%- else -%} {{ meta.meta_data.opengraph_default }} {%- endif -%} diff --git a/src/pages/main/music/albums/3-months.html b/src/pages/main/music/albums/3-months.html index 98094fd5..7b46a8eb 100644 --- a/src/pages/main/music/albums/3-months.html +++ b/src/pages/main/music/albums/3-months.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.threeMonth.albums.size }} albums over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.threeMonth.albums.size }} albums over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my artists or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/all-time.html b/src/pages/main/music/albums/all-time.html index 9f81067f..00e68776 100644 --- a/src/pages/main/music/albums/all-time.html +++ b/src/pages/main/music/albums/all-time.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.allTime.albums.size }} albums and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.allTime.albums.size }} albums and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my artists or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/this-month.html b/src/pages/main/music/albums/this-month.html index a188d537..fc31b440 100644 --- a/src/pages/main/music/albums/this-month.html +++ b/src/pages/main/music/albums/this-month.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.month.albums.size }} albums this month and most of what I've listened to has been {{ music.month.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.month.albums.size }} albums this month and most of what I've listened to has been {{ music.month.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my artists or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/this-week.html b/src/pages/main/music/albums/this-week.html index 7050b2d2..6a19cfe7 100644 --- a/src/pages/main/music/albums/this-week.html +++ b/src/pages/main/music/albums/this-week.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.week.albums.size }} albums this week and most of what I've listened to has been {{ music.week.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.week.albums.size }} albums this week and most of what I've listened to has been {{ music.week.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my artists or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/3-months.html b/src/pages/main/music/artists/3-months.html index 3cf846d4..45c0f176 100644 --- a/src/pages/main/music/artists/3-months.html +++ b/src/pages/main/music/artists/3-months.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.threeMonth.artists.size }} artists over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.threeMonth.artists.size }} artists over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my albums or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/all-time.html b/src/pages/main/music/artists/all-time.html index 1c5a9f2a..43439a22 100644 --- a/src/pages/main/music/artists/all-time.html +++ b/src/pages/main/music/artists/all-time.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.allTime.artists.size }} artists and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.allTime.artists.size }} artists and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my albums or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/this-month.html b/src/pages/main/music/artists/this-month.html index 012839ce..3836631e 100644 --- a/src/pages/main/music/artists/this-month.html +++ b/src/pages/main/music/artists/this-month.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.month.artists.size }} artists this month and most of what I've listened to has been {{ music.month.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.month.artists.size }} artists this month and most of what I've listened to has been {{ music.month.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my albums or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/this-week.html b/src/pages/main/music/artists/this-week.html index 2befdca2..a8638407 100644 --- a/src/pages/main/music/artists/this-week.html +++ b/src/pages/main/music/artists/this-week.html @@ -10,6 +10,6 @@ schema: music --- {% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

-

I've listened to {{ music.week.artists.size }} artists this week and most of what I've listened to has been {{ music.week.genres | sortByPlaysDescending | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

I've listened to {{ music.week.artists.size }} artists this week and most of what I've listened to has been {{ music.week.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See my albums or tracks for this period.

{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/genre.html b/src/pages/main/music/genre.html index b62a5104..0e2456a9 100644 --- a/src/pages/main/music/genre.html +++ b/src/pages/main/music/genre.html @@ -24,7 +24,7 @@ schema: genre {% tablericon "arrow-left" "Go back" %} Go back

{{ genre.name }}

-

My top {{ genre.name }} artists {{ connectingWord }} {{ genre.artists | sortByPlaysDescending | mediaLinks: "artist", 5 }}. I've listened to {{ genre.total_plays | formatNumber }} tracks form this genre.

+

My top {{ genre.name }} artists {{ connectingWord }} {{ genre.artists | sortByPlaysDescending: "total_plays" | mediaLinks: "artist", 5 }}. I've listened to {{ genre.total_plays | formatNumber }} tracks form this genre.

{%- if genre.description -%}
diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index 89b54e83..114bd2ba 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -11,7 +11,7 @@ schema: music

{{ title }}

This is everything I've been listening to recently — it's collected in a database as I listen to it and displayed here. You can read more about the technical details, if you'd like.

-

I mostly listen to {{ genres | sortByPlaysDescending | genreStrings: "name" | mediaLinks: "genre", 5 }}. This week I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks.

+

I mostly listen to {{ genres | sortByPlaysDescending: "total_plays" | genreStrings: "name" | mediaLinks: "genre", 5 }}. This week I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks.

{% render "partials/widgets/now-playing.liquid" %} {% render "partials/banners/rss.liquid", url: "https://feedpress.me/coryd-artist-charts", text: "I also have a feed of weekly artist charts I generate from this data" %}