updated lyric format

gnehs · Nov 2, 2021 · f0fbc1e · f0fbc1e
1 parent f906670
commit f0fbc1e
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 37 deletions.
diff --git a/dataModule.js b/dataModule.js
@@ -620,11 +620,11 @@ router.get("/lyric/", async (req, res) => {
         showError(moduleName, e)
     }
     return res.json({
-        lyrics: [{
+        lyrics: lyric ? [{
             source: req.query.moduleName,
             id: req.query.id,
             lyric: lyric
-        }]
+        }] : []
     });
 });
 //-----------------------------> 加入清單

diff --git a/db/lyric.js b/db/lyric.js
@@ -44,7 +44,7 @@ async function getLyric(data) {
     if (result)
         return result.lyric
     else
-        return false
+        return null
 }
 async function searchLyric(keyword) {
     let result = await model.find({ $text: { $search: keyword } }, err => err ? console.error(err) : null).limit(10)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pokaplayer",
-	"version": "3.4.8",
+	"version": "3.4.9",
 	"description": "",
 	"main": "index.js",
 	"scripts": {

diff --git a/public/css/app.04488c67.css → public/css/app.419244e1.css b/public/css/app.04488c67.css → public/css/app.419244e1.css
diff --git a/public/index.html b/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html color-scheme="dim"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name="apple-touch-fullscreen" content="yes"><meta name="apple-mobile-web-app-title" content="PokaPlayer"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="icon" type="image/png" href="/img/icons/android-chrome-512x512.png"><link rel="apple-touch-icon" sizes="512x512" href="/img/icons/apple-touch-icon.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/icons/apple-touch-icon-120x120.png"><link href="/img/splashscreens/iphone5_splash.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphone6_splash.png" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphoneplus_splash.png" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonex_splash.png" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonexr_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonexsmax_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipad_splash.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro1_splash.png" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro3_splash.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro2_splash.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><title>PokaPlayer</title><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Heebo&family=Noto+Sans+JP:wght@400;700&family=Noto+Sans+TC:wght@400;700&family=Georama:wght@200;400;700&display=swap" rel="stylesheet"><link rel="stylesheet" href="//fonts.googleapis.com/css?family=Product+Sans|Ubuntu+Mono&display=swap"><link rel="stylesheet" href="https://res.cloudinary.com/dr6lvwubh/raw/upload/v1581441981/Anicons/anicons-regular.css"><link href="https://unpkg.com/[email protected]/css/boxicons.min.css" rel="stylesheet"><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/es5/seamless.auto-polyfill.min.js" data-seamless></script><link href="/css/chunk-b8a804c8.2f781aa3.css" rel="prefetch"><link href="/css/chunk-dd345c24.150e9938.css" rel="prefetch"><link href="/css/setting-admin.f59baf5b.css" rel="prefetch"><link href="/css/setting.aae77af4.css" rel="prefetch"><link href="/js/chunk-b8a804c8.e498c5bd.js" rel="prefetch"><link href="/js/chunk-dd345c24.ad0a4c0d.js" rel="prefetch"><link href="/js/setting-admin.a7599abc.js" rel="prefetch"><link href="/js/setting.60f989d3.js" rel="prefetch"><link href="/css/app.04488c67.css" rel="preload" as="style"><link href="/css/chunk-vendors.7ed6c5a4.css" rel="preload" as="style"><link href="/js/app.4eb1706d.js" rel="preload" as="script"><link href="/js/chunk-vendors.d5d978d4.js" rel="preload" as="script"><link href="/css/chunk-vendors.7ed6c5a4.css" rel="stylesheet"><link href="/css/app.04488c67.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="pokaplayerfrontend"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but PokaPlayer doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>PokaPlayer 需要啟用 JavaScript 才能正常運作。</strong></noscript><div id="app"><div class="start_container"><img src="/img/icons/icon.svg" style="height: 128px"><h1 style="font-family: 'Product Sans';">PokaPlayer</h1></div><style>.start_container {
+<!DOCTYPE html><html color-scheme="dim"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name="apple-touch-fullscreen" content="yes"><meta name="apple-mobile-web-app-title" content="PokaPlayer"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="icon" type="image/png" href="/img/icons/android-chrome-512x512.png"><link rel="apple-touch-icon" sizes="512x512" href="/img/icons/apple-touch-icon.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/icons/apple-touch-icon-120x120.png"><link href="/img/splashscreens/iphone5_splash.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphone6_splash.png" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphoneplus_splash.png" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonex_splash.png" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonexr_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/iphonexsmax_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipad_splash.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro1_splash.png" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro3_splash.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><link href="/img/splashscreens/ipadpro2_splash.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"><title>PokaPlayer</title><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Heebo&family=Noto+Sans+JP:wght@400;700&family=Noto+Sans+TC:wght@400;700&family=Georama:wght@200;400;700&display=swap" rel="stylesheet"><link rel="stylesheet" href="//fonts.googleapis.com/css?family=Product+Sans|Ubuntu+Mono&display=swap"><link rel="stylesheet" href="https://res.cloudinary.com/dr6lvwubh/raw/upload/v1581441981/Anicons/anicons-regular.css"><link href="https://unpkg.com/[email protected]/css/boxicons.min.css" rel="stylesheet"><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/es5/seamless.auto-polyfill.min.js" data-seamless></script><link href="/css/chunk-b8a804c8.2f781aa3.css" rel="prefetch"><link href="/css/chunk-dd345c24.150e9938.css" rel="prefetch"><link href="/css/setting-admin.f59baf5b.css" rel="prefetch"><link href="/css/setting.aae77af4.css" rel="prefetch"><link href="/js/chunk-b8a804c8.e498c5bd.js" rel="prefetch"><link href="/js/chunk-dd345c24.ad0a4c0d.js" rel="prefetch"><link href="/js/setting-admin.a7599abc.js" rel="prefetch"><link href="/js/setting.60f989d3.js" rel="prefetch"><link href="/css/app.419244e1.css" rel="preload" as="style"><link href="/css/chunk-vendors.7ed6c5a4.css" rel="preload" as="style"><link href="/js/app.de18db80.js" rel="preload" as="script"><link href="/js/chunk-vendors.d5d978d4.js" rel="preload" as="script"><link href="/css/chunk-vendors.7ed6c5a4.css" rel="stylesheet"><link href="/css/app.419244e1.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="pokaplayerfrontend"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but PokaPlayer doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>PokaPlayer 需要啟用 JavaScript 才能正常運作。</strong></noscript><div id="app"><div class="start_container"><img src="/img/icons/icon.svg" style="height: 128px"><h1 style="font-family: 'Product Sans';">PokaPlayer</h1></div><style>.start_container {
 				text-align: center;
 				margin-top: 25vh
 			}
@@ -8,4 +8,4 @@
 					background: #2f2b3e;
 					color: #FFF;
 				}
-			}</style></div><div id="player" style="display: none;"></div><script src="//cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"></script><script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.3/socket.io.min.js"></script><script src="/js/chunk-vendors.d5d978d4.js"></script><script src="/js/app.4eb1706d.js"></script></body></html>
+			}</style></div><div id="player" style="display: none;"></div><script src="//cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"></script><script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.3/socket.io.min.js"></script><script src="/js/chunk-vendors.d5d978d4.js"></script><script src="/js/app.de18db80.js"></script></body></html>
diff --git a/public/js/app.4eb1706d.js b/public/js/app.4eb1706d.js
diff --git a/public/js/app.4eb1706d.js.map b/public/js/app.4eb1706d.js.map
diff --git a/public/js/app.de18db80.js b/public/js/app.de18db80.js
diff --git a/public/js/app.de18db80.js.map b/public/js/app.de18db80.js.map
diff --git a/...ifest.d68752ac4e8b14196df9904666d540ea.js → ...ifest.7bc41e4019cb4373458dbfa3063b9c86.js b/...ifest.d68752ac4e8b14196df9904666d540ea.js → ...ifest.7bc41e4019cb4373458dbfa3063b9c86.js
@@ -1,11 +1,11 @@
 self.__precacheManifest = [
   {
-    "revision": "c8dffb77d43205f5e33e",
-    "url": "/css/app.04488c67.css"
+    "revision": "903fc111a46cb4c8a648",
+    "url": "/css/app.419244e1.css"
   },
   {
-    "revision": "c8dffb77d43205f5e33e",
-    "url": "/js/app.4eb1706d.js"
+    "revision": "903fc111a46cb4c8a648",
+    "url": "/js/app.de18db80.js"
   },
   {
     "revision": "354dfbe294ef4030426e",
@@ -48,21 +48,21 @@ self.__precacheManifest = [
     "url": "/js/setting-admin.a7599abc.js"
   },
   {
-    "revision": "1caa7190fe7d6c186d0cb0900ce744ff",
+    "revision": "abda8fb6e651e3afbd857c20f634dd5a",
     "url": "/index.html"
   },
   {
     "revision": "2b6acf0d036c6749ead7731790621868",
     "url": "/img/hqPlaylist.png"
   },
-  {
-    "revision": "0dbaf805763d1e22f9c0a262a8e20903",
-    "url": "/img/dailyRecommendSongs.png"
-  },
   {
     "revision": "5f1292b57cedad9cca119d3326c01ac2",
     "url": "/img/dailyRecommendPlaylists.png"
   },
+  {
+    "revision": "0dbaf805763d1e22f9c0a262a8e20903",
+    "url": "/img/dailyRecommendSongs.png"
+  },
   {
     "revision": "f6aebc3ee57feb127891f68d0b3f44f4",
     "url": "/img/loginHeader.svg"
@@ -79,14 +79,14 @@ self.__precacheManifest = [
     "revision": "aab8fae5732e190d7e0b2b52bb77e7fc",
     "url": "/img/playlist.psd"
   },
-  {
-    "revision": "06387036315d4a6830c5462562b15133",
-    "url": "/img/pwa/playlist.png"
-  },
   {
     "revision": "14127602e1dbdd8a42485579450c1801",
     "url": "/img/pwa/shuffle.png"
   },
+  {
+    "revision": "06387036315d4a6830c5462562b15133",
+    "url": "/img/pwa/playlist.png"
+  },
   {
     "revision": "31f437d1172743a0330439681d0cf2b2",
     "url": "/img/pwa/pwa_shortcuts.psd"
@@ -111,34 +111,30 @@ self.__precacheManifest = [
     "revision": "35b6cf131562d21081a90a784f879b19",
     "url": "/img/splashscreens/ipadpro2_splash.png"
   },
-  {
-    "revision": "f2d3ff48a22d9bb54508e0f520b6441d",
-    "url": "/img/splashscreens/iphone5_splash.png"
-  },
   {
     "revision": "6e7952c76307631bb228063e249d9c4a",
     "url": "/img/splashscreens/iphone6_splash.png"
   },
   {
-    "revision": "b5011363a9bbaf722e223d41fc23f865",
-    "url": "/img/splashscreens/iphonexr_splash.png"
+    "revision": "f2d3ff48a22d9bb54508e0f520b6441d",
+    "url": "/img/splashscreens/iphone5_splash.png"
+  },
+  {
+    "revision": "f8b2c6d67c3707610f3c2ad4285af48a",
+    "url": "/img/splashscreens/iphoneplus_splash.png"
   },
   {
     "revision": "ddface7d19acc6fa50ddea328d4a8037",
     "url": "/img/splashscreens/iphonex_splash.png"
   },
   {
-    "revision": "f8b2c6d67c3707610f3c2ad4285af48a",
-    "url": "/img/splashscreens/iphoneplus_splash.png"
+    "revision": "b5011363a9bbaf722e223d41fc23f865",
+    "url": "/img/splashscreens/iphonexr_splash.png"
   },
   {
     "revision": "872c2998f0ea8d5f27cfd2916af1ffd4",
     "url": "/img/splashscreens/iphonexsmax_splash.png"
   },
-  {
-    "revision": "b6216d61c03e6ce0c9aea6ca7808f7ca",
-    "url": "/robots.txt"
-  },
   {
     "revision": "f10254a806d67417a6d0fb0062bb2b94",
     "url": "/README.md"
@@ -150,5 +146,9 @@ self.__precacheManifest = [
   {
     "revision": "d50b11f2b0b92b6fa9bbf1700ea567bf",
     "url": "/img/topPlaylist.png"
+  },
+  {
+    "revision": "b6216d61c03e6ce0c9aea6ca7808f7ca",
+    "url": "/robots.txt"
   }
 ];
diff --git a/public/service-worker.js b/public/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.d68752ac4e8b14196df9904666d540ea.js"
+  "/precache-manifest.7bc41e4019cb4373458dbfa3063b9c86.js"
 );
 
 workbox.core.setCacheNameDetails({prefix: "pokaplayerfrontend"});