merge dev to main, v4.0.7 (#171)

festoney8 · Nov 4, 2024 · f96e3ce · f96e3ce
2 parents 7c72861 + 8543c42
commit f96e3ce
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 117 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -48,7 +48,7 @@ body:
     id: env_os
     attributes:
       label: 操作系统
-      placeholder: 如 Win10 / Win11 / MacOS
+      placeholder: 如 Windows 10 / Windows 11 / MacOS
     validations:
       required: true
 
@@ -108,7 +108,7 @@ body:
   - type: dropdown
     id: check_plugin_conflict
     attributes:
-      label: 禁用掉对 B 站生效的浏览器插件后，仍出现问题
+      label: 禁用掉对 B 站生效的其他浏览器插件（不含暴力猴/篡改猴），仍出现问题
       options:
         - 是
         - 否

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 4.0.7
+
+-   新增：首页 按播放量过滤
+-   修复：番剧页 全屏滚动视频位置问题
+
 ## 4.0.6
 
 -   更新：播放页 播放器宽度调节相关样式

diff --git a/src/modules/filters/variety/comment/pages/dynamic.ts b/src/modules/filters/variety/comment/pages/dynamic.ts
@@ -458,7 +458,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.username.statusKey,
                 name: '启用 评论用户过滤 (右键单击用户名)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentUsernameFilter.enable()
@@ -492,7 +491,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.content.statusKey,
                 name: '启用 评论关键词过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentContentFilter.enable()
@@ -527,7 +525,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callBot.statusKey,
                 name: '过滤 召唤AI的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallBotFilter.enable()
@@ -542,7 +539,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.bot.statusKey,
                 name: '过滤 AI发布的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentBotFilter.enable()
@@ -557,7 +553,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.isAD.statusKey,
                 name: '过滤 带货评论 (实验功能)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     fetchHook.addPostFn(
@@ -599,7 +594,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUserOnly.statusKey,
                 name: '过滤 只含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserOnlyFilter.enable()
@@ -614,7 +608,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUser.statusKey,
                 name: '过滤 包含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserFilter.enable()
@@ -634,7 +627,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.level.statusKey,
                 name: '启用 用户等级过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentLevelFilter.enable()
@@ -668,7 +660,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.root.statusKey,
                 name: '一级评论(主评论) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isRootWhite = true
@@ -683,7 +674,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.sub.statusKey,
                 name: '二级评论(回复) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isSubWhite = true
@@ -698,7 +688,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isUp.statusKey,
                 name: 'UP主的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsUpFilter.enable()
@@ -713,7 +702,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isPin.statusKey,
                 name: '置顶评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsPinFilter.enable()
@@ -728,7 +716,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isNote.statusKey,
                 name: '笔记/图片评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsNoteFilter.enable()
@@ -743,7 +730,6 @@ export const commentFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isLink.statusKey,
                 name: '含超链接的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsLinkFilter.enable()

diff --git a/src/modules/filters/variety/comment/pages/space.ts b/src/modules/filters/variety/comment/pages/space.ts
@@ -413,7 +413,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.username.statusKey,
                 name: '启用 评论用户过滤 (右键单击用户名)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentUsernameFilter.enable()
@@ -447,7 +446,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.content.statusKey,
                 name: '启用 评论关键词过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentContentFilter.enable()
@@ -482,7 +480,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callBot.statusKey,
                 name: '过滤 召唤AI的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallBotFilter.enable()
@@ -497,7 +494,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.bot.statusKey,
                 name: '过滤 AI发布的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentBotFilter.enable()
@@ -512,7 +508,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.isAD.statusKey,
                 name: '过滤 带货评论 (实验功能)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     fetchHook.addPostFn(
@@ -554,7 +549,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUserOnly.statusKey,
                 name: '过滤 只含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserOnlyFilter.enable()
@@ -569,7 +563,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUser.statusKey,
                 name: '过滤 包含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserFilter.enable()
@@ -589,7 +582,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.level.statusKey,
                 name: '启用 用户等级过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentLevelFilter.enable()
@@ -623,7 +615,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.root.statusKey,
                 name: '一级评论(主评论) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isRootWhite = true
@@ -638,7 +629,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.sub.statusKey,
                 name: '二级评论(回复) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isSubWhite = true
@@ -653,7 +643,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isUp.statusKey,
                 name: 'UP主的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsUpFilter.enable()
@@ -668,7 +657,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isPin.statusKey,
                 name: '置顶评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsPinFilter.enable()
@@ -683,7 +671,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isNote.statusKey,
                 name: '笔记/图片评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsNoteFilter.enable()
@@ -698,7 +685,6 @@ export const commentFilterSpaceGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isLink.statusKey,
                 name: '含超链接的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsLinkFilter.enable()

diff --git a/src/modules/filters/variety/comment/pages/video.ts b/src/modules/filters/variety/comment/pages/video.ts
@@ -466,7 +466,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.username.statusKey,
                 name: '启用 评论用户过滤 (右键单击用户名)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentUsernameFilter.enable()
@@ -500,7 +499,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.content.statusKey,
                 name: '启用 评论关键词过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentContentFilter.enable()
@@ -535,7 +533,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callBot.statusKey,
                 name: '过滤 召唤AI的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallBotFilter.enable()
@@ -550,7 +547,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.bot.statusKey,
                 name: '过滤 AI发布的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentBotFilter.enable()
@@ -565,7 +561,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.isAD.statusKey,
                 name: '过滤 带货评论 (实验功能)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     fetchHook.addPostFn(
@@ -607,7 +602,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUserOnly.statusKey,
                 name: '过滤 只含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserOnlyFilter.enable()
@@ -622,7 +616,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.callUser.statusKey,
                 name: '过滤 包含 @其他用户 的评论',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentCallUserFilter.enable()
@@ -642,7 +635,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.level.statusKey,
                 name: '启用 用户等级过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentLevelFilter.enable()
@@ -676,7 +668,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.root.statusKey,
                 name: '一级评论(主评论) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isRootWhite = true
@@ -691,7 +682,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.sub.statusKey,
                 name: '二级评论(回复) 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     isSubWhite = true
@@ -706,7 +696,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isUp.statusKey,
                 name: 'UP主的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsUpFilter.enable()
@@ -721,7 +710,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isPin.statusKey,
                 name: '置顶评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsPinFilter.enable()
@@ -736,7 +724,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isNote.statusKey,
                 name: '笔记/图片评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsNoteFilter.enable()
@@ -751,7 +738,6 @@ export const commentFilterVideoGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.white.isLink.statusKey,
                 name: '含超链接的评论 免过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.commentIsLinkFilter.enable()

diff --git a/src/modules/filters/variety/dynamic/pages/dynamic.ts b/src/modules/filters/variety/dynamic/pages/dynamic.ts
@@ -195,7 +195,6 @@ export const dynamicFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.uploader.statusKey,
                 name: '启用 动态发布人过滤 (右键单击用户名)',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.dynUploaderFilter.enable()
@@ -227,7 +226,6 @@ export const dynamicFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.duration.statusKey,
                 name: '启用 时长过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.dynDurationFilter.enable()
@@ -262,7 +260,6 @@ export const dynamicFilterDynamicGroups: Group[] = [
                 type: 'switch',
                 id: GM_KEYS.black.title.statusKey,
                 name: '启用 标题关键词过滤',
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.dynVideoTitleFilter.enable()
@@ -298,7 +295,6 @@ export const dynamicFilterDynamicGroups: Group[] = [
                 id: GM_KEYS.black.content.statusKey,
                 name: '启用 动态内容关键词过滤',
                 description: ['包含被转发动态内容', '不含动态内视频信息'],
-                defaultEnable: false,
                 noStyle: true,
                 enableFn: () => {
                     mainFilter.dynContentFilter.enable()