From d09c5fd171569ec326516dcbce68c291b80b4316 Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Mon, 6 Jun 2022 12:56:24 +0800
Subject: [PATCH] fix: bugs

---
 packages/shared/api/Track.ts                | 2 +-
 packages/web/api/personalFM.ts              | 2 +-
 packages/web/components/New/PlayingNext.tsx | 2 +-
 packages/web/pages/New/Discover.tsx         | 8 ++++----
 packages/web/utils/player.ts                | 8 +++-----
 vercel.json                                 | 3 ++-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/shared/api/Track.ts b/packages/shared/api/Track.ts
index 6df0934..c834948 100644
--- a/packages/shared/api/Track.ts
+++ b/packages/shared/api/Track.ts
@@ -10,7 +10,7 @@ export interface FetchTracksParams {
 }
 export interface FetchTracksResponse {
   code: number
-  songs: Track[]
+  songs?: Track[]
   privileges: {
     [key: string]: unknown
   }
diff --git a/packages/web/api/personalFM.ts b/packages/web/api/personalFM.ts
index 2babc3c..a74493a 100644
--- a/packages/web/api/personalFM.ts
+++ b/packages/web/api/personalFM.ts
@@ -93,7 +93,7 @@ export interface FetchPersonalFMResponse {
 }
 export function fetchPersonalFM(): Promise<FetchPersonalFMResponse> {
   return request({
-    url: '/personal/fm',
+    url: window.ipcRenderer ? '/personal/fm' : '/personal_fm',
     method: 'get',
     params: {
       timestamp: Date.now(),
diff --git a/packages/web/components/New/PlayingNext.tsx b/packages/web/components/New/PlayingNext.tsx
index f7a2004..0f88fc8 100644
--- a/packages/web/components/New/PlayingNext.tsx
+++ b/packages/web/components/New/PlayingNext.tsx
@@ -79,7 +79,7 @@ const PlayingNext = ({ className }: { className?: string }) => {
               </motion.div>
             ))}
 
-            {(tracks?.songs.length || 0) >= 4 && (
+            {(tracks?.songs?.length || 0) >= 4 && (
               <div className='pointer-events-none sticky bottom-0 h-8 w-full bg-gradient-to-t from-black'></div>
             )}
           </AnimatePresence>
diff --git a/packages/web/pages/New/Discover.tsx b/packages/web/pages/New/Discover.tsx
index c72db54..7f5a935 100644
--- a/packages/web/pages/New/Discover.tsx
+++ b/packages/web/pages/New/Discover.tsx
@@ -4,8 +4,8 @@ import {
   fetchPlaylistWithReactQuery,
   fetchFromCache,
 } from '@/web/api/hooks/usePlaylist'
-import useTracks, { fetchTracksWithReactQuery } from '@/web/api/hooks/useTracks'
-import { useEffect, useMemo, useState } from 'react'
+import { fetchTracksWithReactQuery } from '@/web/api/hooks/useTracks'
+import { useEffect, useState } from 'react'
 import { sampleSize } from 'lodash-es'
 import { FetchPlaylistResponse } from '@/shared/api/Playlists'
 
@@ -39,7 +39,7 @@ const getAlbumsFromAPI = async () => {
             resolve(cache)
             return
           }
-          return fetchPlaylistWithReactQuery({ id })
+          resolve(fetchPlaylistWithReactQuery({ id }))
         })
     )
   )) as FetchPlaylistResponse[]
@@ -90,7 +90,7 @@ const Discover = () => {
         localStorage.getItem('discoverAlbumsTime')
       if (
         !albumsInLocalStorageTime ||
-        Date.now() - Number(albumsInLocalStorageTime) > 1000 * 60 * 60 * 2
+        Date.now() - Number(albumsInLocalStorageTime) > 1000 * 60 * 60 * 2 // 2小时刷新一次
       ) {
         setAlbums(await getAlbumsFromAPI())
       } else {
diff --git a/packages/web/utils/player.ts b/packages/web/utils/player.ts
index a2848a7..e3865cd 100644
--- a/packages/web/utils/player.ts
+++ b/packages/web/utils/player.ts
@@ -250,9 +250,7 @@ export class Player {
     }
     if (this.trackID !== id) return
     Howler.unload()
-    const url = audio.includes('?')
-      ? `${audio}&ypm-id=${id}`
-      : `${audio}?ypm-id=${id}`
+    const url = audio.includes('?') ? `${audio}&id=${id}` : `${audio}?id=${id}`
     const howler = new Howl({
       src: [url],
       format: ['mp3', 'flac', 'webm'],
@@ -286,8 +284,8 @@ export class Player {
   }
 
   private _cacheAudio(audio: string) {
-    if (audio.includes('yesplaymusic')) return
-    const id = Number(new URL(audio).searchParams.get('ypm-id'))
+    if (audio.includes('yesplaymusic') || !window.ipcRenderer) return
+    const id = Number(new URL(audio).searchParams.get('id'))
     if (isNaN(id) || !id) return
     cacheAudio(id, audio)
   }
diff --git a/vercel.json b/vercel.json
index ccc658a..3d26fe2 100644
--- a/vercel.json
+++ b/vercel.json
@@ -6,6 +6,7 @@
     {
       "source": "/netease/:match*",
       "destination": "http://168.138.40.199:12835/:match*"
-    }
+    },
+    {"source": "/(.*)", "destination": "/"}
   ]
 }