From ffea333d55f68ae76653f1aebf537ca7947cabaa Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Sun, 13 Oct 2024 15:20:54 -0700
Subject: [PATCH] chore: filter to query

---
 config/filters/general.js                     |  7 ----
 config/filters/media.js                       |  1 -
 package-lock.json                             | 39 -------------------
 package.json                                  |  1 -
 src/includes/base.liquid                      |  7 ++--
 src/includes/partials/feeds/json.liquid       |  2 +-
 src/includes/partials/feeds/rss.liquid        |  6 +--
 .../partials/feeds/syndication.rss.liquid     |  6 +--
 src/pages/dynamic/music/albums/3-months.html  |  2 +-
 .../dynamic/music/albums/this-month.html      |  2 +-
 src/pages/dynamic/music/albums/this-week.html |  2 +-
 src/pages/dynamic/music/artists/3-months.html |  2 +-
 .../dynamic/music/artists/this-month.html     |  2 +-
 .../dynamic/music/artists/this-week.html      |  2 +-
 src/pages/dynamic/music/genre.html            |  2 +-
 src/pages/dynamic/music/index.html            |  2 +-
 src/pages/dynamic/music/periods/3-months.html |  2 +-
 .../dynamic/music/periods/this-month.html     |  2 +-
 src/pages/dynamic/music/tracks/3-months.html  |  2 +-
 .../dynamic/music/tracks/this-month.html      |  2 +-
 src/pages/dynamic/music/tracks/this-week.html |  2 +-
 views/media/music/genres.psql                 |  2 +-
 22 files changed, 24 insertions(+), 73 deletions(-)

diff --git a/config/filters/general.js b/config/filters/general.js
index ce74d5e6..4e8a43a4 100644
--- a/config/filters/general.js
+++ b/config/filters/general.js
@@ -1,8 +1,5 @@
-import sanitizeHtml from 'sanitize-html'
 import { shuffleArray } from '../utilities/index.js'
 
-const BASE_URL = 'https://coryd.dev'
-
 export default {
   encodeAmp: (string) => {
     if (!string) return
@@ -12,8 +9,4 @@ export default {
   },
   formatNumber: (number) => number.toLocaleString('en-US'),
   shuffleArray,
-  sanitizeHtml: (html) => sanitizeHtml(html, {
-    textFilter: (text) => text.replace(/"/g, '')
-  }),
-  absoluteUrl: (url) => (new URL(url, BASE_URL)).toString(),
 }
\ No newline at end of file
diff --git a/config/filters/media.js b/config/filters/media.js
index 6ce3c3cf..43a7e6a8 100644
--- a/config/filters/media.js
+++ b/config/filters/media.js
@@ -9,7 +9,6 @@ export default {
     if (book['status'] === 'finished' && book['year']) return parseInt(book['year']) === parseInt(year)
     return ''
   }),
-  sortByPlaysDescending: (data, key) => data.sort((a, b) => b[key] - a[key]),
   mediaLinks: (data, type, count = 10) => {
     if (!data || !type) return ''
 
diff --git a/package-lock.json b/package-lock.json
index 2c703910..99b0c820 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,6 @@
         "postcss-import-ext-glob": "^2.1.1",
         "postcss-js": "^4.0.1",
         "rimraf": "^6.0.1",
-        "sanitize-html": "^2.13.1",
         "slugify": "^1.6.6",
         "terser": "^5.34.1"
       }
@@ -2631,16 +2630,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -4364,34 +4353,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/sanitize-html": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.1.tgz",
-      "integrity": "sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "escape-string-regexp": "^4.0.0",
-        "htmlparser2": "^8.0.0",
-        "is-plain-object": "^5.0.0",
-        "parse-srcset": "^1.0.2",
-        "postcss": "^8.3.11"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/section-matter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
diff --git a/package.json b/package.json
index 115bf52f..ecc4a8f3 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "postcss-import-ext-glob": "^2.1.1",
     "postcss-js": "^4.0.1",
     "rimraf": "^6.0.1",
-    "sanitize-html": "^2.13.1",
     "slugify": "^1.6.6",
     "terser": "^5.34.1"
   }
