fix: videoshot images may be empty

magicdawn · May 11, 2024 · e6e1270 · e6e1270
1 parent 238fb4a
commit e6e1270
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/components/VideoCard/card.service.ts b/src/components/VideoCard/card.service.ts
@@ -1,7 +1,7 @@
-import { HOST_APP } from '$common'
+import { APP_NAME, HOST_APP } from '$common'
 import type { AppRecItem, DmJson, PvideoJson } from '$define'
 import { gmrequest, isWebApiSuccess, request } from '$request'
-import { getCsrfToken } from '$utility'
+import { AntdMessage, getCsrfToken } from '$utility'
 import { toast } from '$utility/toast'
 import QuickLRU from 'quick-lru'
 
@@ -15,7 +15,11 @@ export async function videoshot(bvid: string) {
   })
   const json = res.data as PvideoJson
 
-  // TODO: process errors
+  if (!isWebApiSuccess(json)) {
+    console.warn('[%s] videoshot error for %s: %o', APP_NAME, bvid, json)
+    const msg = `${bvid}: ${json?.message} 错误代码:${json?.code}`
+    AntdMessage.warning(msg)
+  }
 
   return json.data
 }
@@ -50,7 +54,7 @@ export async function fetchVideoData(bvid: string) {
   cache.set(bvid, { videoshotData, dmData })
 
   // load images
-  const imgs = videoshotData.image.slice(0, 3)
+  const imgs = (videoshotData?.image || []).slice(0, 3)
   await Promise.all(
     imgs.map((src) => {
       return new Promise<boolean>((resolve) => {

diff --git a/src/components/VideoCard/index.tsx b/src/components/VideoCard/index.tsx
@@ -557,15 +557,16 @@ const VideoCardInner = memo(function VideoCardInner({
 
               {/* preview */}
               {/* follow-mouse or manual-control */}
-              {(isHoveringAfterDelay || typeof previewProgress === 'number') && (
-                <PreviewImage
-                  videoDuration={duration}
-                  pvideo={videoDataBox.state?.videoshotData}
-                  mouseEnterRelativeX={mouseEnterRelativeX}
-                  previewProgress={previewProgress}
-                  previewT={previewT}
-                />
-              )}
+              {(isHoveringAfterDelay || typeof previewProgress === 'number') &&
+                videoDataBox.state?.videoshotData?.image?.length && (
+                  <PreviewImage
+                    videoDuration={duration}
+                    pvideo={videoDataBox.state?.videoshotData}
+                    mouseEnterRelativeX={mouseEnterRelativeX}
+                    previewProgress={previewProgress}
+                    previewT={previewT}
+                  />
+                )}
 
               {dislikeButtonEl && (
                 <div className='left-actions' css={VideoCardActionStyle.top('left')}>