feat: dry up + normalize now page

config/mediaFilters.js

@@ -1,18 +1,25 @@
-const ALBUM_DENYLIST = ['no-love-deep-web', 'unremittance']
-
 module.exports = {
-  artist: (media) =>
-    `https://cdn.coryd.dev/artists/${media.replace(/\s+/g, '-').toLowerCase()}.jpg` ||
-    'https://cdn.coryd.dev/artists/missing-artist.jpg',
-  album: (media) => {
-    return !ALBUM_DENYLIST.includes(media.name.replace(/\s+/g, '-').toLowerCase())
-      ? media.replace('https://lastfm.freetls.fastly.net', 'https://albums.coryd.dev')
-      : `https://cdn.coryd.dev/albums/${media.name.replace(/\s+/g, '-').toLowerCase()}.jpg`
-  },
-  tv: (episode) =>
-    `https://cdn.coryd.dev/tv/${episode.replace(':', '').replace(/\s+/g, '-').toLowerCase()}.jpg` ||
-    'https://cdn.coryd.dev/tv/missing-tv.jpg',
-  cdn: (url, host, cdn) => {
-    return url.replace(host, cdn)
-  },
+  normalizeMedia: (media) =>
+    media.map((item) => {
+      let normalized = {
+        image: item['image'],
+        url: item['url'],
+      }
+      if (item.type === 'album') {
+        normalized['title'] = item['title']
+        normalized['alt'] = `${item['title']} by ${item['artist']}`
+        normalized['subtext'] = item['artist']
+      }
+      if (item.type === 'artist') {
+        normalized['title'] = item['title']
+        normalized['subtext'] = `${item['plays']} plays`
+      }
+      if (item.type === 'book') normalized['alt'] = item['title']
+      if (item.type === 'movie') normalized['title'] = item['title']
+      if (item.type === 'tv') {
+        normalized['title'] = item['title']
+        normalized['subtext'] = `${item.name} • <strong>${item.episode}</strong>`
+      }
+      return normalized
+    }),
 }

src/_data/albums.js

@@ -11,7 +11,7 @@ module.exports = async function () {
   const data = await res
   return data['topalbums'].album.map((album) => {
     return {
-      name: album['name'],
+      title: album['name'],
       artist: album['artist']['name'],
       plays: album['playcount'],
       rank: album['@attr']['rank'],
@@ -26,6 +26,7 @@ module.exports = async function () {
       url: album['mbid']
         ? `https://musicbrainz.org/album/${album['mbid']}`
         : `https://musicbrainz.org/search?query=${encodeURI(album['name'])}&type=release_group`,
+      type: 'album',
     }
   })
 }

src/_data/artists.js

@@ -10,7 +10,7 @@ module.exports = async function () {
   const data = await res
   return data['topartists'].artist.map((artist) => {
     return {
-      name: artist['name'],
+      title: artist['name'],
       plays: artist['playcount'],
       rank: artist['@attr']['rank'],
       image:
@@ -19,6 +19,7 @@ module.exports = async function () {
       url: artist['mbid']
         ? `https://musicbrainz.org/artist/${artist['mbid']}`
         : `https://musicbrainz.org/search?query=${encodeURI(artist['name'])}&type=artist`,
+      type: 'artist',
     }
   })
 }

src/_data/books.js

@@ -25,6 +25,7 @@ module.exports = async function () {
       isbn: book['isbn'],
       description: book['book_description'],
       dateAdded: book['user_date_added'],
+      type: 'book',
     })
   })
   const books = data.splice(0, 6)

src/_data/movies.js

@@ -13,7 +13,7 @@ module.exports = async function () {
     .map((item) => {
       const images = item['content']?.match(/<img [^>]*src="[^"]*"[^>]*>/gm) || []
       return {
-        name: item['title'],
+        title: item['title'],
         date: item['pubDate'],
         summary: item['contentSnippet'],
         image: images.length
@@ -23,6 +23,7 @@ module.exports = async function () {
           : 'https://cdn.coryd.dev/movies/missing-movie.jpg',
         url: item['link'],
         id: item['guid'],
+        type: 'movie',
       }
     })
     .filter((movie) => !movie.url.includes('/list/'))

src/_data/tv.js

@@ -14,6 +14,19 @@ module.exports = async function () {
       },
     },
   }).catch()
-  const shows = await res
-  return shows.splice(0, 6)
+  const data = await res
+  return data.map((episode) => {
+    return {
+      name: episode['show']['title'],
+      title: episode['episode']['title'],
+      url: `https://trakt.tv/shows/${episode['show']['ids']['slug']}/seasons/${episode['episode']['season']}/episodes/${episode['episode']['number']}`,
+      episode: `S${episode['episode']['season']}E${episode['episode']['number']}`,
+      image:
+        `https://cdn.coryd.dev/tv/${episode['show']['title']
+          .replace(':', '')
+          .replace(/\s+/g, '-')
+          .toLowerCase()}.jpg` || 'https://cdn.coryd.dev/tv/missing-tv.jpg',
+      type: 'tv',
+    }
+  })
 }