diff --git a/src/includes/base.liquid b/src/includes/base.liquid
index 296b3d94..2199d2b3 100644
--- a/src/includes/base.liquid
+++ b/src/includes/base.liquid
@@ -56,8 +56,7 @@
   {%- when 'artist' -%}
     {%- assign ogImage = globals.cdn_url | append: artist.grid.image -%}
   {%- when 'genre' -%}
-    {%- assign sortedGenreArtists = genre.artists | sortByPlaysDescending: "total_plays" -%}
-    {%- assign ogImage =  globals.cdn_url | append: sortedGenreArtists[0].grid.image -%}
+    {%- assign ogImage =  globals.cdn_url | append: genre.artists[0].grid.image -%}
   {%- when 'watching' -%}
     {%- assign featuredMovie = movies.recentlyWatched | first -%}
     {%- assign ogImage = globals.cdn_url | append: featuredMovie.grid.backdrop -%}
@@ -98,8 +97,8 @@
     <link rel="stylesheet" href="/assets/styles/index.css?v={% appVersion %}" type="text/css" />
     <link rel="canonical" href="{{ fullUrl }}" />
     <meta property="og:title" content="{{ pageTitle }}" />
-    <meta name="description" content="{{ pageDescription | sanitizeHtml }}" />
-    <meta property="og:description" content="{{ pageDescription | sanitizeHtml }}" />
+    <meta name="description" content="{{ pageDescription }}" />
+    <meta property="og:description" content="{{ pageDescription }}" />
     <meta property="og:type" content="article" />
     <meta property="og:url" content="{{ fullUrl }}" />
     <meta property="og:image" content="{{ ogImage }}?class=w800" />
diff --git a/src/includes/partials/feeds/json.liquid b/src/includes/partials/feeds/json.liquid
index 563f3207..2738cccb 100644
--- a/src/includes/partials/feeds/json.liquid
+++ b/src/includes/partials/feeds/json.liquid
@@ -2,7 +2,7 @@
   "version": "https://jsonfeed.org/version/1",
   "title": "{{ title }}",
   "home_page_url": "{{ globals.url }}",
