Merge pull request #29 from festoney8/dev

merge dev to main, v3.1.1
festoney8 · Feb 1, 2024 · 8b75f27 · 8b75f27
2 parents 9bd7ef4 + 5eaa415
commit 8b75f27
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 3.1.1
+
+-   新增：播放页 隐藏播放器视频播放效果调查
+-   修复：BV号转AV号可能的溢出问题
+
 ## 3.1.0
 
 -   新增：视频过滤支持搜索页

diff --git a/src/global.d.ts b/src/global.d.ts
@@ -5,5 +5,9 @@ export declare global {
         isWide?: boolean
         hasBlackSide?: boolean
         setSize?: function
+        vd?: {
+            aid?: number
+            bvid?: string
+        }
     }
 }
diff --git a/src/rules/video.ts b/src/rules/video.ts
@@ -7,6 +7,7 @@ import { isPagePlaylist, isPageVideo } from '../utils/page-type'
 /** BV号转AV号 */
 const bv2av = () => {
     /**
+     * 可能会出现转换后av号带短横的bug(溢出)，作为后备方案
      * bv2av algo by mcfx
      * @see https://www.zhihu.com/question/381784377/answer/1099438784
      * @param x 输入BV号
@@ -25,7 +26,14 @@ const bv2av = () => {
         for (let i = 0; i < 6; i++) {
             r += tr[x[s[i]]] * 58 ** i
         }
-        return (r - add) ^ xor
+        // 修复一下溢出
+        const aid = (r - add) ^ xor
+        return aid > 0 ? aid : aid + 2147483648
+    }
+
+    // 从window对象获取avid
+    const getAid = (): number | undefined => {
+        return window.vd?.aid
     }
 
     if (location.href.includes('bilibili.com/video/BV')) {
@@ -37,7 +45,7 @@ const bv2av = () => {
             if (params.has('p')) {
                 partNum += `?p=${params.get('p')}`
             }
-            const aid = dec(bvid)
+            const aid = getAid() ?? dec(bvid)
             const newURL = `https://www.bilibili.com/video/av${aid}${partNum}${location.hash}`
             history.replaceState(null, '', newURL)
             debug('bv2av complete')
@@ -281,6 +289,13 @@ if (isPageVideo() || isPagePlaylist()) {
             description: '隐藏 投票弹窗',
             itemCSS: `.bpx-player-video-area .bili-vote, .bpx-player-video-area .bili-cmd-shrink {display: none !important;}`,
         }),
+        // 隐藏 播放效果调查, 默认开启
+        new CheckboxItem({
+            itemID: 'video-page-hide-bpx-player-bili-qoe-feedback',
+            description: '隐藏 播放效果调查',
+            defaultStatus: true,
+            itemCSS: `.bpx-player-video-area .bili-qoeFeedback {display: none !important;}`,
+        }),
         // 隐藏 评分弹窗
         new CheckboxItem({
             itemID: 'video-page-hide-bpx-player-bili-score',

diff --git a/vite.config.ts b/vite.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
             userscript: {
                 name: 'bilibili 页面净化大师',
                 namespace: 'http://tampermonkey.net/',
-                version: '3.1.0',
+                version: '3.1.1',
                 description:
                     '净化 B站/哔哩哔哩 网页元素，去广告，URL净化，BV号转AV号，播放器净化，过滤推荐视频，提供300+项功能，定制自己的B站页面',
                 author: 'festoney8',