Merge pull request #12 from festoney8/dev

merge dev to main
festoney8 · Jan 3, 2024 · 0a1c763 · 0a1c763
2 parents 42b58a3 + 6a55cc5
commit 0a1c763
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,10 +3,11 @@
 ## 2.2.2
 
 -   新增：顶栏 稍后再看相关选项
--   新增：评论区规则、净化分享适配稍后再看页面、收藏夹页面
+-   新增：评论区规则、净化分享、视频列表、直角化 适配playlist(稍后再看/收藏夹)
 -   优化：首页 隐藏下载桌面端弹窗 改为默认开启
 -   优化：全屏下隐藏弹幕输入框，完整展示章节名
 -   优化：用户开启开关时执行功能函数
+-   优化：功能名称
 -   修复：视频列表增加高度
 
 ## 2.2.1

diff --git a/src/pages/bangumi.ts b/src/pages/bangumi.ts
@@ -51,11 +51,11 @@ const bangumiSimpleShare = () => {
 if (location.href.startsWith('https://www.bilibili.com/bangumi/play/')) {
     // 基本功能part, basicItems
     {
-        // 净化分享功能, 默认开启
+        // 净化分享功能, 默认开启, 关闭功能需刷新
         basicItems.push(
             new NormalItem(
                 'video-page-simple-share',
-                '净化分享功能 (需刷新)',
+                '净化分享功能',
                 true,
                 bangumiSimpleShare,
                 false,
@@ -450,7 +450,7 @@ if (location.href.startsWith('https://www.bilibili.com/bangumi/play/')) {
                 }
                 .bpx-player-container[data-screen=full] .bpx-player-control-bottom-center,
                 .bpx-player-container[data-screen=web] .bpx-player-control-bottom-center {
-                    padding: 0 0 !important;
+                    padding: 0 15px !important;
                 }
                 /* 弹幕开关按钮贴紧左侧, 有章节列表时增大列表宽度 */
                 .bpx-player-container[data-screen=full] .bpx-player-control-bottom-left,

diff --git a/src/pages/common.ts b/src/pages/common.ts
@@ -187,6 +187,11 @@ if (host === 't.bilibili.com') {
             .van-popover,
             .v-popover,
             .pic-box,
+            .action-list-container,
+            .actionlist-item-inner .main .cover,
+            .recommend-video-card .card-box .pic-box,
+            .recommend-video-card .card-box .pic-box .rcmd-cover .rcmd-cover-img .b-img__inner img,
+            .actionlist-item-inner .main .cover .cover-img .b-img__inner img,
             .card-box .pic-box .pic,
             .bui-collapse-header,
             .base-video-sections-v1,
@@ -339,9 +344,9 @@ if (host === 't.bilibili.com') {
         ),
     )
 
-    // URL参数净化, 在urlchange时需重载, 默认开启
+    // URL参数净化, 在urlchange时需重载, 默认开启, 关闭功能需刷新
     // 以前会出现URL缺少参数导致充电窗口载入失败报错NaN的bug, 现无法复现, 猜测已修复
-    basicItems.push(new NormalItem('url-cleaner', 'URL参数净化 (需刷新)', true, cleanURL, true, null))
+    basicItems.push(new NormalItem('url-cleaner', 'URL参数净化', true, cleanURL, true, null))
 }
 commonGroupList.push(new Group('common-basic', '全站通用项 基本功能', basicItems))
 // 通用header净化，直播页除外

diff --git a/src/pages/homepage.ts b/src/pages/homepage.ts
@@ -452,7 +452,7 @@ if (location.href.startsWith('https://www.bilibili.com/') && ['/index.html', '/'
             ),
         )
     }
-    homepageGroupList.push(new Group('homepage-sidebar', '页面右下角', sidebarItems))
+    homepageGroupList.push(new Group('homepage-sidebar', '页面右下角 小按钮', sidebarItems))
 
     // bilibili-app-recommend插件part, biliAppRcmdItems
     {

diff --git a/src/pages/video.ts b/src/pages/video.ts
@@ -117,13 +117,13 @@ if (
 ) {
     // 基本功能part, basicItems
     {
-        // BV号转AV号, 在url变化时需重载
-        basicItems.push(new NormalItem('video-page-bv2av', 'BV号转AV号 (需刷新)', false, bv2av, true, null))
-        // 净化分享, 默认开启
+        // BV号转AV号, 在url变化时需重载, 关闭功能需刷新
+        basicItems.push(new NormalItem('video-page-bv2av', 'BV号转AV号', false, bv2av, true, null))
+        // 净化分享, 默认开启, 关闭功能需刷新
         basicItems.push(
             new NormalItem(
                 'video-page-simple-share',
-                '净化分享功能 (需刷新)',
+                '净化分享功能',
                 true,
                 simpleShare,
                 false,
@@ -695,7 +695,7 @@ if (
                 }
                 .bpx-player-container[data-screen=full] .bpx-player-control-bottom-center,
                 .bpx-player-container[data-screen=web] .bpx-player-control-bottom-center {
-                    padding: 0 0 !important;
+                    padding: 0 15px !important;
                 }
                 /* 弹幕开关按钮贴紧左侧, 有章节列表时增大列表宽度 */
                 .bpx-player-container[data-screen=full] .bpx-player-control-bottom-left,
@@ -997,15 +997,17 @@ if (
                 `#multi_page .next-button {display: none !important;}`,
             ),
         )
-        // 隐藏 视频时长
+        // 隐藏 相关视频 视频时长
         rightItems.push(
             new NormalItem(
                 'video-page-hide-right-container-duration',
                 '隐藏 相关视频 视频时长',
                 false,
                 undefined,
                 false,
-                `#reco_list .duration {display: none !important;}`,
+                `#reco_list .duration {display: none !important;}
+                /* 适配watchlater, favlist */
+                .recommend-list-container .duration {display: none !important;}`,
             ),
         )
         // 隐藏 相关视频 稍后再看按钮
@@ -1016,7 +1018,9 @@ if (
                 false,
                 undefined,
                 false,
-                `#reco_list .watch-later-video {display: none !important;}`,
+                `#reco_list .watch-later-video {display: none !important;}
+                /* 适配watchlater, favlist */
+                .recommend-list-container .watch-later-video {display: none !important;}`,
             ),
         )
         // 隐藏 相关视频 UP主
@@ -1034,6 +1038,15 @@ if (
                     display: flex;
                     flex-direction: column;
                     justify-content: space-between;
+                }
+                /* 适配watchlater, favlist */
+                .recommend-list-container .info .upname {
+                    display: none !important;
+                }
+                .recommend-list-container .info {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: space-between;
                 }`,
             ),
         )
@@ -1052,18 +1065,29 @@ if (
                     display: flex;
                     flex-direction: column;
                     justify-content: space-between;
+                }
+                /* 适配watchlater, favlist */
+                .recommend-list-container .info .playinfo {
+                    display: none !important;
+                }
+                .recommend-list-container .info {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: space-between;
                 }`,
             ),
         )
-        // 隐藏 全部相关视频
+        // 隐藏 相关视频 全部列表
         rightItems.push(
             new NormalItem(
                 'video-page-hide-right-container-reco-list-rec-list',
-                '隐藏 全部相关视频',
+                '隐藏 相关视频 全部列表',
                 false,
                 undefined,
                 false,
-                `#reco_list .rec-list {display: none !important;}`,
+                `#reco_list .rec-list {display: none !important;}
+                /* 适配watchlater, favlist */
+                .recommend-list-container {display: none !important;}`,
             ),
         )
         // 隐藏 活动banner, 默认开启
@@ -1458,7 +1482,9 @@ if (
                 false,
                 undefined,
                 false,
-                `.fixed-sidenav-storage .mini-player-window {display: none !important;}`,
+                `.fixed-sidenav-storage .mini-player-window {display: none !important;}
+                /* 适配watchlater, favlist */
+                .float-nav-exp .nav-menu .item.mini {display: none !important;}`,
             ),
         )
         // 隐藏 客服, 默认开启
@@ -1469,7 +1495,9 @@ if (
                 true,
                 undefined,
                 false,
-                `.fixed-sidenav-storage .customer-service {display: none !important;}`,
+                `.fixed-sidenav-storage .customer-service {display: none !important;}
+                /* 适配watchlater, favlist */
+                .float-nav-exp .nav-menu a:has(>.item.help) {display: none !important;}`,
             ),
         )
         // 隐藏 回顶部
@@ -1480,7 +1508,9 @@ if (
                 false,
                 undefined,
                 false,
-                `.fixed-sidenav-storage .back-to-top {display: none !important;}`,
+                `.fixed-sidenav-storage .back-to-top {display: none !important;}
+                /* 适配watchlater, favlist */
+                .float-nav-exp .nav-menu .item.backup {display: none !important;}`,
             ),
         )
     }