-  "feed_url": "{{ permalink | absoluteUrl }}",
+  "feed_url": "{{ globals.url }}{{ permalink }}",
   "description": "{{ globals.site_description }}",
   "icon": "{{ globals.cdn_url }}{{ globals.avatar }}?class=w200",
   "author": {
diff --git a/src/includes/partials/feeds/rss.liquid b/src/includes/partials/feeds/rss.liquid
index 71949af4..ca37023d 100644
--- a/src/includes/partials/feeds/rss.liquid
+++ b/src/includes/partials/feeds/rss.liquid
@@ -2,15 +2,15 @@
 <?xml-stylesheet href="/assets/styles/feed.xsl" type="text/xsl" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <atom:link href="{{ permalink | absoluteUrl }}" rel="self" type="application/rss+xml" />
+    <atom:link href="{{ globals.url }}{{ permalink }}" rel="self" type="application/rss+xml" />
     {%- assign entries = data -%}
     <title><![CDATA[{{ title }}]]></title>
     <description><![CDATA[{{ globals.site_description }}]]></description>
-    <link>{{ permalink | absoluteUrl }}</link>
+    <link>{{ globals.url }}{{ permalink }}</link>
     <lastBuildDate>{{ 'now' | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
     <image>
       <title><![CDATA[{{ title }}]]></title>
-      <link>{{ permalink | absoluteUrl }}</link>
+      <link>{{ globals.url }}{{ permalink }}</link>
       <url>{{ globals.cdn_url }}{{ globals.avatar }}?class=w200</url>
       <width>144</width>
       <height>144</height>
diff --git a/src/includes/partials/feeds/syndication.rss.liquid b/src/includes/partials/feeds/syndication.rss.liquid
index 3336eb71..7c4174b8 100644
--- a/src/includes/partials/feeds/syndication.rss.liquid
+++ b/src/includes/partials/feeds/syndication.rss.liquid
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <atom:link href="{{ permalink | absoluteUrl }}" rel="self" type="application/rss+xml" />
+    <atom:link href="{{ globals.url }}{{ permalink }}" rel="self" type="application/rss+xml" />
     {%- assign entries = data -%}
     <title><![CDATA[{{ title }}]]></title>
     <description><![CDATA[{{ globals.site_description }}]]></description>
-    <link>{{ permalink | absoluteUrl }}</link>
+    <link>{{ globals.url }}{{ permalink }}</link>
     {% assign firstEntry = entries | first %}
     <lastBuildDate>{{ 'now' | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
     <image>
       <title><![CDATA[{{ title }}]]></title>
-      <link>{{ permalink | absoluteUrl }}</link>
+      <link>{{ globals.url }}{{ permalink }}</link>
       <url>{{ globals.cdn_url }}{{ globals.avatar }}?class=w200</url>
       <width>144</width>
       <height>144</height>
diff --git a/src/pages/dynamic/music/albums/3-months.html b/src/pages/dynamic/music/albums/3-months.html
index 5aad9984..adec2b1c 100644
--- a/src/pages/dynamic/music/albums/3-months.html
+++ b/src/pages/dynamic/music/albums/3-months.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/three-months/">artists</a> or <a href="/music/tracks/three-months/">tracks</a> I've listened to over the last 3 months. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/this-month">this month</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/albums/this-month.html b/src/pages/dynamic/music/albums/this-month.html
index faa0fac8..055f90dc 100644
--- a/src/pages/dynamic/music/albums/this-month.html
+++ b/src/pages/dynamic/music/albums/this-month.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/this-month/">artists</a> or <a href="/music/tracks/this-month/">tracks</a> I've listened to this month. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/albums/this-week.html b/src/pages/dynamic/music/albums/this-week.html
index c829c551..182b34c4 100644
--- a/src/pages/dynamic/music/albums/this-week.html
+++ b/src/pages/dynamic/music/albums/this-week.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/this-week/">artists</a> or <a href="/music/tracks/this-week/">tracks</a> I've listened to this week. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music/this-month">this month</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/artists/3-months.html b/src/pages/dynamic/music/artists/3-months.html
index 21f80223..8e1eb85e 100644
--- a/src/pages/dynamic/music/artists/3-months.html
+++ b/src/pages/dynamic/music/artists/3-months.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/albums/three-months/">albums</a> or <a href="/music/tracks/three-months/">tracks</a> I've listened to over the last 3 months. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/this-month">this month</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/artists/this-month.html b/src/pages/dynamic/music/artists/this-month.html
index 003d0d08..4d5a0335 100644
--- a/src/pages/dynamic/music/artists/this-month.html
+++ b/src/pages/dynamic/music/artists/this-month.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/albums/this-month/">albums</a> or <a href="/music/tracks/this-month/">tracks</a> I've listened to this month. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/artists/this-week.html b/src/pages/dynamic/music/artists/this-week.html
index c6023441..584a9cba 100644
--- a/src/pages/dynamic/music/artists/this-week.html
+++ b/src/pages/dynamic/music/artists/this-week.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/albums/this-week/">albums</a> or <a href="/music/tracks/this-week/">tracks</a> I've listened to this week. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music/this-month">this month</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/genre.html b/src/pages/dynamic/music/genre.html
index a610d150..f47a893c 100644
--- a/src/pages/dynamic/music/genre.html
+++ b/src/pages/dynamic/music/genre.html
@@ -16,7 +16,7 @@ schema: genre
     artist is
   {% endif %}
 {%- endcapture -%}
-{%- assign mediaLinks = genre.artists | sortByPlaysDescending: "total_plays" | mediaLinks: "artist", 5 -%}
+{%- assign mediaLinks = genre.artists | mediaLinks: "artist", 5 -%}
 <noscript><style>[data-toggle-content].text-toggle-hidden {height: unset !important;overflow: unset !important;margin-bottom: unset !important;}[data-toggle-content].text-toggle-hidden::after {display: none !important;}</style></noscript>
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 <h2>{{ genre.name }}</h2>
diff --git a/src/pages/dynamic/music/index.html b/src/pages/dynamic/music/index.html
index 344f25e6..e9bc0e67 100644
--- a/src/pages/dynamic/music/index.html
+++ b/src/pages/dynamic/music/index.html
@@ -7,7 +7,7 @@ updated: "now"
 schema: music-index
 ---
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See more of the</strong> <a href="/music/artists/this-week/">artists</a>, <a href="/music/albums/this-week/">albums</a> or <a href="/music/tracks/this-week/">tracks</a> I've listened to this week. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music/this-month">this month</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 {% render "partials/blocks/now-playing.liquid", music:music %}
diff --git a/src/pages/dynamic/music/periods/3-months.html b/src/pages/dynamic/music/periods/3-months.html
index 96d74247..1b8c5595 100644
--- a/src/pages/dynamic/music/periods/3-months.html
+++ b/src/pages/dynamic/music/periods/3-months.html
@@ -8,7 +8,7 @@ image: music.threeMonth.artists[0].image
 schema: music-period
 ---
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See more of the</strong> <a href="/music/artists/three-months/">artists</a>, <a href="/music/albums/three-months/">albums</a> or <a href="/music/tracks/three-months/">tracks</a> I've listened to over the last 3 months. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/this-month">this month</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/periods/this-month.html b/src/pages/dynamic/music/periods/this-month.html
index 78999554..5485dc8f 100644
--- a/src/pages/dynamic/music/periods/this-month.html
+++ b/src/pages/dynamic/music/periods/this-month.html
@@ -8,7 +8,7 @@ image: music.month.artists[0].image
 schema: music-period
 ---
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See more of the</strong> <a href="/music/artists/this-month/">artists</a>, <a href="/music/albums/this-month/">albums</a> or <a href="/music/tracks/this-month/">tracks</a> I've listened to this month. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/tracks/3-months.html b/src/pages/dynamic/music/tracks/3-months.html
index e4014173..7d35ff1a 100644
--- a/src/pages/dynamic/music/tracks/3-months.html
+++ b/src/pages/dynamic/music/tracks/3-months.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.threeMonth.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.threeMonth.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.threeMonth.totalTracks }} tracks</strong> over the last 3 months. Most of that has been {{ music.threeMonth.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/three-months/">artists</a> or <a href="/music/albums/three-months/">albums</a> I've listened to over the last 3 months. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/this-month">this month</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/tracks/this-month.html b/src/pages/dynamic/music/tracks/this-month.html
index 0759f528..26e62b66 100644
--- a/src/pages/dynamic/music/tracks/this-month.html
+++ b/src/pages/dynamic/music/tracks/this-month.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.month.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.month.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.month.totalTracks }} tracks</strong> this month. Most of that has been {{ music.month.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/this-month/">artists</a> or <a href="/music/albums/this-month/">albums</a> this month. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music">this week</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/src/pages/dynamic/music/tracks/this-week.html b/src/pages/dynamic/music/tracks/this-week.html
index 2eb5470b..1943d69a 100644
--- a/src/pages/dynamic/music/tracks/this-week.html
+++ b/src/pages/dynamic/music/tracks/this-week.html
@@ -12,7 +12,7 @@ schema: music
 <a class="icon-link" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" %} Back to music</a>
 {% if pagination.pageNumber == 0 %}
 <h2>{{ title }}</h2>
-<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | sortByPlaysDescending: "plays" | mediaLinks: "genre", 5 }}.</p>
+<p>I've listened to <strong class="highlight-text">{{ music.week.artists.size }} artists</strong>, <strong class="highlight-text">{{ music.week.albums.size }} albums</strong> and <strong class="highlight-text">{{ music.week.totalTracks }} tracks</strong> this week. Most of that has been {{ music.week.genres | mediaLinks: "genre", 5 }}.</p>
 <p><strong class="highlight-text">See the</strong> <a href="/music/artists/this-week/">artists</a> or <a href="/music/albums/this-week/">albums</a> I've listened to this week. <strong class="highlight-text">Or take a look at what I've listened to</strong> <a href="/music/this-month">this month</a> or <a href="/music/three-months">over the last 3 months</a>.</p>
 <p><a href="/music/concerts">You can also take a look at the concerts I've been to.</a></p>
 <hr />
diff --git a/views/media/music/genres.psql b/views/media/music/genres.psql
index cc2885f0..d9be513d 100644
--- a/views/media/music/genres.psql
+++ b/views/media/music/genres.psql
@@ -12,7 +12,7 @@ SELECT
             'name', a.name_string,
             'url', a.slug,
             'total_plays', a.total_plays
-        ))
+        ) ORDER BY a.total_plays DESC)
         FROM artists a
         WHERE a.genres = g.id
     ) AS artists,