Fix watchlater redirect (fix #1773)

the1812 · Apr 24, 2021 · 2c67c9e · 2c67c9e
1 parent 77ae983
commit 2c67c9e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/min/watchlater.min.js b/min/watchlater.min.js
diff --git a/src/utils/watchlater.ts b/src/utils/watchlater.ts
@@ -61,18 +61,22 @@ if (settings.watchLaterRedirectPage) {
         return
       }
       const redirect = (item: Element, index: number) => {
-        const watchlaterItem = list[index]
-        const bvid = watchlaterItem.bvid
-        const cid = watchlaterItem.cid
-        const pages = watchlaterItem.pages
-        const page = cid === 0 ? 1 : pages.find(p => p.cid === cid)!.page
-        const url = page > 1 ? `https://www.bilibili.com/video/${bvid}?p=${page}` : `https://www.bilibili.com/video/${bvid}`
-        const pic = item.querySelector('.av-pic') as HTMLAnchorElement
-        pic.target = '_blank'
-        pic.href = url
-        const title = item.querySelector('.av-about .t') as HTMLAnchorElement
-        title.target = '_blank'
-        title.href = url
+        try {
+          const watchlaterItem = list[index]
+          const bvid = watchlaterItem.bvid
+          const cid = watchlaterItem.cid
+          const pages = watchlaterItem.pages
+          const page = pages.find(p => p.cid === cid)?.page ?? 1
+          const url = page > 1 ? `https://www.bilibili.com/video/${bvid}?p=${page}` : `https://www.bilibili.com/video/${bvid}`
+          const pic = item.querySelector('.av-pic') as HTMLAnchorElement
+          pic.target = '_blank'
+          pic.href = url
+          const title = item.querySelector('.av-about .t') as HTMLAnchorElement
+          title.target = '_blank'
+          title.href = url
+        } catch (error) {
+          console.error(`[watchlater redirect] error at index ${index}`, item, error)
+        }
       }
       const runRedirect = () => {
         const avItems = listBox.querySelectorAll('.av-item')