diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4ff1db327..fcc76fc01 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,6 +51,7 @@
"Fullscreen",
"githubusercontent",
"Greasemonkey",
+ "guochuang",
"haruna",
"hdslb",
"HEVC",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17359d6aa..8f6f5b395 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,60 @@
# 更新日志
+## v2.10.1-preview
+`2025-04-09`
+
+包含 [v2.10.1](https://github.com/the1812/Bilibili-Evolved/releases/tag/v2.10.1) 的所有更新内容.
+
+- 新增组件 `一键点亮直播间粉丝勋章`. (PR #5171 by [undefined](https://github.com/magicFeirl))
+> 在直播间页面的功能面板添加一键点亮粉丝勋章功能,仅适用于有粉丝勋章且正在直播的直播间。原理:发送一个 300 次点赞的请求点亮粉丝勋章。
+
+- 新增组件 `下载表情`. (PR #5176 by [Pencil](https://github.com/pencilqaq))
+> 支持下载 up 主专属表情包,处于任意直播间页面时,下载按钮会在 `功能` 面板显示,以压缩包形式保存。
+
+- 新增组件 `视频链接增强`. (PR #5197 by [Alan Ye](https://github.com/at-wr))
+> 这个组件会将视频简介中的普通网址转换为可点击的链接,并将被 Bilibili 抛弃已失效的 `acg.tv` 跳转链接修复为 `nicovideo.jp` 链接。
+>
+> 例如: `https://acg.tv/sm37507315` → `https://www.nicovideo.jp/watch/sm37507315`
+>
+> 本组件不会保证目标链接的安全性,因此在点击前请自行验证其是否可信
+
+- `自定义顶栏` 新增 `使用主题色 Logo` 选项, 关闭时可以使用黑白纯色的 Logo. (#4996)
+- `自定义顶栏` 更新 `游戏中心`, `漫画`, `赛事` 的弹窗, 废弃 `直播` 的弹窗. (#5055)
+
+## v2.10.1
+`2025-04-09`
+
+
+正式版用户将获得 v2.9.6-preview ~ v2.10.0-preview 的所有改动, 点击展开查看
+
+- 新增插件 `自定义顶栏 - 版权内容`. (#5045)
+> 为自定义顶栏扩充版权内容相关的快速入口, 包括国创 / 电影 / 电视剧 /综艺 / 纪录片
+
+- 视频截图在还有截图未处理 (保存 / 丢弃) 时, 离开页面增加二次确认. (#5066)
+- `插件 - 下载视频 - WASM 混流输出` 在超过 4GB 时支持抛出错误提示. (PR #5102 by [WakelessSloth56](https://github.com/WakelessSloth56))
+- `自定义顶栏` 的透明填充在同时开启了全局固定时, 支持下拉后过渡到不透明状态. (#4996)
+- `自定义顶栏` 的弹窗增加了 0.2s 的触发延迟, 防止鼠标快速经过时误触. (#4949)
+- 废弃 `双击全屏` 组件, 本体也不再会屏蔽双击全屏. (#5095)
+
+
+
+✨新增
+- 新增组件 `禁用双击全屏`. (#5095)
+> ⚠ 请注意 `双击全屏` 组件已废弃, 本体也不再会屏蔽双击全屏, 更新后可以直接卸载 `双击全屏` 组件
+
+- `快捷键扩展` 的使用说明增加关于屏蔽 b 站自带快捷键的指南. (#5168)
+- `动态过滤器` 增加 `课程`, `直播`, `合集` 类型. (#5135)
+> 这些类型的支持是根据 b 站代码里的枚举加的, 我的动态里没有这些类型无法测试, 如果还有相关问题请继续在 #5135 中反馈
+
+🐛修复
+- 修复 `快捷键扩展` 在聚焦元素相关的动作中出现失效的情况. (#5150, #5153, #5174)
+- 修复 `启用快速收藏` 在存在和默认收藏夹同名的收藏夹时, 收藏到了错误的收藏夹. (#5151)
+- 修复 `图片批量导出` 在 Firefox 中导出动态图片时出现重复图片. (#5166)
+- 修复 `夜间模式` 导致登录时二维码扫码困难. (#5163, PR #5173 by [Pencil](https://github.com/pencilqaq))
+- 修复 `删除广告` 在搜索页出现的空位. (#5032)
+
+
## v2.10.0-preview
`2025-02-25`
diff --git a/README.md b/README.md
index f0996e674..86839b10d 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
**注意事项**
- **⚠ 使用正式版 (GitHub 源) 和预览版须翻墙.**
-- 默认不预装任何组件, 需要在按[设置](#设置)中的说明添加感兴趣的功能; 默认会屏蔽双击全屏, 如有需要可以安装 `双击全屏` 组件来恢复.
+- 默认不预装任何组件, 需要在按[设置](#设置)中的说明添加感兴趣的功能.
- 这个是一个综合性的脚本, 如果只是想下载视频建议去 [GreasyFork](https://greasyfork.org/zh-CN/scripts/by-site/bilibili.com) 找个更专业的.
- 对性能有较大影响, 详见[配置要求](#配置).
- 默认不对未登录的状态做适配.
diff --git a/doc/features/features.json b/doc/features/features.json
index 765241597..f7ce35c6c 100644
--- a/doc/features/features.json
+++ b/doc/features/features.json
@@ -475,7 +475,7 @@
"type": "component",
"name": "doubleClickControl",
"displayName": "启用双击控制",
- "description": "将视频播放器的操作方式更改为: 单击显示 / 隐藏控制栏, 双击播放 / 暂停. 请注意不能和 `双击全屏` 一同使用.",
+ "description": "将视频播放器的操作方式更改为: 单击显示 / 隐藏控制栏, 双击播放 / 暂停.\r\n",
"fullRelativePath": "../../registry/dist/components/touch/double-click-control.js",
"fullAbsolutePath": "registry/dist/components/touch/double-click-control.js"
},
@@ -815,6 +815,14 @@
"fullRelativePath": "../../registry/dist/components/video/player/default-mode.js",
"fullAbsolutePath": "registry/dist/components/video/player/default-mode.js"
},
+ {
+ "type": "component",
+ "name": "disableDoubleClickFullscreen",
+ "displayName": "禁用双击全屏",
+ "description": "禁用播放器的双击全屏功能.\r\n",
+ "fullRelativePath": "../../registry/dist/components/video/player/disable-double-click-fullscreen.js",
+ "fullAbsolutePath": "registry/dist/components/video/player/disable-double-click-fullscreen.js"
+ },
{
"type": "component",
"name": "disableScrollVolume",
@@ -823,14 +831,6 @@
"fullRelativePath": "../../registry/dist/components/video/player/disable-scroll-volume.js",
"fullAbsolutePath": "registry/dist/components/video/player/disable-scroll-volume.js"
},
- {
- "type": "component",
- "name": "doubleClickFullscreen",
- "displayName": "双击全屏",
- "description": "为视频播放器启用双击全屏功能, 请注意不能和 `启用双击控制` 一同使用.",
- "fullRelativePath": "../../registry/dist/components/video/player/double-click-fullscreen.js",
- "fullAbsolutePath": "registry/dist/components/video/player/double-click-fullscreen.js"
- },
{
"type": "component",
"name": "extendVideoSpeed",
@@ -1056,6 +1056,14 @@
"fullRelativePath": "../../registry/dist/plugins/style/custom-navbar-dark-mode.js",
"fullAbsolutePath": "registry/dist/plugins/style/custom-navbar-dark-mode.js"
},
+ {
+ "type": "plugin",
+ "name": "customNavbar.items.pgc",
+ "displayName": "自定义顶栏 - 版权内容",
+ "description": "为自定义顶栏扩充版权内容相关的快速入口, 包括国创 / 电影 / 电视剧 /综艺 / 纪录片",
+ "fullRelativePath": "../../registry/dist/plugins/style/custom-navbar-pgc.js",
+ "fullAbsolutePath": "registry/dist/plugins/style/custom-navbar-pgc.js"
+ },
{
"type": "plugin",
"name": "keymap.actions.darkMode",
diff --git a/doc/features/features.md b/doc/features/features.md
index c822e6f53..6ae7e8bd7 100644
--- a/doc/features/features.md
+++ b/doc/features/features.md
@@ -624,7 +624,7 @@ by [@RieN7](https://github.com/rien7),[@ZiuChen](https://github.com/ZiuChen),[@L
**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/touch/double-click-control.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/touch/double-click-control.js)
-将视频播放器的操作方式更改为: 单击显示 / 隐藏控制栏, 双击播放 / 暂停. 请注意不能和 `双击全屏` 一同使用.
+将视频播放器的操作方式更改为: 单击显示 / 隐藏控制栏, 双击播放 / 暂停.
### [迷你播放器触摸拖动](../../registry/dist/components/touch/mini-player.js)
`touchMiniPlayer`
@@ -1124,6 +1124,15 @@ by [@WakelessSloth56](https://github.com/WakelessSloth56),[@LainIO24](https://gi
控制是否使用默认播放器模式, 可以为`常规`, `宽屏`, `网页全屏`或`全屏`. 注意: 不能和其他影响定位的功能一同使用, 例如播放器定位. (相关讨论: [#483](https://github.com/the1812/Bilibili-Evolved/issues/483))
+### [禁用双击全屏](../../registry/dist/components/video/player/disable-double-click-fullscreen.js)
+`disableDoubleClickFullscreen`
+
+**jsDelivr:** [`Stable`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@master/registry/dist/components/video/player/disable-double-click-fullscreen.js) / [`Preview`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/registry/dist/components/video/player/disable-double-click-fullscreen.js)
+
+**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/video/player/disable-double-click-fullscreen.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/video/player/disable-double-click-fullscreen.js)
+
+禁用播放器的双击全屏功能.
+
### [禁止滚轮调音量](../../registry/dist/components/video/player/disable-scroll-volume.js)
`disableScrollVolume`
@@ -1133,15 +1142,6 @@ by [@WakelessSloth56](https://github.com/WakelessSloth56),[@LainIO24](https://gi
在网页全屏 / 全屏模式下, 禁止鼠标滚轮控制播放器的音量. 请注意不能和 `反转滚轮调音量` 一同使用.
-### [双击全屏](../../registry/dist/components/video/player/double-click-fullscreen.js)
-`doubleClickFullscreen`
-
-**jsDelivr:** [`Stable`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@master/registry/dist/components/video/player/double-click-fullscreen.js) / [`Preview`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/registry/dist/components/video/player/double-click-fullscreen.js)
-
-**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/video/player/double-click-fullscreen.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/video/player/double-click-fullscreen.js)
-
-为视频播放器启用双击全屏功能, 请注意不能和 `启用双击控制` 一同使用.
-
### [扩展倍速](../../registry/dist/components/video/player/extend-speed.js)
`extendVideoSpeed`
@@ -1472,6 +1472,15 @@ by FoundTheWOUT
为自定义顶栏添加一个夜间模式开关, 方便快速切换夜间模式.
+### [自定义顶栏 - 版权内容](../../registry/dist/plugins/style/custom-navbar-pgc.js)
+`customNavbar.items.pgc`
+
+**jsDelivr:** [`Stable`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@master/registry/dist/plugins/style/custom-navbar-pgc.js) / [`Preview`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/registry/dist/plugins/style/custom-navbar-pgc.js)
+
+**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/plugins/style/custom-navbar-pgc.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/plugins/style/custom-navbar-pgc.js)
+
+为自定义顶栏扩充版权内容相关的快速入口, 包括国创 / 电影 / 电视剧 /综艺 / 纪录片
+
### [快捷键扩展 - 夜间模式](../../registry/dist/plugins/utils/keymap-dark-mode.js)
`keymap.actions.darkMode`
diff --git a/registry/lib/components/feeds/filter/FeedsFilterCard.vue b/registry/lib/components/feeds/filter/FeedsFilterCard.vue
index eb4b89582..c77ea65ee 100644
--- a/registry/lib/components/feeds/filter/FeedsFilterCard.vue
+++ b/registry/lib/components/feeds/filter/FeedsFilterCard.vue
@@ -146,7 +146,7 @@ export default Vue.extend({
}
this.allTypes = Object.entries(feedsCardTypes)
.concat(Object.entries(specialTypes))
- .filter(([, type]) => type.id <= 2048)
+ .filter(([, type]) => type.id <= 2048 && type.id > 0)
.map(([name, type]) => [name, lodash.clone(type)])
cardsManager = await forEachFeedsCard({
added: card => {
diff --git a/registry/lib/components/style/custom-navbar/CustomNavbar.vue b/registry/lib/components/style/custom-navbar/CustomNavbar.vue
index 602bbf91d..88ef182c7 100644
--- a/registry/lib/components/style/custom-navbar/CustomNavbar.vue
+++ b/registry/lib/components/style/custom-navbar/CustomNavbar.vue
@@ -74,6 +74,7 @@ export default Vue.extend({