From b3ca3fc19ff0dbdb0a3cd03d87bf59934346bc7a Mon Sep 17 00:00:00 2001
From: ibratabian17 <ibratabian@gmail.com>
Date: Sun, 28 Jul 2024 12:11:14 +0800
Subject: [PATCH] Minor Fixbug

---
 core/carousel/carousel.js | 12 ++++++------
 core/route/rdefault.js    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/carousel/carousel.js b/core/carousel/carousel.js
index 0e86988..87f2687 100644
--- a/core/carousel/carousel.js
+++ b/core/carousel/carousel.js
@@ -107,11 +107,11 @@ function filterSongsBySearch(songdbs, search) {
   return sortByTitle(filterSongs(songdbs, item => {
     const song = songdb[item];
     return (
-      song.title.toLowerCase().includes(search.toLowerCase()) ||
-      song.artist.toLowerCase().includes(search.toLowerCase()) ||
-      song.mapName.toLowerCase().includes(search.toLowerCase()) ||
-      song.originalJDVersion == search ||
-      song.tags.includes(search)
+      (song.title && song.title.toLowerCase().includes(search.toLowerCase())) ||
+      (song.artist && song.artist.toLowerCase().includes(search.toLowerCase())) ||
+      (song.mapName && song.mapName.toLowerCase().includes(search.toLowerCase())) ||
+      (song.originalJDVersion && song.originalJDVersion == search) ||
+      (song.tags && song.tags.includes(search))
     );
   }), search.toLowerCase());
 }
@@ -181,7 +181,7 @@ function addJDVersion(songdbs, type = "partyMap") {
   addCategories(generateCategories("ABBA: You Can Dance", filterSongsByJDVersion(songdbs, 4884), type));
   addCategories(generateCategories("Just Dance Asia", filterSongsByJDVersion(songdbs, 4514), type));
   addCategories(generateCategories("Just Dance Kids", filterSongsByJDVersion(songdbs, 123), type));
-  for (let year = 2024; year >= 2014; year--) {
+  for (let year = 2069; year >= 2014; year--) {
     addCategories(generateCategories(`Just Dance ${year}`, filterSongsByJDVersion(songdbs, year), type));
   }
   for (let year = 4; year >= 1; year--) {
diff --git a/core/route/rdefault.js b/core/route/rdefault.js
index 51baeb1..8bbc800 100644
--- a/core/route/rdefault.js
+++ b/core/route/rdefault.js
@@ -285,7 +285,7 @@ exports.initroute = (app, express, server) => {
     if (country == false) {
       country = "US";
     }
-    response.send('{ "country": "' + country + '" }');
+    response.send({ "country": country });
   });
 
   app.post("/carousel/v2/pages/sweat", (req, res) => {