src/_includes/now.liquid

@@ -3,13 +3,13 @@ layout: main
 ---
 {% render "partials/header.liquid", site: site, page: page, nav: nav %}
 {{ content }}
-{% render "partials/now/artists.liquid", music:artists %}
-{% render "partials/now/albums.liquid", music:albums %}
+{% render "partials/now/media-grid.liquid", data:artists, icon: "microphone-2", title: "Artists", shape: "square", count: 8 %}
+{% render "partials/now/media-grid.liquid", data:albums, icon: "vinyl", title: "Albums", shape: "square", count: 8 %}
 {% render "partials/now/albumReleases.liquid", albumReleases:albumReleases %}
-{% render "partials/now/books.liquid", books:books %}
+{% render "partials/now/media-grid.liquid", data:books, icon: "books", title: "Books", shape: "vertical", count: 6 %}
 {% render "partials/now/links.liquid", links:links %}
-{% render "partials/now/movies.liquid", movies:movies %}
-{% render "partials/now/tv.liquid", tv:tv %}
+{% render "partials/now/media-grid.liquid", data:movies, icon: "movie", title: "Movies", shape: "vertical", count: 6 %}
+{% render "partials/now/media-grid.liquid", data:tv, icon: "device-tv", title: "TV", shape: "vertical", count: 6 %}
 <p class="text-xs text-center pt-6">This is a
   <a href="https://nownownow.com/about">now page</a>, and if you have your own site,
   <a href="https://nownownow.com/about">you should make one too</a>.</p>

src/_includes/partials/now/albums.liquid

@@ -1,23 +0,0 @@
-{% if music.size > 0 %}
-  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
-    {% tablericon "vinyl" "Albums" %}
-    <div class="ml-1">Albums</div>
-  </h2>
-  <div class="grid grid-cols-2 gap-2 md:grid-cols-4 not-prose">
-    {% for album in music %}
-      <a href="{{ album.url }}" title="{{album.name | escape}} by {{ album.artist | escape }}">
-        <div class="relative block h-full">
-          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 bg-cover-gradient dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300"></div>
-          <div class="absolute left-1 bottom-2 drop-shadow-md">
-            <div class="px-1 text-xs font-bold text-white line-clamp-2">{{ album.name }}</div>
-            <div class="px-1 text-xs text-white line-clamp-2">
-              {{ album.artist }}
-            </div>
-          </div>
-          {%- capture albumName %}{{ album.name | escape }}{% endcapture -%}
-          {% image album.image, albumName, 'rounded-lg w-full h-full', '225px' %}
-        </div>
-      </a>
-    {% endfor %}
-  </div>
-{% endif %}

src/_includes/partials/now/artists.liquid

@@ -1,24 +0,0 @@
-{% if music.size > 0 %}
-  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
-    {% tablericon "microphone-2" "Artists" %}
-    <div class="ml-1">Artists</div>
-  </h2>
-  <div class="grid grid-cols-2 gap-2 md:grid-cols-4 not-prose">
-    {% for artist in music %}
-      <a href="{{ artist.url }}" title="{{artist.name | escape}}">
-        <div class="relative block">
-          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 bg-cover-gradient dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300"></div>
-          <div class="absolute left-1 bottom-2 drop-shadow-md">
-            <div class="px-1 text-xs font-bold text-white line-clamp-2">{{ artist.name }}</div>
-            <div class="px-1 text-xs text-white">
-              {{ artist.plays }} plays
-            </div>
-          </div>
-          {%- capture artistImg %}{{ artist.image }}{% endcapture -%}
-          {%- capture artistName %}{{ artist.name | escape }}{% endcapture -%}
-          {% image artistImg, artistName, 'rounded-lg w-full', '225px', 'eager' %}
-        </div>
-      </a>
-    {% endfor %}
-  </div>
-{% endif %}

src/_includes/partials/now/books.liquid

@@ -1,18 +0,0 @@
-{% if books.size > 0 %}
-  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
-    {% tablericon "books" "Books" %}
-    <div class="ml-1">Books</div>
-  </h2>
-  <div class="grid grid-cols-3 gap-2 md:grid-cols-6 not-prose">
-    {% for book in books %}
-      <a href="{{book.link}}" title="{{book.title | escape}}">
-        <div class="relative block" style="max-width:226px">
-          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300"></div>
-          {%- capture bookImg %}{{book.image}}{% endcapture -%}
-          {%- capture bookName %}{{book.title | escape}}{% endcapture -%}
-          {% image bookImg, bookName, 'rounded-lg w-full h-full', '180px' %}
-        </div>
-      </a>
-    {% endfor %}
-  </div>
-{% endif %}

