Skip to content

Commit

Permalink
merge dev to main, v4.0.4 (#164)
Browse files Browse the repository at this point in the history
  • Loading branch information
festoney8 authored Oct 24, 2024
2 parents df49fc4 + 8614fd3 commit 88bc97f
Show file tree
Hide file tree
Showing 50 changed files with 690 additions and 464 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# CHANGELOG

## 4.0.4

- 移除:稍后再看列表页 双列模式 适配页面变化
- 新增:稍后再看列表页 增大字号、修改列数、隐藏按钮
- 新增:字幕样式 字重设定
- 新增:弹幕样式 字体和字重设定
- 优化:热门页 双列样式
- 更新:部分功能细节

## 4.0.3

- 新增:首页 隐藏刷新按钮文字提示
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@

### 1. 页面净化

- 净化新版 bilibili 网页,不适配老版本页面,默认用户已登录,大会员体验最佳
- 净化新版 bilibili 网页,默认用户已登录,大会员体验最佳
- 混搭各种功能,调节浏览器缩放比例,可得到满意的页面效果
- 不做老版本页面适配,不做未登录状态适配
- **已知问题:**
- 部分功能不支持 Firefox 浏览器
- 给 UP 主充电时,若出现 **充电窗口载入失败 (报错NaN)**,请关闭通用项「URL参数净化」,刷新页面再充电
- 特殊活动直播,调节脚本设置后需刷新页面才生效,弹幕净化不生效
- 给 UP 主充电时,若出现 **充电窗口载入失败 (报错NaN)**,请关闭通用项「URL参数净化」,刷新页面再充电

### 2. 视频过滤

Expand Down
2 changes: 1 addition & 1 deletion src/components/PanelComp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div
ref="panel"
:style="[panelStyle, style]"
class="no-scrollbar fixed z-[10000000] select-none overflow-auto overscroll-none rounded-xl bg-white shadow-lg"
class="no-scrollbar fixed z-[10000000] select-none overflow-auto overscroll-none rounded-xl bg-white shadow-lg will-change-[top,left]"
>
<div ref="bar" class="sticky top-0 z-10 w-full cursor-move bg-[#00AEEC] py-1.5 text-center">
<div class="text-xl font-black text-white">{{ title }}</div>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/filters/variety/comment/pages/dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ export const commentFilterDynamicGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.commentContentFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.content.valueKey, []))
Expand Down
2 changes: 1 addition & 1 deletion src/modules/filters/variety/comment/pages/space.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ export const commentFilterSpaceGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.commentContentFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.content.valueKey, []))
Expand Down
2 changes: 1 addition & 1 deletion src/modules/filters/variety/comment/pages/video.ts
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ export const commentFilterVideoGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.commentContentFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.content.valueKey, []))
Expand Down
2 changes: 1 addition & 1 deletion src/modules/filters/variety/dynamic/pages/dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export const dynamicFilterDynamicGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.dynVideoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down
6 changes: 3 additions & 3 deletions src/modules/filters/variety/video/pages/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export const videoFilterChannelGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoUploaderKeywordFilter.setParam(
Expand Down Expand Up @@ -359,7 +359,7 @@ export const videoFilterChannelGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -490,7 +490,7 @@ export const videoFilterChannelGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
6 changes: 3 additions & 3 deletions src/modules/filters/variety/video/pages/homepage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ export const videoFilterHomepageGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoUploaderKeywordFilter.setParam(
Expand Down Expand Up @@ -368,7 +368,7 @@ export const videoFilterHomepageGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -514,7 +514,7 @@ export const videoFilterHomepageGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
6 changes: 3 additions & 3 deletions src/modules/filters/variety/video/pages/popular.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export const videoFilterPopularGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoUploaderKeywordFilter.setParam(
Expand Down Expand Up @@ -428,7 +428,7 @@ export const videoFilterPopularGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -523,7 +523,7 @@ export const videoFilterPopularGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
6 changes: 3 additions & 3 deletions src/modules/filters/variety/video/pages/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ export const videoFilterSearchGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoUploaderKeywordFilter.setParam(
Expand Down Expand Up @@ -336,7 +336,7 @@ export const videoFilterSearchGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -431,7 +431,7 @@ export const videoFilterSearchGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
4 changes: 2 additions & 2 deletions src/modules/filters/variety/video/pages/space.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export const videoFilterSpaceGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -304,7 +304,7 @@ export const videoFilterSpaceGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
6 changes: 3 additions & 3 deletions src/modules/filters/variety/video/pages/video.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export const videoFilterVideoGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoUploaderKeywordFilter.setParam(
Expand Down Expand Up @@ -369,7 +369,7 @@ export const videoFilterVideoGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleFilter.setParam(BiliCleanerStorage.get(GM_KEYS.black.title.valueKey, []))
Expand Down Expand Up @@ -489,7 +489,7 @@ export const videoFilterVideoGroups: Group[] = [
editorDescription: [
'每行一个关键词或正则,不区分大小写',
'请勿使用过于激进的关键词或正则',
'正则默认iu模式,无需flag,语法:/abc|\\d+/',
'正则默认 iu 模式,无需 flag,语法:/abc|\\d+/',
],
saveFn: async () => {
mainFilter.videoTitleWhiteFilter.setParam(BiliCleanerStorage.get(GM_KEYS.white.title.valueKey, []))
Expand Down
3 changes: 2 additions & 1 deletion src/modules/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { waitForHead } from '../utils/init'
import { log } from '../utils/logger'
import { loadFilters } from './filters'
import { loadRules, loadStyles } from './rules'
import { loadRules, loadRulesHotKey, loadStyles } from './rules'

export const loadModules = () => {
waitForHead().then(() => {
Expand All @@ -10,6 +10,7 @@ export const loadModules = () => {
})

loadRules()
loadRulesHotKey()
log('loadRules done')

loadFilters()
Expand Down
97 changes: 8 additions & 89 deletions src/modules/rules/bangumi/groups/danmaku.scss
Original file line number Diff line number Diff line change
@@ -1,94 +1,13 @@
// 隐藏 同时在看人数
html[video-page-hide-bpx-player-video-info-online] {
.bpx-player-video-info-online,
.bpx-player-video-info-divide {
display: none !important;
// 弹幕字体
html[video-page-danmaku-font-family] {
.bili-danmaku-x-dm {
--fontFamily: var(--video-page-danmaku-font-family) !important;
}
}

// 隐藏 装填弹幕数量
html[video-page-hide-bpx-player-video-info-dm] {
.bpx-player-video-info-dm,
.bpx-player-video-info-divide {
display: none !important;
}
}

// 隐藏 弹幕开关
html[video-page-hide-bpx-player-dm-switch] {
.bpx-player-dm-switch {
display: none !important;
}
}

// 隐藏 弹幕显示设置
html[video-page-hide-bpx-player-dm-setting] {
.bpx-player-dm-setting {
display: none !important;
}
}

// 隐藏 弹幕样式
html[video-page-hide-bpx-player-video-btn-dm] {
.bpx-player-video-btn-dm {
display: none !important;
}
}

// 隐藏 占位文字
html[video-page-hide-bpx-player-dm-input] {
.bpx-player-dm-input::placeholder {
color: transparent !important;
}
}

// 隐藏 弹幕礼仪
html[video-page-hide-bpx-player-dm-hint] {
.bpx-player-dm-hint {
display: none !important;
}
}

// 隐藏 发送按钮
html[video-page-hide-bpx-player-dm-btn-send] {
.bpx-player-dm-btn-send {
display: none !important;
}
}

// 非全屏下 关闭弹幕栏
html[video-page-hide-bpx-player-sending-area] {
.bpx-player-sending-area {
display: none !important;
}

// 关闭弹幕栏后 播放器去黑边
#bilibili-player-wrap[class^='video_playerNormal'] {
height: calc(var(--video-width) * 0.5625);
}
#bilibili-player-wrap[class^='video_playerWide'] {
height: calc(var(--containerWidth) * 0.5625);
}
}

// 全屏下 关闭弹幕输入框
html[video-page-hide-bpx-player-video-inputbar] {
.bpx-player-container[data-screen='full'] .bpx-player-control-bottom-center .bpx-player-video-inputbar,
.bpx-player-container[data-screen='web'] .bpx-player-control-bottom-center .bpx-player-video-inputbar {
display: none !important;
}
.bpx-player-container[data-screen='full'] .bpx-player-control-bottom-center,
.bpx-player-container[data-screen='web'] .bpx-player-control-bottom-center {
padding: 0 15px !important;
}

// 弹幕开关按钮贴紧左侧, 有章节列表时增大列表宽度
.bpx-player-container[data-screen='full'] .bpx-player-control-bottom-left,
.bpx-player-container[data-screen='web'] .bpx-player-control-bottom-left {
min-width: unset !important;
}
.bpx-player-container[data-screen='full'] .bpx-player-ctrl-viewpoint,
.bpx-player-container[data-screen='web'] .bpx-player-ctrl-viewpoint {
width: fit-content !important;
// 弹幕字重
html[video-page-danmaku-font-weight] {
.bili-danmaku-x-dm {
--fontWeight: var(--video-page-danmaku-font-weight) !important;
}
}
Loading

0 comments on commit 88bc97f

Please sign in to comment.