Skip to content

Commit

Permalink
Merge branch 'preview-features' into preview
Browse files Browse the repository at this point in the history
  • Loading branch information
the1812 committed Nov 12, 2024
2 parents 98c6e06 + 07bfb81 commit 54b44b9
Show file tree
Hide file tree
Showing 41 changed files with 374 additions and 156 deletions.
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"cSpell.words": [
"afterbegin",
"afterend",
"akari",
"BALH",
"Bangumi",
"bevo",
Expand All @@ -27,6 +28,7 @@
"bofqi",
"BVID",
"camelcase",
"cascader",
"clipboardy",
"cntr",
"compositionend",
Expand Down
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,68 @@
<!-- spell-checker: disable -->
# 更新日志

## v2.9.5-preview
`2024-11-12`

包含 [v2.9.5](https://github.com/the1812/Bilibili-Evolved/releases/tag/v2.9.5) 的所有更新内容.

- `自定义顶栏` 的历史支持手动刷新. (#4948)

## v2.9.5
`2024-11-12`

<details>
<summary>正式版用户将获得 v2.9.4-preview 的所有改动, 点击展开查看</summary>

✨新增
- 新增组件 `隐藏头像框`.
> 隐藏页面中用户的头像框 (包括角标), 目前支持动态和视频页面.
- 新增组件 `隐藏直播马赛克`. (#4634)
> 移除直播画面中的马赛克区域.
- 优化了搜索框的搜索建议精准度. (#4833)
- 新增组件 `删除动态`. (PR #4915 by [gouzil](https://github.com/gouzil))
> 删除动态, 可选转发抽奖, 和全部删除.
- `保存视频元数据` 增加 FFMETADATA 字段选项. (PR #4943 by [WakelessSloth56](https://github.com/WakelessSloth56))
- 新增组件 `评论内容替换`. (#4072)
> 替换评论中的内容.
> 可以添加多个替换配置, 每项配置可将一个关键词替换为其他文本. 若替换的目标是一个链接, 则视作替换为表情.
>
- `直播信息扩充` 更换新的 API 接口. (PR #4964 by [Oxygenくん](https://github.com/oxygenkun))

</details>

✨新增
- 新版视频推荐适配组件:
- `显示视频投稿时间` (#4934, PR #4960 by [呼乎户](https://github.com/wisokey))
- `隐藏视频推荐`
- `选集区域优化`, 其中 `展开选集标题` 选项还可恢复分 P 数的展示
- `传统连播模式`
- `展开弹幕列表` - `有选集时不自动展开`
- 优化在线仓库中的搜索逻辑和搜索为空的提示. (#4975, #4973)
- `自定义顶栏` 的历史支持显示分 P 数信息. (#1866)
- `删除广告` 更新对首页浮窗广告的屏蔽. (#5001)

🐛修复
- 修复 `简化直播间` 付费礼物屏蔽失效. (#4968)
- 修复动态菜单中的扩展菜单项失效. (#4976)
- `夜间模式` 排除工房页面, 避免文字难以阅读. (#4981)
- `自定义顶栏` 移除已下线的 `短剧榜` 入口. (#4987)
- 修复 `删除广告` 导致直播间和个人空间里的动态显示不出来. (#5003)
- 修复 `网址参数清理` 对需转义的字符处理不正确. (#5009)
- 修复组件描述在部分页面的标题颜色不正确. (#4995)
- 修复 `禁止跳转动态详情` 在带图转发动态二次转发后, 查看图片按钮失效. (PR #4980 by [sunfkny](https://github.com/sunfkny))
- 插件 `下载视频 - WASM 混流输出` 修复写入元数据选项, 新增混流进度, 优化多集下载. (#4840, PR #4984 by [WakelessSloth56](https://github.com/WakelessSloth56))

☕开发者相关
- `自定义顶栏` 未登录时的阿卡林头像转为内置. (感觉说不定 b 站哪天就把这图删了)

🗑️废弃
- 废弃 `简化首页` 功能, 请使用 [BewlyBewly](https://github.com/BewlyBewly/BewlyBewly) 替代.

## v2.9.4-preview
`2024-10-22`

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,9 @@
# 相关推荐
这些脚本/插件同样能够改善您在B站的体验, 相同的功能将不会整合到 Bilibili Evolved, 但会尽可能地适配

## bilibili 网页端添加 APP 首页推荐
作者: [indefined](https://github.com/indefined)
- [GitHub](https://github.com/indefined/UserScripts/tree/master/bilibiliHome)
- [GreasyFork](https://greasyfork.org/zh-CN/scripts/368446-bilibili%E7%BD%91%E9%A1%B5%E7%AB%AF%E6%B7%BB%E5%8A%A0app%E9%A6%96%E9%A1%B5%E6%8E%A8%E8%8D%90)
## BewlyBewly
作者: [Hakadao](https://github.com/hakadao)
- [GitHub](https://github.com/BewlyBewly/BewlyBewly)

## pakku.js 哔哩哔哩弹幕过滤器
作者: [xmcp](https://github.com/xmcp)
Expand Down
4 changes: 3 additions & 1 deletion doc/donate.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## 爱发电

<a href="https://afdian.net/a/the1812" target="_blank">
<a href="https://afdian.com/a/the1812" target="_blank">
<img alt="爱发电" src="../images/compressed/afdian.jpg" width="400">
</a>

Expand All @@ -30,6 +30,8 @@ https://afdian.com/a/the1812?tab=sponsor

| 时间 | 用户名 | 单号后4位 | 金额 |
| ------------------- | --------------------- | --------- | ------- |
| 2024.10.24 19:59:56 | 匿名 | 5126 | ¥20.00 |
| 2024.10.24 03:07:40 | S*a | 8703 | ¥20.00 |
| 2024.10.11 11:19:52 | 匿名 | 8738 | ¥100.00 |
| 2024.09.28 22:43:29 | 匿名 | 7519 | ¥20.00 |
| 2024.09.28 17:45:29 | *| 7998 | ¥20.00 |
Expand Down
10 changes: 1 addition & 9 deletions doc/features/features.json
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,6 @@
"fullRelativePath": "../../registry/dist/components/style/simplify/comments.js",
"fullAbsolutePath": "registry/dist/components/style/simplify/comments.js"
},
{
"type": "component",
"name": "simplifyHome",
"displayName": "简化首页",
"description": "隐藏原版首页不需要的元素 / 分区.",
"fullRelativePath": "../../registry/dist/components/style/simplify/home.js",
"fullAbsolutePath": "registry/dist/components/style/simplify/home.js"
},
{
"type": "component",
"name": "simplifyLiveroom",
Expand Down Expand Up @@ -771,7 +763,7 @@
"type": "component",
"name": "fullEpisodeTitle",
"displayName": "选集区域优化",
"description": "提供一些视频选集区域的优化, 对番剧无效.\r\n- `展开选集标题`: 总是完全展开视频选集列表项的标题\r\n- `展开选集列表`: 总是完全展开视频选集列表\r\n\r\n打开 `展开选集列表` 时, 在选集区域的标题上按住 <kbd>Alt</kbd> 键点击可以临时切换展开/收起选集列表.\r\n",
"description": "提供一些视频选集区域的优化, 对番剧无效.\r\n- `展开选集标题`: 总是完全展开视频选集列表项的标题, 若为传统分 P 列表, 还会恢复显示分 P 数的前缀.\r\n- `展开选集列表`: 总是完全展开视频选集列表\r\n\r\n打开 `展开选集列表` 时, 在选集区域的标题上按住 <kbd>Alt</kbd> 键点击可以临时切换此组件的效果.\r\n",
"fullRelativePath": "../../registry/dist/components/video/full-episode-title.js",
"fullAbsolutePath": "registry/dist/components/video/full-episode-title.js"
},
Expand Down
13 changes: 2 additions & 11 deletions doc/features/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -572,15 +572,6 @@ by [@RieN7](https://github.com/rien7),[@ZiuChen](https://github.com/ZiuChen),[@L
- `粉丝勋章`: 隐藏用户的粉丝勋章.
- `小喇叭横幅`: 隐藏评论区顶部的小喇叭横幅

### [简化首页](../../registry/dist/components/style/simplify/home.js)
`simplifyHome`

**jsDelivr:** [`Stable`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@master/registry/dist/components/style/simplify/home.js) / [`Preview`](https://cdn.jsdelivr.net/gh/the1812/Bilibili-Evolved@preview/registry/dist/components/style/simplify/home.js)

**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/home.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/home.js)

隐藏原版首页不需要的元素 / 分区.

### [简化直播间](../../registry/dist/components/style/simplify/live.js)
`simplifyLiveroom`

Expand Down Expand Up @@ -1066,10 +1057,10 @@ by [@kdxcxs](https://github.com/kdxcxs)
**GitHub:** [`Stable`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/video/full-episode-title.js) / [`Preview`](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/video/full-episode-title.js)

提供一些视频选集区域的优化, 对番剧无效.
- `展开选集标题`: 总是完全展开视频选集列表项的标题
- `展开选集标题`: 总是完全展开视频选集列表项的标题, 若为传统分 P 列表, 还会恢复显示分 P 数的前缀.
- `展开选集列表`: 总是完全展开视频选集列表

打开 `展开选集列表` 时, 在选集区域的标题上按住 <kbd>Alt</kbd> 键点击可以临时切换展开/收起选集列表.
打开 `展开选集列表` 时, 在选集区域的标题上按住 <kbd>Alt</kbd> 键点击可以临时切换此组件的效果.

### [保存视频元数据](../../registry/dist/components/video/metadata.js)
`saveVideoMetadata`
Expand Down
11 changes: 1 addition & 10 deletions doc/features/pack/pack.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
{
"name": "cleaner",
"displayName": "简洁至上",
"description": "简化各种多余界面元素, 专注于内容本身.\n\n包含以下功能:\n删除广告, 删除直播水印, 删除视频弹窗, 禁用特殊弹幕样式, 简化评论区, 简化直播间, 简化首页, 自动收起直播侧栏, 隐藏视频推荐, 隐藏直播推荐, 隐藏视频标题层",
"description": "简化各种多余界面元素, 专注于内容本身.\n\n包含以下功能:\n删除广告, 删除直播水印, 删除视频弹窗, 禁用特殊弹幕样式, 简化评论区, 简化直播间, 自动收起直播侧栏, 隐藏视频推荐, 隐藏直播推荐, 隐藏视频标题层",
"components": [
"removePromotions",
"removeLiveWatermark",
"removePlayerPopup",
"disableSpecialDanmaku",
"simplifyComments",
"simplifyLiveroom",
"simplifyHome",
"collapseLiveSideBar",
"hideRelatedVideos",
"hideRecommendedLive",
Expand Down Expand Up @@ -65,14 +64,6 @@
"fullRelativePath": "../../registry/dist/components/style/simplify/live.js",
"fullAbsolutePath": "registry/dist/components/style/simplify/live.js"
},
{
"type": "component",
"name": "simplifyHome",
"displayName": "简化首页",
"description": "隐藏原版首页不需要的元素 / 分区.",
"fullRelativePath": "../../registry/dist/components/style/simplify/home.js",
"fullAbsolutePath": "registry/dist/components/style/simplify/home.js"
},
{
"type": "component",
"name": "collapseLiveSideBar",
Expand Down
6 changes: 1 addition & 5 deletions doc/features/pack/pack.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
简化各种多余界面元素, 专注于内容本身.

包含以下功能:
删除广告, 删除直播水印, 删除视频弹窗, 禁用特殊弹幕样式, 简化评论区, 简化直播间, 简化首页, 自动收起直播侧栏, 隐藏视频推荐, 隐藏直播推荐, 隐藏视频标题层
删除广告, 删除直播水印, 删除视频弹窗, 禁用特殊弹幕样式, 简化评论区, 简化直播间, 自动收起直播侧栏, 隐藏视频推荐, 隐藏直播推荐, 隐藏视频标题层

<details>
<summary><strong>jsDelivr Stable</strong></summary>
Expand All @@ -17,7 +17,6 @@ https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/special-danmaku.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/comments.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/live.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/home.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/live/side-bar.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/hide/video/related-videos.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/hide/video/recommended-live.js
Expand All @@ -35,7 +34,6 @@ https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/special-danmaku.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/comments.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/live.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/home.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/live/side-bar.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/hide/video/related-videos.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/hide/video/recommended-live.js
Expand All @@ -53,7 +51,6 @@ https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/special-danmaku.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/comments.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/live.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/simplify/home.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/live/side-bar.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/hide/video/related-videos.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/registry/dist/components/style/hide/video/recommended-live.js
Expand All @@ -71,7 +68,6 @@ https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/special-danmaku.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/comments.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/live.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/simplify/home.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/live/side-bar.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/hide/video/related-videos.js
https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/registry/dist/components/style/hide/video/recommended-live.js
Expand Down
2 changes: 1 addition & 1 deletion registry/lib/components/feeds/del-feeds/check-in-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ const builtInItems: CheckInItem[] = [
},
]

export const [checkInItems] = registerAndGetData('checkInCenter.items', builtInItems)
export const [checkInItems] = registerAndGetData('deleteFeeds.items', builtInItems)
1 change: 1 addition & 0 deletions registry/lib/components/feeds/disable-details/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const entry = async () => {
'bili-rich-text-topic',
'bili-rich-text-module',
'bili-rich-text-link',
'bili-rich-text-viewpic',
].some(className => target.classList.contains(className))
) {
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
<VIcon icon="mdi-play" :size="14"></VIcon>
</VButton>
</div>
<div class="operation" @click="reloadHistoryItems">
<VButton title="刷新" round>
<VIcon icon="mdi-refresh" :size="16"></VIcon>
</VButton>
</div>
<a class="operation" target="_blank" href="https://www.bilibili.com/account/history">
<VButton title="查看更多" round>
<VIcon icon="mdi-dots-horizontal" :size="18"></VIcon>
Expand Down Expand Up @@ -59,7 +64,9 @@
class="progress"
:style="{ width: h.progress * 100 + '%' }"
></div>
<div v-if="h.durationText" class="floating duration">{{ h.durationText }}</div>
<div v-if="h.pages !== undefined && h.pages > 1" class="floating pages">
{{ h.page }}P / {{ h.pages }}P
</div>
</a>
<a class="title" target="_blank" :href="h.url" :title="h.title">{{
h.title || h.upName + '的直播间'
Expand Down Expand Up @@ -360,14 +367,18 @@ export default Vue.extend({
&-items {
padding: 0 12px;
.floating {
@include round-bar(20);
@include round-bar(16);
@include h-center();
background-color: #000c;
color: white;
justify-content: center;
position: absolute;
opacity: 0;
font-size: 11px;
padding: 2px 4px;
&.pages {
bottom: 4px;
right: 4px;
}
}
.time-group-item {
display: grid;
Expand All @@ -391,9 +402,6 @@ export default Vue.extend({
.cover {
transform: scale(1.05);
}
.floating {
opacity: 1;
}
}
.history-cover-container {
$height: 55px;
Expand Down
7 changes: 6 additions & 1 deletion registry/lib/components/style/custom-navbar/history/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ export interface HistoryItem {
duration: number
/** 时长展示文字 */
durationText: string
/** 视频的分P */
/** 视频的分 P */
page?: number
/** 视频的分 P 数 */
pages?: number
/** 直播状态: 0 未开播 1 直播中 2 轮播中 (似乎新 API 不会返回 2) */
liveStatus?: number
/** 视频的tag/直播的分区名 */
Expand Down Expand Up @@ -131,6 +133,7 @@ const parseHistoryItem = (item: any): HistoryItem => {
bvid, // 视频 bv号
cid, // 专栏 cv号
oid, // 直播 房间号 / 专栏 cv 号 / 课程神秘标识符
page,
} = item.history
const progressParam = item.progress > 0 ? `t=${item.progress}` : 't=0'
const progress = item.progress === -1 ? 1 : item.progress / item.duration
Expand Down Expand Up @@ -189,6 +192,8 @@ const parseHistoryItem = (item: any): HistoryItem => {
id: bvid,
url: `https://www.bilibili.com/video/${bvid}?p=${item.history.page}&${progressParam}`,
type: HistoryType.Video,
page,
pages: item.videos,
}
}
if (cid) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ const entries = [
href: 'https://www.bilibili.com/v/popular/music',
name: '全站音乐榜',
},
{
href: 'https://www.bilibili.com/v/popular/drama',
name: '短剧榜',
},
] as RankingEntry[]
export default Vue.extend({
name: 'RankingPopup',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import { getUserInfo } from '@/core/user-info'
import { getDpiSourceSet } from '@/core/utils'
import { EmptyImageUrl } from '@/core/utils/constants'
import notLoginFaceUrl from './akari.jpg'
const noFaceUrl = '//static.hdslb.com/images/member/noface.gif'
const notLoginFaceUrl = 'https://static.hdslb.com/images/akari.jpg'
export default Vue.extend({
name: 'UserFace',
data() {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions registry/lib/components/style/dark-mode/dark-urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export const darkExcludes = [
// 创作中心-收益管理-悬赏计划
'//cm.bilibili.com/quests/#/task',
'//live.bilibili.com/activity/live-activity-full/full-next/index.html',
'//gf.bilibili.com/',
]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
.r-con .rcmd-list,
.playlist-container .recommend-list-container,
.bpx-player-ending-related,
.plp-r [class*="recommend_wrap"] {
.plp-r [class*="recommend_wrap"],
.video-container-v1 .recommend-list-v1 {
display: none !important;
}
.bilibili-player-ending-panel-box-functions .bilibili-player-upinfo-spans {
Expand Down
Loading

0 comments on commit 54b44b9

Please sign in to comment.