From 6833d054ccedf052df4e36a24d04290cc3002cdd Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Sat, 19 Oct 2024 18:19:51 -0700
Subject: [PATCH] chore: search cleanup

---
 package-lock.json           |  4 ++--
 package.json                |  2 +-
 src/assets/scripts/index.js |  7 ++++---
 views/feeds/search.psql     | 36 ++++++++++++++++++------------------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e4d146a8..5cd42915 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.5.8",
+      "version": "1.5.9",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.5.0",
diff --git a/package.json b/package.json
index a28fbeff..94f18150 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js
index 53b42105..eadb84ae 100644
--- a/src/assets/scripts/index.js
+++ b/src/assets/scripts/index.js
@@ -107,9 +107,10 @@ window.addEventListener("load", () => {
         "total_plays",
       ],
       searchOptions: {
-        boost: { title: 2, tags: 1.5 },
         prefix: true,
-        fuzzy: 0.3,
+        fuzzy: 0.2,
+        boost: { title: 2, tags: 1.5 },
+        sort: (a, b) => b.score - a.score,
       },
     });
     const $form = document.querySelector(".search__form");
@@ -295,4 +296,4 @@ window.addEventListener("load", () => {
       updateSearchResults(nextResults);
     });
   })();
-});
+});
\ No newline at end of file
diff --git a/views/feeds/search.psql b/views/feeds/search.psql
index f14d1738..18a9b127 100644
--- a/views/feeds/search.psql
+++ b/views/feeds/search.psql
@@ -8,7 +8,8 @@ WITH search_data AS (
       p.tags,
       NULL AS genre_name,
       NULL AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      p.date AS content_date
   FROM optimized_posts p
 
   UNION ALL
@@ -21,7 +22,8 @@ WITH search_data AS (
       l.tags,
       NULL AS genre_name,
       NULL AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      l.date AS content_date
   FROM optimized_links l
 
   UNION ALL
@@ -37,7 +39,8 @@ WITH search_data AS (
       b.tags,
       NULL AS genre_name,
       NULL AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      b.date_finished AS content_date
   FROM optimized_books b
   WHERE LOWER(b.status) = 'finished'
 
@@ -54,7 +57,8 @@ WITH search_data AS (
       m.tags,
       NULL AS genre_name,
       NULL AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      m.last_watched AS content_date
   FROM optimized_movies m
   WHERE m.last_watched IS NOT NULL
 
@@ -68,7 +72,8 @@ WITH search_data AS (
       ARRAY[ar.genre_name] AS tags,
       ar.genre_name,
       CONCAT('https://coryd.dev', ar.genre_slug) AS genre_url,
-      ar.total_plays
+      ar.total_plays,
+      NULL AS content_date
   FROM optimized_artists ar
 
   UNION ALL
@@ -81,7 +86,8 @@ WITH search_data AS (
       NULL AS tags,
       g.name AS genre_name,
       CONCAT('https://coryd.dev', g.url) AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      NULL AS content_date
   FROM optimized_genres g
 
   UNION ALL
@@ -97,24 +103,18 @@ WITH search_data AS (
       s.tags,
       NULL AS genre_name,
       NULL AS genre_url,
-      NULL::integer AS total_plays
+      NULL::integer AS total_plays,
+      s.last_watched_at AS content_date
   FROM optimized_shows s
   WHERE s.last_watched_at IS NOT NULL
 ),
 search_data_with_id AS (
   SELECT
-    ROW_NUMBER() OVER (ORDER BY url) AS id,
+    ROW_NUMBER() OVER (ORDER BY content_date DESC NULLS LAST, url) AS id,
     search_data.*
   FROM search_data
 )
 SELECT
-  id,
-  url,
-  title,
-  description,
-  tags,
-  genre_name,
-  genre_url,
-  type,
-  total_plays
-FROM search_data_with_id;
\ No newline at end of file
+  id, url, title, description, tags, genre_name, genre_url, type, total_plays
+FROM search_data_with_id
+ORDER BY content_date DESC NULLS LAST, url;
\ No newline at end of file