From 76a172bb74a9a25da0af058c1b8044c36b7679cb Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Sun, 13 Oct 2024 15:51:27 -0700
Subject: [PATCH] chore: remove old filters, hardcoded types, old post status
 from view

---
 config/filters/dates.js                          | 16 ----------------
 src/includes/base.liquid                         |  2 +-
 .../partials/blocks/banners/old-post.liquid      |  1 -
 src/pages/dynamic/music/artists/artist.html      |  6 +++---
 src/pages/dynamic/posts/post.html                |  2 +-
 views/content/posts.psql                         |  6 ++++++
 views/feeds/all-content.psql                     |  4 ----
 views/feeds/search.psql                          |  6 ------
 views/feeds/sitemap.psql                         |  5 -----
 views/feeds/syndication.psql                     |  4 ----
 views/globals/pages.psql                         |  2 +-
 views/media/books.psql                           |  1 -
 views/media/movies.psql                          |  1 -
 views/media/music/artists.psql                   |  6 +++---
 views/media/shows.psql                           |  1 -
 15 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/config/filters/dates.js b/config/filters/dates.js
index 5aedb0dd..6028aad9 100644
--- a/config/filters/dates.js
+++ b/config/filters/dates.js
@@ -1,20 +1,4 @@
-import { DateTime } from 'luxon'
-
 export default {
-  isoDateOnly: (date, separator) => {
-    let d = new Date(date)
-    let month = '' + (d.getMonth() + 1)
-    let day = '' + d.getDate()
-    let year = d.getFullYear()
-
-    if (month.length < 2) month = '0' + month
-    if (day.length < 2) day = '0' + day
-
-    return [year, month, day].join(separator)
-  },
-  oldPost: (date) => {
-    return DateTime.now().diff(DateTime.fromJSDate(new Date(date)), 'years').years > 3
-  },
   stringToRFC822Date: (dateString) => {
     const date = new Date(Date.parse(dateString))
     const dayStrings = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
diff --git a/src/includes/base.liquid b/src/includes/base.liquid
index 2199d2b3..60fa5594 100644
--- a/src/includes/base.liquid
+++ b/src/includes/base.liquid
@@ -142,7 +142,7 @@
               "inLanguage": "{{ globals.locale }}",
               "publisher": { "@type": "{{ globals.site_type }}", "name": "{{ globals.author }}", "url": "{{ globals.url }}" },
               "author": { "@type": "Person", "name": "{{ globals.author }}" },
-              "datePublished": "{{ page.date | isoDateOnly: '.' }}"
+              "datePublished": "{{ page.date | date: "%Y.%m.%d" }}"
             }
           {%- endif -%}
         ]
diff --git a/src/includes/partials/blocks/banners/old-post.liquid b/src/includes/partials/blocks/banners/old-post.liquid
index 50545181..c0b26e89 100644
--- a/src/includes/partials/blocks/banners/old-post.liquid
+++ b/src/includes/partials/blocks/banners/old-post.liquid
@@ -1,4 +1,3 @@
-{%- assign isOldPost = date | oldPost -%}
 {%- if isOldPost -%}
   <div class="banner old-post">
     <p>{% tablericon "clock-x" %}This post is over 3 years old. I've probably changed my mind since it was written and it <em>could</em> be out of date.</p>
diff --git a/src/pages/dynamic/music/artists/artist.html b/src/pages/dynamic/music/artists/artist.html
index 3c516cd6..2a8187fc 100644
--- a/src/pages/dynamic/music/artists/artist.html
+++ b/src/pages/dynamic/music/artists/artist.html
@@ -12,7 +12,7 @@ schema: artist
   {{ artist.name }} / {{ artist.country }}
 {%- endcapture -%}
 {%- capture playLabel -%}
-  {%- if artist.totalPlays == 1 -%}
+  {%- if artist.total_plays == 1 -%}
     play
   {%- else -%}
     plays
@@ -105,8 +105,8 @@ schema: artist
     {% for album in artist.albums %}
     <tr>
       <td>{{ album.name }}</td>
-      <td>{{ album.totalPlays }}</td>
-      <td>{{ album.releaseYear }}</td>
+      <td>{{ album.total_plays }}</td>
+      <td>{{ album.release_year }}</td>
     </tr>
     {% endfor %}
   </table>
diff --git a/src/pages/dynamic/posts/post.html b/src/pages/dynamic/posts/post.html
index 9560d43a..e7ea7b9b 100644
--- a/src/pages/dynamic/posts/post.html
+++ b/src/pages/dynamic/posts/post.html
@@ -18,7 +18,7 @@ schema: blog
     {{ post.title }}
   </h3>
   <div>
