Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev to main, v4.0.7 #171

Merged
merged 3 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body:
id: env_os
attributes:
label: 操作系统
placeholder: 如 Win10 / Win11 / MacOS
placeholder: 如 Windows 10 / Windows 11 / MacOS
validations:
required: true

Expand Down Expand Up @@ -108,7 +108,7 @@ body:
- type: dropdown
id: check_plugin_conflict
attributes:
label: 禁用掉对 B 站生效的浏览器插件后,仍出现问题
label: 禁用掉对 B 站生效的其他浏览器插件(不含暴力猴/篡改猴),仍出现问题
options:
- 是
- 否
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 4.0.7

- 新增:首页 按播放量过滤
- 修复:番剧页 全屏滚动视频位置问题

## 4.0.6

- 更新:播放页 播放器宽度调节相关样式
Expand Down
14 changes: 0 additions & 14 deletions src/modules/filters/variety/comment/pages/dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -557,7 +553,6 @@ export const commentFilterDynamicGroups: Group[] = [
type: 'switch',
id: GM_KEYS.black.isAD.statusKey,
name: '过滤 带货评论 (实验功能)',
defaultEnable: false,
noStyle: true,
enableFn: () => {
fetchHook.addPostFn(
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -668,7 +660,6 @@ export const commentFilterDynamicGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.root.statusKey,
name: '一级评论(主评论) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isRootWhite = true
Expand All @@ -683,7 +674,6 @@ export const commentFilterDynamicGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.sub.statusKey,
name: '二级评论(回复) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isSubWhite = true
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
14 changes: 0 additions & 14 deletions src/modules/filters/variety/comment/pages/space.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -512,7 +508,6 @@ export const commentFilterSpaceGroups: Group[] = [
type: 'switch',
id: GM_KEYS.black.isAD.statusKey,
name: '过滤 带货评论 (实验功能)',
defaultEnable: false,
noStyle: true,
enableFn: () => {
fetchHook.addPostFn(
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -623,7 +615,6 @@ export const commentFilterSpaceGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.root.statusKey,
name: '一级评论(主评论) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isRootWhite = true
Expand All @@ -638,7 +629,6 @@ export const commentFilterSpaceGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.sub.statusKey,
name: '二级评论(回复) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isSubWhite = true
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
14 changes: 0 additions & 14 deletions src/modules/filters/variety/comment/pages/video.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -565,7 +561,6 @@ export const commentFilterVideoGroups: Group[] = [
type: 'switch',
id: GM_KEYS.black.isAD.statusKey,
name: '过滤 带货评论 (实验功能)',
defaultEnable: false,
noStyle: true,
enableFn: () => {
fetchHook.addPostFn(
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -676,7 +668,6 @@ export const commentFilterVideoGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.root.statusKey,
name: '一级评论(主评论) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isRootWhite = true
Expand All @@ -691,7 +682,6 @@ export const commentFilterVideoGroups: Group[] = [
type: 'switch',
id: GM_KEYS.white.sub.statusKey,
name: '二级评论(回复) 免过滤',
defaultEnable: false,
noStyle: true,
enableFn: () => {
isSubWhite = true
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
4 changes: 0 additions & 4 deletions src/modules/filters/variety/dynamic/pages/dynamic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -298,7 +295,6 @@ export const dynamicFilterDynamicGroups: Group[] = [
id: GM_KEYS.black.content.statusKey,
name: '启用 动态内容关键词过滤',
description: ['包含被转发动态内容', '不含动态内视频信息'],
defaultEnable: false,
noStyle: true,
enableFn: () => {
mainFilter.dynContentFilter.enable()
Expand Down
Loading