src/_includes/partials/now/media-grid.liquid

@@ -0,0 +1,36 @@
+{% if data.size > 0 %}
+  {% assign media = data | normalizeMedia %}
+  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
+    {% tablericon icon title %}
+    <div class="ml-1">{{ title }}</div>
+  </h2>
+  <div class="grid gap-2 {% if shape == 'square' %}grid-cols-2 md:grid-cols-4{% else %}grid-cols-3 md:grid-cols-6{% endif %} not-prose">
+    {% for item in media limit: count %}
+      {% capture altVal %}
+        {% if item.alt %}
+          {{ item.alt }}
+        {% elsif item.title %}
+          {{ item.title }}
+        {% endif %}
+      {% endcapture %}
+      {% assign alt = altVal | strip %}
+      <a href="{{ item.url }}" title="{{ alt | escape }}">
+        <div class="relative block{% if shape == 'square' %} h-full{% endif %}"{% if shape != 'square' %} style="max-width:226px"{% endif %}>
+          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300{% if item.title %} bg-cover-gradient{% endif %}"></div>
+          <div class="absolute left-1 bottom-2 drop-shadow-md">
+            {% if item.title %}
+              <div class="px-1 text-xs font-bold text-white line-clamp-2">{{ item.title }}</div>
+            {% endif %}
+            {% if item.subtext %}
+              <div class="px-1 text-xs text-white line-clamp-2">
+                {{ item.subtext }}
+              </div>
+            {% endif %}
+          </div>
+          {%- capture size %}{% if shape == 'square' %}225px{% else %}180px{% endif %}{% endcapture -%}
+          {% image item.image, alt, 'rounded-lg w-full h-full', size %}
+        </div>
+      </a>
+    {% endfor %}
+  </div>
+{% endif %}

src/_includes/partials/now/movies.liquid

@@ -1,21 +0,0 @@
-{% if movies.size > 0 %}
-  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
-    {% tablericon "movie" "Movies" %}
-    <div class="ml-1">Movies</div>
-  </h2>
-  <div class="grid grid-cols-3 gap-2 md:grid-cols-6 not-prose">
-    {% for movie in movies limit: 6 %}
-      <a href="{{movie.url}}" title="{{movie.name | escape}}">
-        <div class="relative block" style="max-width:226px">
-          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 bg-cover-gradient dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300"></div>
-          <div class="absolute left-1 bottom-2 drop-shadow-md">
-            <div class="px-1 text-xs font-bold text-white">{{ movie.name }}</div>
-          </div>
-          {%- capture movieImg %}{{ movie.image }}{% endcapture -%}
-          {%- capture movieSummary %}{{ movie.summary }}{% endcapture -%}
-          {% image movieImg, movieSummary, 'rounded-lg w-full', '180px' %}
-        </div>
-      </a>
-    {% endfor %}
-  </div>
-{% endif %}

src/_includes/partials/now/tv.liquid

@@ -1,24 +0,0 @@
-{% if tv.size > 0 %}
-  <h2 class="icon--bold m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4 icon--28">
-    {% tablericon "device-tv" "TV" %}
-    <div class="ml-1">TV</div>
-  </h2>
-  <div class="grid grid-cols-3 gap-2 md:grid-cols-6 not-prose">
-    {% for episode in tv %}
-      <a href="https://trakt.tv/shows/{{episode.show.ids.slug}}/seasons/{{ episode.episode.season }}/episodes/{{ episode.episode.number }}" title="{{ episode.episode.title | escape}} {{ episode.show.title | escape }}">
-        <div class="relative block" style="max-width:226px">
-          <div class="absolute left-0 top-0 h-full w-full rounded-lg border border-purple-600 hover:border-pink-500 bg-cover-gradient dark:border-purple-400 dark:hover:border-pink-500 ease-in-out duration-300"></div>
-          <div class="absolute left-1 bottom-2 drop-shadow-md">
-            <div class="px-1 text-xs font-bold text-white">{{ episode.episode.title }}</div>
-            <div class="px-1 text-xs text-white">
-              {{ episode.show.title }} • <strong>S{{ episode.episode.season }}E{{ episode.episode.number }}</strong>
-            </div>
-          </div>
-          {%- capture tvImg %}{{episode.show.title | tv}}{% endcapture -%}
-          {%- capture tvName %}{{ episode.episode.title | escape}} - {{ episode.show.title | escape }}{% endcapture -%}
-          {% image tvImg, tvName, 'rounded-lg w-full', '180px' %}
-        </div>
-      </a>
-    {% endfor %}
-  </div>
-{% endif %}