Merge pull request #104 from festoney8/dev

merge dev to main, v3.8.2

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 3.8.2
+
+-   修复：直播页 弹幕列表高度bug
+-   修复：过滤器免过滤功能禁用失效bug
+-   新增：直播页 隐藏互动投票
+
 ## 3.8.1
 
 -   新增：播放页 禁用新版评论区灰度测试(临时功能)

src/filters/commentFilter/pages/dynamic.ts

@@ -17,10 +17,10 @@ let isContextMenuUsernameEnable = false
 // 白名单功能开关
 let isRootCommentWhitelistEnable = false
 let isSubCommentWhitelistEnable = false
-let isUploaderCommentWhitelistEnable = true
-let isPinnedCommentWhitelistEnable = true
-let isNoteCommentWhitelistEnable = true
-let isLinkCommentWhitelistEnable = true
+let isUploaderCommentWhitelistEnable = false
+let isPinnedCommentWhitelistEnable = false
+let isNoteCommentWhitelistEnable = false
+let isLinkCommentWhitelistEnable = false
 
 if (isPageDynamic()) {
     let commentListContainer: HTMLElement

src/filters/commentFilter/pages/video.ts

@@ -17,10 +17,10 @@ let isContextMenuUsernameEnable = false
 // 白名单功能开关
 let isRootCommentWhitelistEnable = false
 let isSubCommentWhitelistEnable = false
-let isUploaderCommentWhitelistEnable = true
-let isPinnedCommentWhitelistEnable = true
-let isNoteCommentWhitelistEnable = true
-let isLinkCommentWhitelistEnable = true
+let isUploaderCommentWhitelistEnable = false
+let isPinnedCommentWhitelistEnable = false
+let isNoteCommentWhitelistEnable = false
+let isLinkCommentWhitelistEnable = false
 
 if (isPageVideo() || isPageBangumi() || isPagePlaylist()) {
     let commentListContainer: HTMLElement

src/filters/videoFilter/pages/homepage.ts

@@ -22,8 +22,8 @@ const homepagePageVideoFilterGroupList: Group[] = []
 let isContextMenuFuncRunning = false
 let isContextMenuUploaderEnable = false
 let isContextMenuBvidEnable = false
-// 带已关注tag的视频不被过滤
-let isFollowingWhitelistEnable = true
+// 带已关注tag的视频是否免过滤
+let isFollowingWhitelistEnable = false
 
 if (isPageHomepage()) {
     let videoListContainer: HTMLElement

src/filters/videoFilter/pages/search.ts

@@ -21,8 +21,8 @@ const searchPageVideoFilterGroupList: Group[] = []
 let isContextMenuFuncRunning = false
 let isContextMenuUploaderEnable = false
 let isContextMenuBvidEnable = false
-// 推荐位UP主视频的不被过滤，默认开启
-let isTopUploaderWhitelistEnable = true
+// 推荐位UP主视频是否免过滤
+let isTopUploaderWhitelistEnable = false
 
 if (isPageSearch()) {
     let videoListContainer: HTMLElement

src/filters/videoFilter/pages/video.ts

@@ -22,9 +22,10 @@ let isContextMenuFuncRunning = false
 let isContextMenuUploaderEnable = false
 let isContextMenuBvidEnable = false
 // 接下来播放是否免过滤
-let isNextPlayWhitelistEnable = true
+let isNextPlayWhitelistEnable = false
 // 视频结束后播放器内推荐是否免过滤
-let isEndingWhitelistEnable = true
+let isEndingWhitelistEnable = false
+
 if (isPageVideo() || isPagePlaylist()) {
     let videoListContainer: HTMLElement
     // 构建SelectorFunc

src/rules/common.ts

@@ -663,7 +663,10 @@ if (!isPageLiveHome()) {
                     display: none !important;
                 }
                 /* 旧版header */
-                #internationalHeader li.nav-link-item:has(.loc-mc-box, span>a[href*="bilibili.com/blackboard"]) {
+                #internationalHeader .nav-link-item:has(.loc-mc-box, span>a[href*="bilibili.com/blackboard"]) {
+                    display: none !important;
+                }
+                #internationalHeader .nav-link-item:has(.loc-mc-box, span>a[href*="www.bilibili.com/bangumi/play/ss"]) {
                     display: none !important;
                 }`,
         }),

src/rules/live.ts

@@ -157,11 +157,20 @@ if (isPageLiveRoom()) {
             itemID: 'activity-live-auto-jump',
             description: '活动直播页 自动跳转普通直播 (实验功能)',
             enableFunc: async () => {
-                if (document.querySelector('.rendererRoot')) {
-                    if (!location.href.includes('/blanc/')) {
-                        window.location.href = location.href.replace('live.bilibili.com/', 'live.bilibili.com/blanc/')
+                let cnt = 0
+                const id = setInterval(() => {
+                    if (document.querySelector('.rendererRoot, #internationalHeader')) {
+                        if (!location.href.includes('/blanc/')) {
+                            window.location.href = location.href.replace(
+                                'live.bilibili.com/',
+                                'live.bilibili.com/blanc/',
+                            )
+                            clearInterval(id)
+                        }
                     }
-                }
+                    cnt++
+                    cnt > 50 && clearInterval(id)
+                }, 200)
             },
             enableFuncRunAt: 'document-end',
         }),
@@ -503,7 +512,7 @@ if (isPageLiveRoom()) {
             description: '隐藏 互动框 (倒计时互动)',
             defaultStatus: true,
             itemCSS: `#combo-card:has(.countDownBtn) {display: none !important;}
-                    .chat-history-panel.new {padding-bottom: 0 !important;}`,
+                    .chat-history-panel {padding-bottom: 0 !important;}`,
         }),
         // 隐藏 互动框 (他们都在说), 默认开启
         new CheckboxItem({
@@ -519,6 +528,13 @@ if (isPageLiveRoom()) {
             defaultStatus: true,
             itemCSS: `.play-together-service-card-container {display: none !important;}`,
         }),
+        // 隐藏 互动框 投票, 默认开启
+        new CheckboxItem({
+            itemID: 'live-page-vote-card',
+            description: '隐藏 互动框 投票',
+            defaultStatus: true,
+            itemCSS: `.vote-card {display: none !important;}`,
+        }),
         // 隐藏 发送框 左侧功能按钮
         new CheckboxItem({
             itemID: 'live-page-control-panel-icon-row-left',
@@ -602,7 +618,7 @@ if (isPageLiveRoom()) {
                 #chat-control-panel-vm {
                     display: none !important;
                 }
-                .chat-history-panel, .chat-history-panel.new {
+                .chat-history-panel {
                     height: calc(100% - var(--rank-list-height, 178px) - var(--chat-control-panel-height, 145px)) !important;
                 }
                 .chat-history-panel .chat-history-list {

src/rules/video.ts

@@ -604,13 +604,15 @@ if (isPageVideo() || isPagePlaylist() || isPageFestival()) {
         new CheckboxItem({
             itemID: 'video-page-hide-bpx-player-bili-guide-all',
             description: '隐藏 一键三连',
-            itemCSS: `.bpx-player-video-area .bili-guide, .bpx-player-video-area .bili-guide-all {display: none !important;}`,
+            itemCSS: `.bpx-player-video-area :is(.bili-guide-all, .bili-guide, .bili-follow-to-electric, .bili-guide-followed) {
+                        display: none !important;
+                    }`,
         }),
         // 隐藏 投票
         new CheckboxItem({
             itemID: 'video-page-hide-bpx-player-bili-vote',
             description: '隐藏 投票',
-            itemCSS: `.bpx-player-video-area .bili-vote, .bpx-player-video-area .bili-cmd-shrink {display: none !important;}`,
+            itemCSS: `.bpx-player-video-area :is(.bili-vote, .bili-cmd-shrink) {display: none !important;}`,
         }),
         // 隐藏 播放效果调查, 默认开启
         new CheckboxItem({
@@ -1588,7 +1590,7 @@ if (isPageVideo() || isPagePlaylist()) {
             description: '禁用 新版评论区灰测 (临时功能)\n评论区功能失效时 开启本项并刷新',
             enableFunc: async () => {
                 let origValue = unsafeWindow.__INITIAL_STATE__
-                if (origValue?.abtest?.comment_next_version) {
+                if (origValue?.abtest) {
                     origValue.abtest.comment_next_version = 'DEFAULT'
                 }
                 Object.defineProperty(unsafeWindow, '__INITIAL_STATE__', {

vite.config.ts

@@ -8,7 +8,7 @@ export default defineConfig({
             userscript: {
                 name: 'bilibili 页面净化大师',
                 namespace: 'http://tampermonkey.net/',
-                version: '3.8.1',
+                version: '3.8.2',
                 description:
                     '净化 B站/哔哩哔哩 页面，支持「精简功能、播放器净化、过滤视频、过滤评论、全站黑白名单」，提供 300+ 功能，定制自己的 B 站',
                 author: 'festoney8',