fix: don't show undefined

JimmyLv · Mar 8, 2023 · 6c8f0bc · 6c8f0bc · vercel · Mar 8, 2023
1 parent 38f1e56
commit 6c8f0bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/lib/bilibili/fetchBilibiliSubtitle.ts b/lib/bilibili/fetchBilibiliSubtitle.ts
@@ -1,10 +1,13 @@
 import { fetchBilibiliSubtitleUrls } from "~/lib/bilibili/fetchBilibiliSubtitleUrls";
 import { reduceBilibiliSubtitleTimestamp } from "~/utils/reduceSubtitleTimestamp";
 
-export async function fetchBilibiliSubtitle(videoId: string, shouldShowTimestamp?: boolean) {
+export async function fetchBilibiliSubtitle(
+  videoId: string,
+  shouldShowTimestamp?: boolean
+) {
   const res = await fetchBilibiliSubtitleUrls(videoId);
   const { title, desc, dynamic } = res || {};
-  const descriptionText = desc + "\n" + dynamic;
+  const descriptionText = desc && dynamic ? `${desc} ${dynamic}` : undefined;
   const subtitleList = res?.subtitle?.list;
   if (!subtitleList || subtitleList?.length < 1) {
     return { title, subtitlesArray: null, descriptionText };
@@ -18,7 +21,10 @@ export async function fetchBilibiliSubtitle(videoId: string, shouldShowTimestamp
 
   const subtitleResponse = await fetch(subtitleUrl);
   const subtitles = await subtitleResponse.json();
-  const transcripts = reduceBilibiliSubtitleTimestamp(subtitles?.body, shouldShowTimestamp);
+  const transcripts = reduceBilibiliSubtitleTimestamp(
+    subtitles?.body,
+    shouldShowTimestamp
+  );
   return { title, subtitlesArray: transcripts, descriptionText };
 }
 

diff --git a/lib/bilibili/fetchBilibiliSubtitleUrls.ts b/lib/bilibili/fetchBilibiliSubtitleUrls.ts
@@ -20,6 +20,6 @@ export const fetchBilibiliSubtitleUrls = async (bvId: string) => {
   });
   const json = await response.json();
   // return json.data.View;
-  console.log('========response========', json)
+  // { code: -404, message: '啥都木有', ttl: 1 }
   return json.data;
 };
diff --git a/lib/youtube/fetchYoutubeSubtitle.ts b/lib/youtube/fetchYoutubeSubtitle.ts
@@ -1,6 +1,6 @@
 import { fetchYoutubeSubtitleUrls, SUBTITLE_DOWNLOADER_URL } from "~/lib/youtube/fetchYoutubeSubtitleUrls";
 import { find } from "~/utils/fp";
-import { reduceSubtitleTimestamp, reduceYoutubeSubtitleTimestamp } from "~/utils/reduceSubtitleTimestamp";
+import { reduceYoutubeSubtitleTimestamp } from "~/utils/reduceSubtitleTimestamp";
 
 export async function fetchYoutubeSubtitle(
   videoId: string,