-    {% render "partials/blocks/banners/old-post.liquid", date:post.date %}
+    {% render "partials/blocks/banners/old-post.liquid", isOldPost:post.old_post %}
     {%- if post.image -%}
     <img
       srcset="
diff --git a/views/content/posts.psql b/views/content/posts.psql
index e2bbe6ea..e53b49d2 100644
--- a/views/content/posts.psql
+++ b/views/content/posts.psql
@@ -8,6 +8,7 @@ SELECT
   p.featured,
   p.slug AS url,
   p.mastodon_url,
+
   CASE
     WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/'
     THEN CONCAT('/', df.filename_disk)
@@ -15,6 +16,11 @@ SELECT
   END AS image,
   p.image_alt,
 
+  CASE
+    WHEN EXTRACT(YEAR FROM AGE(CURRENT_DATE, p.date)) > 3 THEN TRUE
+    ELSE FALSE
+  END AS old_post,
+
   (
     SELECT json_agg(
       CASE
diff --git a/views/feeds/all-content.psql b/views/feeds/all-content.psql
index ed534c27..31859211 100644
--- a/views/feeds/all-content.psql
+++ b/views/feeds/all-content.psql
@@ -2,7 +2,6 @@ CREATE OR REPLACE VIEW optimized_all_activity AS
 WITH feed_data AS (
   SELECT
       p.date AS content_date,
-      'post' AS content_type,
       p.title,
       p.description,
       CONCAT('https://coryd.dev', p.url) AS url,
@@ -21,7 +20,6 @@ WITH feed_data AS (
 
   SELECT
       l.date AS content_date,
-      'link' AS content_type,
       l.title,
       l.description,
       l.link AS url,
@@ -40,7 +38,6 @@ WITH feed_data AS (
 
   SELECT
       b.date_finished AS content_date,
-      'book' AS content_type,
       b.title,
       b.description,
       CONCAT('https://coryd.dev', b.url) AS url,
@@ -64,7 +61,6 @@ WITH feed_data AS (
 
   SELECT
       m.last_watched AS content_date,
-      'movie' AS content_type,
       m.title,
       m.description,
       CONCAT('https://coryd.dev', m.url) AS url,
diff --git a/views/feeds/search.psql b/views/feeds/search.psql
index 39cf6dc0..753c16c6 100644
--- a/views/feeds/search.psql
+++ b/views/feeds/search.psql
@@ -1,7 +1,6 @@
 CREATE OR REPLACE VIEW optimized_search_index AS
 WITH search_data AS (
   SELECT
-      'post' AS content_type,
       CONCAT('📝 ', p.title) AS title,
       CONCAT('https://coryd.dev', p.url) AS url,
       p.tags,
@@ -12,7 +11,6 @@ WITH search_data AS (
   UNION ALL
 
   SELECT
-      'link' AS content_type,
       CONCAT('🔗 ', l.title, ' via ', l.name) AS title,
       l.link AS url,
       l.tags,
@@ -23,7 +21,6 @@ WITH search_data AS (
   UNION ALL
 
   SELECT
-      'book' AS content_type,
       CASE
           WHEN b.rating IS NOT NULL THEN CONCAT('📖 ', b.title, ' (', b.rating, ')')
           ELSE CONCAT('📖 ', b.title)
@@ -38,7 +35,6 @@ WITH search_data AS (
   UNION ALL
 
   SELECT
-      'movie' AS content_type,
       CASE
           WHEN m.rating IS NOT NULL THEN CONCAT('🎥 ', m.title, ' (', m.rating, ')')
           ELSE CONCAT('🎥 ', m.title)
@@ -53,7 +49,6 @@ WITH search_data AS (
   UNION ALL
 
   SELECT
-      'artist' AS content_type,
       CONCAT('🎧 ', ar.name, ' - ', ar.genre_name) AS title,
       CONCAT('https://coryd.dev', ar.url) AS url,
       ARRAY[ar.genre_name] AS tags,
@@ -64,7 +59,6 @@ WITH search_data AS (
   UNION ALL
 
   SELECT
-      'genre' AS content_type,
       CONCAT('🎵 ', g.name) AS title,
       CONCAT('https://coryd.dev', g.url) AS url,
       NULL AS tags,
diff --git a/views/feeds/sitemap.psql b/views/feeds/sitemap.psql
index 83e9d877..86dd3ad1 100644
--- a/views/feeds/sitemap.psql
+++ b/views/feeds/sitemap.psql
@@ -2,7 +2,6 @@ CREATE OR REPLACE VIEW optimized_sitemap AS
 WITH sitemap_data AS (
   SELECT
       p.date AS content_date,
-      'post' AS content_type,
       p.title,
       CONCAT('https://coryd.dev', p.url) AS url
   FROM optimized_posts p
@@ -11,7 +10,6 @@ WITH sitemap_data AS (
 
   SELECT
       b.date_finished AS content_date,
-      'book' AS content_type,
       b.title,
       CONCAT('https://coryd.dev', b.url) AS url
   FROM optimized_books b
@@ -21,7 +19,6 @@ WITH sitemap_data AS (
 
   SELECT
       m.last_watched AS content_date,
-      'movie' AS content_type,
       m.title,
       CONCAT('https://coryd.dev', m.url) AS url
   FROM optimized_movies m
@@ -31,7 +28,6 @@ WITH sitemap_data AS (
 
   SELECT
       NULL AS content_date,
-      'artist' AS content_type,
       ar.name AS title,
       CONCAT('https://coryd.dev', ar.url) AS url
   FROM optimized_artists ar
@@ -40,7 +36,6 @@ WITH sitemap_data AS (
 
   SELECT
       NULL AS content_date,
-      'genre' AS content_type,
       g.name AS title,
       CONCAT('https://coryd.dev', g.url) AS url
   FROM optimized_genres g
diff --git a/views/feeds/syndication.psql b/views/feeds/syndication.psql
index 1eaedcc1..b4fbb95a 100644
--- a/views/feeds/syndication.psql
+++ b/views/feeds/syndication.psql
@@ -2,7 +2,6 @@ CREATE OR REPLACE VIEW optimized_syndication AS
 WITH syndication_data AS (
   SELECT
       p.date AS content_date,
-      'post' AS content_type,
       p.title,
       p.description,
       CONCAT('https://coryd.dev', p.url) AS url,
@@ -24,7 +23,6 @@ WITH syndication_data AS (
 
   SELECT
       l.date AS content_date,
-      'link' AS content_type,
       l.title,
       l.description,
       l.link AS url,
@@ -52,7 +50,6 @@ WITH syndication_data AS (
 
   SELECT
       b.date_finished AS content_date,
-      'book' AS content_type,
       b.title,
       b.description,
       CONCAT('https://coryd.dev', b.url) AS url,
@@ -77,7 +74,6 @@ WITH syndication_data AS (
 
   SELECT
       m.last_watched AS content_date,
-      'movie' AS content_type,
       m.title,
       m.description,
       CONCAT('https://coryd.dev', m.url) AS url,
diff --git a/views/globals/pages.psql b/views/globals/pages.psql
index 63ddcc40..c3c3a55c 100644
--- a/views/globals/pages.psql
+++ b/views/globals/pages.psql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE VIEW optimized_pages AS
-SELECT 
+SELECT
   p.id,
   p.title,
   p.permalink,
diff --git a/views/media/books.psql b/views/media/books.psql
index f13f97b0..1c825dad 100644
--- a/views/media/books.psql
+++ b/views/media/books.psql
@@ -13,7 +13,6 @@ SELECT
     CONCAT('/', df.filename_disk) AS image,
     b.favorite,
     b.tattoo,
-    'book' AS type,
 
     (
       SELECT array_agg(t.name)
diff --git a/views/media/movies.psql b/views/media/movies.psql
index 2132c9f8..a7d850e3 100644
--- a/views/media/movies.psql
+++ b/views/media/movies.psql
@@ -11,7 +11,6 @@ SELECT
   m.star_rating AS rating,
   m.description,
   m.review,
-  'movie' AS type,
   m.slug AS url,
   CONCAT('/', df.filename_disk) AS image,
   CONCAT('/', df2.filename_disk) AS backdrop,
diff --git a/views/media/music/artists.psql b/views/media/music/artists.psql
index 49653d8d..d32f6d05 100644
--- a/views/media/music/artists.psql
+++ b/views/media/music/artists.psql
@@ -3,7 +3,7 @@ SELECT
     ar.name_string AS name,
     ar.slug AS url,
     ar.tentative,
-    ar.total_plays AS totalPlays,
+    ar.total_plays,
     ar.country,
     ar.description,
     ar.favorite,
@@ -27,8 +27,8 @@ SELECT
     (
         SELECT json_agg(json_build_object(
             'name', a.name,
-            'releaseYear', a.release_year,
-            'totalPlays', a.total_plays,
+            'release_year', a.release_year,
+            'total_plays', a.total_plays,
             'art', df_album.filename_disk
         ) ORDER BY a.release_year)
         FROM albums a
diff --git a/views/media/shows.psql b/views/media/shows.psql
index cf715e5f..6081eea3 100644
--- a/views/media/shows.psql
+++ b/views/media/shows.psql
@@ -29,7 +29,6 @@ SELECT
   ) AS grid,
 
   json_build_object(
-    'type', 'tv',
     'title', s.title,
     'year', s.year,
     'url', s.slug,