diff --git a/CHANGELOG.md b/CHANGELOG.md index ebcfea3c..0c3501b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG +## 3.7.3 + +- 新增：直播页 隐藏倒计时互动 +- 新增：直播页 隐藏发送框粉丝勋章 +- 新增：播放页/番剧页 小窗播放器记忆移动位置 +- 优化：直播页 隐藏互动功能改为默认开启 +- 优化：直播页 隐藏发送框相关功能样式 +- 优化：代码typo更正 + ## 3.7.2 - 新增：直播页 活动直播页自动跳转普通直播 diff --git a/src/components/group.ts b/src/components/group.ts index e8b01862..0c63b7ea 100644 --- a/src/components/group.ts +++ b/src/components/group.ts @@ -67,20 +67,6 @@ export class Group { error(err) } } - /** 在URL变动时, 重载group内需要重载的项目 */ - reloadGroup() { - try { - this.items.forEach((e) => { - if (e instanceof CheckboxItem || e instanceof RadioItem || e instanceof NumberItem) { - e.reloadItem() - } - }) - debug(`reloadGroup ${this.groupID} OK`) - } catch (err) { - error(`reloadGroup ${this.groupID} err`) - error(err) - } - } /** 禁用Group, 临时使用, 移除全部CSS, 监听函数保持不变 */ disableGroup() { try { diff --git a/src/components/item.ts b/src/components/item.ts index c80b507f..33c1ab13 100644 --- a/src/components/item.ts +++ b/src/components/item.ts @@ -9,7 +9,6 @@ interface IItem { removeItemCSS?(): void watchItem?(): void enableItem?(): void - reloadItem?(): void } /** @@ -17,7 +16,6 @@ interface IItem { * description item的功能介绍, 显示在panel内, \n可用来换行 * defaultStatus item默认开启状态, 第一次安装时使用, 对于所有用户均开启的项目给true * itemFunc 功能函数 - * isItemFuncReload 功能函数是否在URL变动时重新运行 * itemCSS item的CSS * callback 回调函数, 用于在关掉开关时触发外部事务 */ @@ -25,10 +23,11 @@ interface ICheckboxItemOption { itemID: string description: string defaultStatus?: boolean - itemFunc?: () => void - isItemFuncReload?: boolean + enableFunc?: () => Promise + // 分别对应：立即执行，DOMContentLoaded, load + enableFuncRunAt?: 'document-start' | 'document-end' | 'document-idle' + disableFunc?: () => Promise itemCSS?: string - callback?: () => void } /** 普通开关 */ @@ -117,7 +116,7 @@ export class CheckboxItem implements IItem { } } } - /** 监听item chekbox开关 */ + /** 监听item checkbox开关 */ watchItem() { try { this.itemEle = document.querySelector(`#${this.option.itemID} input`) as HTMLInputElement @@ -126,16 +125,11 @@ export class CheckboxItem implements IItem { if ((event.target).checked) { this.setStatus(true) this.insertItemCSS() - if (this.option.itemFunc !== undefined) { - this.option.itemFunc() - } + this.option.enableFunc && this.option.enableFunc().then().catch() } else { this.setStatus(false) this.removeItemCSS() - // 回调 - if (typeof this.option.callback === 'function') { - this.option.callback() - } + this.option.disableFunc && this.option.disableFunc().then().catch() } }) debug(`watchItem ${this.option.itemID} OK`) @@ -153,8 +147,28 @@ export class CheckboxItem implements IItem { if (this.isEnable) { try { this.insertItemCSS() - if (enableFunc && this.option.itemFunc instanceof Function) { - this.option.itemFunc() + if (enableFunc && this.option.enableFunc) { + switch (this.option.enableFuncRunAt) { + case 'document-start': + this.option.enableFunc().then().catch() + break + case 'document-end': + if (['complete', 'interactive'].includes(document.readyState)) { + this.option.enableFunc().then().catch() + } else { + document.addEventListener('DOMContentLoaded', this.option.enableFunc) + } + break + case 'document-idle': + if (document.readyState === 'complete') { + this.option.enableFunc().then().catch() + } else { + document.addEventListener('load', this.option.enableFunc) + } + break + default: + this.option.enableFunc().then().catch() + } } debug(`enableItem ${this.option.itemID} OK`) } catch (err) { @@ -163,21 +177,6 @@ export class CheckboxItem implements IItem { } } } - /** - * 重载item, 用于非页面刷新但URL变动情况, 此时已注入CSS只重新运行func, 如: 非刷新式切换视频 - */ - reloadItem() { - // this.getStatus() - if (this.option.isItemFuncReload && this.isEnable && this.option.itemFunc instanceof Function) { - try { - this.option.itemFunc() - debug(`reloadItem ${this.option.itemID} OK`) - } catch (err) { - error(`reloadItem ${this.option.itemID} Error`) - error(err) - } - } - } } /** @@ -187,7 +186,6 @@ export class CheckboxItem implements IItem { * radioItemIDList 当前item所在互斥组的ID列表, 用于修改其他item状态 * defaultStatus item默认开启状态, 第一次安装时使用, 对于所有用户均开启的项目默认给true * itemFunc 功能函数 - * isItemFuncReload 功能函数是否在URL变动时重新运行 * itemCSS item的CSS */ interface IRadioItemOption { @@ -196,8 +194,7 @@ interface IRadioItemOption { radioName: string radioItemIDList: string[] defaultStatus?: boolean - itemFunc?: () => void - isItemFuncReload?: boolean + itemFunc?: () => Promise itemCSS?: string } @@ -302,9 +299,7 @@ export class RadioItem implements IItem { debug(`radioItem ${this.option.itemID} checked`) this.setStatus(true) this.insertItemCSS() - if (this.option.itemFunc !== undefined) { - this.option.itemFunc() - } + this.option.itemFunc && this.option.itemFunc().then().catch() // 相同name的其他option自动置为uncheck, 但这一行为无法被监听, 需传入itemID逐一修改 this.option.radioItemIDList.forEach((targetID) => { if (targetID !== this.option.itemID) { @@ -337,8 +332,8 @@ export class RadioItem implements IItem { if (this.isEnable) { try { this.insertItemCSS() - if (enableFunc && this.option.itemFunc instanceof Function) { - this.option.itemFunc() + if (enableFunc && this.option.itemFunc) { + this.option.itemFunc().then().catch() } debug(`enableItem ${this.option.itemID} OK`) } catch (err) { @@ -347,22 +342,6 @@ export class RadioItem implements IItem { } } } - /** - * 重载item, 用于非页面刷新但URL变动情况, 此时已注入CSS只重新运行func, 如: 非刷新式切换视频 - */ - reloadItem() { - // 存在其他item修改当前item状态的情况 - this.getStatus() - if (this.option.isItemFuncReload && this.isEnable && this.option.itemFunc instanceof Function) { - try { - this.option.itemFunc() - debug(`reloadItem ${this.option.itemID} OK`) - } catch (err) { - error(`reloadItem ${this.option.itemID} Error`) - error(err) - } - } - } } /** @@ -388,7 +367,7 @@ interface INumberItemOption { itemCSS?: string // CSS中待替换为数值的占位符 itemCSSPlaceholder?: string - callback?: (value: number) => void + callback?: (value: number) => Promise } /** 数值设定 */ @@ -502,10 +481,7 @@ export class NumberItem implements IItem { debug(`${this.option.itemID} currValue ${itemEle.value}`) // reload this.reloadItem() - // 调用回调函数 - if (this.option.callback && typeof this.option.callback === 'function') { - this.option.callback(parseInt(itemEle.value)) - } + this.option.callback && this.option.callback(parseInt(itemEle.value)).then().catch() }) debug(`watchItem ${this.option.itemID} OK`) } catch (err) { @@ -553,7 +529,7 @@ interface IButtonItemOption { itemID: string description: string name: string - itemFunc: () => void + itemFunc: () => Promise } /** 普通按钮 */ @@ -588,7 +564,7 @@ export class ButtonItem implements IItem { const itemEle = document.querySelector(`#${this.option.itemID} button`) as HTMLButtonElement itemEle.addEventListener('click', () => { debug(`button ${this.option.itemID} click`) - this.option.itemFunc() + this.option.itemFunc().then().catch() }) debug(`watchItem ${this.option.itemID} OK`) } catch (err) { diff --git a/src/components/panel.ts b/src/components/panel.ts index 0903c542..34f8794f 100644 --- a/src/components/panel.ts +++ b/src/components/panel.ts @@ -9,7 +9,7 @@ export class Panel { bilibili 页面净化大师
- +
diff --git a/src/components/wordlist.ts b/src/components/wordlist.ts index 47ca3fff..07ec6694 100644 --- a/src/components/wordlist.ts +++ b/src/components/wordlist.ts @@ -9,7 +9,7 @@ export class WordList {
- +
@@ -60,24 +60,24 @@ export class WordList { } } - /** 添加多个值到列表 */ - addValues(values: string[]) { - try { - this.getValue() - values.forEach((value) => { - value = value.trim() - if (value && !this.wordSet.has(value)) { - this.wordArr.push(value) - this.wordSet.add(value) - } - }) - this.setValue() - debug(`list ${this.listID} add ${values.length} lines, OK`) - } catch (err) { - error(err) - error(`list ${this.listID} add ${values.length} lines, ERROR`) - } - } + // /** 添加多个值到列表 */ + // addValues(values: string[]) { + // try { + // this.getValue() + // values.forEach((value) => { + // value = value.trim() + // if (value && !this.wordSet.has(value)) { + // this.wordArr.push(value) + // this.wordSet.add(value) + // } + // }) + // this.setValue() + // debug(`list ${this.listID} add ${values.length} lines, OK`) + // } catch (err) { + // error(err) + // error(`list ${this.listID} add ${values.length} lines, ERROR`) + // } + // } /** * 编辑整个列表 diff --git a/src/filters/commentFilter/pages/dynamic.ts b/src/filters/commentFilter/pages/dynamic.ts index ce9c76cd..dc9554cb 100644 --- a/src/filters/commentFilter/pages/dynamic.ts +++ b/src/filters/commentFilter/pages/dynamic.ts @@ -154,12 +154,12 @@ if (isPageDynamic()) { } if (commentListContainer) { // 初次全站检测 - check(true) - const commentObverser = new MutationObserver(() => { + check(true).then().catch() + const commentObserver = new MutationObserver(() => { // 增量检测 - check(false) + check(false).then().catch() }) - commentObverser.observe(commentListContainer, { childList: true, subtree: true }) + commentObserver.observe(commentListContainer, { childList: true, subtree: true }) } } @@ -229,13 +229,13 @@ if (isPageDynamic()) { new CheckboxItem({ itemID: usernameAction.statusKey, description: '启用 评论区 用户名过滤\n(右键单击用户名)', - itemFunc: () => { + enableFunc: async () => { // 启用右键菜单功能 isContextMenuUsernameEnable = true contextMenuFunc() usernameAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键菜单功能 isContextMenuUsernameEnable = false usernameAction.disable() @@ -246,7 +246,7 @@ if (isPageDynamic()) { itemID: 'comment-username-edit-button', description: '编辑 用户名黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { usernameAction.blacklist.show() }, }), @@ -261,10 +261,10 @@ if (isPageDynamic()) { new CheckboxItem({ itemID: contentAction.statusKey, description: '启用 评论区 关键词过滤', - itemFunc: () => { + enableFunc: async () => { contentAction.enable() }, - callback: () => { + disableFunc: async () => { contentAction.disable() }, }), @@ -273,7 +273,7 @@ if (isPageDynamic()) { itemID: 'comment-content-edit-button', description: '编辑 评论关键词黑名单（支持正则）', name: '编辑', - itemFunc: () => { + itemFunc: async () => { contentAction.blacklist.show() }, }), @@ -286,11 +286,11 @@ if (isPageDynamic()) { new CheckboxItem({ itemID: 'dynamic-comment-root-whitelist-status', description: '一级评论(主评论) 免过滤', - itemFunc: () => { + enableFunc: async () => { isRootCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isRootCommentWhitelistEnable = false checkCommentList(true) }, @@ -299,11 +299,11 @@ if (isPageDynamic()) { new CheckboxItem({ itemID: 'dynamic-comment-sub-whitelist-status', description: '二级评论(回复) 免过滤', - itemFunc: () => { + enableFunc: async () => { isSubCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isSubCommentWhitelistEnable = false checkCommentList(true) }, @@ -313,11 +313,11 @@ if (isPageDynamic()) { itemID: 'dynamic-comment-uploader-whitelist-status', description: 'UP主的评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isUploaderCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isUploaderCommentWhitelistEnable = false checkCommentList(true) }, @@ -327,11 +327,11 @@ if (isPageDynamic()) { itemID: 'dynamic-comment-pinned-whitelist-status', description: '置顶评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isPinnedCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isPinnedCommentWhitelistEnable = false checkCommentList(true) }, @@ -341,11 +341,11 @@ if (isPageDynamic()) { itemID: 'dynamic-comment-note-whitelist-status', description: '笔记/图片评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isNoteCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isNoteCommentWhitelistEnable = false checkCommentList(true) }, @@ -355,11 +355,11 @@ if (isPageDynamic()) { itemID: 'dynamic-comment-link-whitelist-status', description: '含超链接的评论 免过滤\n（站内视频/URL/播放时间跳转）', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isLinkCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isLinkCommentWhitelistEnable = false checkCommentList(true) }, diff --git a/src/filters/commentFilter/pages/video.ts b/src/filters/commentFilter/pages/video.ts index 63123c44..0e2c2a84 100644 --- a/src/filters/commentFilter/pages/video.ts +++ b/src/filters/commentFilter/pages/video.ts @@ -149,12 +149,12 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { if (usernameAction.status || contentAction.status) { checkCommentList(true) } - const commentObverser = new MutationObserver(() => { + const commentObserver = new MutationObserver(() => { if (usernameAction.status || contentAction.status) { checkCommentList(false) } }) - commentObverser.observe(commentListContainer, { childList: true, subtree: true }) + commentObserver.observe(commentListContainer, { childList: true, subtree: true }) } } @@ -215,13 +215,13 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { new CheckboxItem({ itemID: usernameAction.statusKey, description: '启用 评论区 用户名过滤\n(右键单击用户名)', - itemFunc: () => { + enableFunc: async () => { // 启用右键菜单功能 isContextMenuUsernameEnable = true contextMenuFunc() usernameAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键菜单功能 isContextMenuUsernameEnable = false usernameAction.disable() @@ -232,7 +232,7 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'comment-username-edit-button', description: '编辑 用户名黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { usernameAction.blacklist.show() }, }), @@ -247,10 +247,10 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { new CheckboxItem({ itemID: contentAction.statusKey, description: '启用 评论区 关键词过滤', - itemFunc: () => { + enableFunc: async () => { contentAction.enable() }, - callback: () => { + disableFunc: async () => { contentAction.disable() }, }), @@ -259,7 +259,7 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'comment-content-edit-button', description: '编辑 评论关键词黑名单（支持正则）', name: '编辑', - itemFunc: () => { + itemFunc: async () => { contentAction.blacklist.show() }, }), @@ -272,11 +272,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { new CheckboxItem({ itemID: 'video-comment-root-whitelist-status', description: '一级评论(主评论) 免过滤', - itemFunc: () => { + enableFunc: async () => { isRootCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isRootCommentWhitelistEnable = false checkCommentList(true) }, @@ -285,11 +285,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { new CheckboxItem({ itemID: 'video-comment-sub-whitelist-status', description: '二级评论(回复) 免过滤', - itemFunc: () => { + enableFunc: async () => { isSubCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isSubCommentWhitelistEnable = false checkCommentList(true) }, @@ -299,11 +299,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'video-comment-uploader-whitelist-status', description: 'UP主的评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isUploaderCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isUploaderCommentWhitelistEnable = false checkCommentList(true) }, @@ -313,11 +313,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'video-comment-pinned-whitelist-status', description: '置顶评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isPinnedCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isPinnedCommentWhitelistEnable = false checkCommentList(true) }, @@ -327,11 +327,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'video-comment-note-whitelist-status', description: '笔记/图片评论 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isNoteCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isNoteCommentWhitelistEnable = false checkCommentList(true) }, @@ -341,11 +341,11 @@ if (isPageVideo() || isPageBangumi() || isPagePlaylist()) { itemID: 'video-comment-link-whitelist-status', description: '含超链接的评论 免过滤\n（站内视频/URL/播放时间跳转）', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isLinkCommentWhitelistEnable = true checkCommentList(true) }, - callback: () => { + disableFunc: async () => { isLinkCommentWhitelistEnable = false checkCommentList(true) }, diff --git a/src/filters/videoFilter/pages/actions/action.ts b/src/filters/videoFilter/pages/actions/action.ts index 421eae41..da0f8f18 100644 --- a/src/filters/videoFilter/pages/actions/action.ts +++ b/src/filters/videoFilter/pages/actions/action.ts @@ -186,7 +186,6 @@ export class DimensionAction implements VideoFilterAction { /** * 视频横竖屏过滤操作 * @param statusKey 是否启用的GM key - * @param valueKey 存储数据的GM key * @param checkVideoList 检测视频列表函数 */ constructor(statusKey: string, checkVideoList: (fullSite: boolean) => void) { diff --git a/src/filters/videoFilter/pages/channel.ts b/src/filters/videoFilter/pages/channel.ts index bdb24ef1..6890adca 100644 --- a/src/filters/videoFilter/pages/channel.ts +++ b/src/filters/videoFilter/pages/channel.ts @@ -111,7 +111,7 @@ if (isPageChannel()) { 'global-uploader-whitelist-filter-value', checkVideoList, ) - const channelTitleKeyworldWhitelistAction = new TitleKeywordWhitelistAction( + const channelTitleKeywordWhitelistAction = new TitleKeywordWhitelistAction( 'channel-title-keyword-whitelist-filter-status', 'global-title-keyword-whitelist-filter-value', checkVideoList, @@ -132,12 +132,12 @@ if (isPageChannel()) { } if (videoListContainer) { // 初次全站检测 - check(true) - const videoObverser = new MutationObserver(() => { + check(true).then().catch() + const videoObserver = new MutationObserver(() => { // 增量检测 - check(false) + check(false).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true, subtree: true }) + videoObserver.observe(videoListContainer, { childList: true, subtree: true }) debug('watchVideoListContainer OK') } } @@ -208,7 +208,7 @@ if (isPageChannel()) { channelBvidAction.add(bvid) }) menu.registerMenu(`◎ 复制视频链接`, () => { - navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`) + navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`).then().catch() }) menu.show(e.clientX, e.clientY) } @@ -240,10 +240,10 @@ if (isPageChannel()) { * * 可以在传递方法时使用箭头函数来保持 this 的上下文 */ - itemFunc: () => { + enableFunc: async () => { channelDurationAction.enable() }, - callback: () => { + disableFunc: async () => { channelDurationAction.disable() }, }), @@ -256,7 +256,7 @@ if (isPageChannel()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { channelDurationAction.change(value) }, }), @@ -269,13 +269,13 @@ if (isPageChannel()) { new CheckboxItem({ itemID: channelUploaderAction.statusKey, description: '启用 UP主过滤 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuUploaderEnable = true contextMenuFunc() channelUploaderAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuUploaderEnable = false channelUploaderAction.disable() @@ -287,7 +287,7 @@ if (isPageChannel()) { description: '编辑 UP主黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { channelUploaderAction.blacklist.show() }, }), @@ -295,10 +295,10 @@ if (isPageChannel()) { new CheckboxItem({ itemID: channelUploaderKeywordAction.statusKey, description: '启用 UP主昵称关键词过滤', - itemFunc: () => { + enableFunc: async () => { channelUploaderKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { channelUploaderKeywordAction.disable() }, }), @@ -307,7 +307,7 @@ if (isPageChannel()) { itemID: 'channel-uploader-keyword-edit-button', description: '编辑 UP主昵称关键词黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { channelUploaderKeywordAction.blacklist.show() }, }), @@ -320,10 +320,10 @@ if (isPageChannel()) { new CheckboxItem({ itemID: channelTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { channelTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { channelTitleKeywordAction.disable() }, }), @@ -333,7 +333,7 @@ if (isPageChannel()) { description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { channelTitleKeywordAction.blacklist.show() }, }), @@ -348,13 +348,13 @@ if (isPageChannel()) { new CheckboxItem({ itemID: channelBvidAction.statusKey, description: '启用 BV号过滤', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuBvidEnable = true contextMenuFunc() channelBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuBvidEnable = false channelBvidAction.disable() @@ -366,7 +366,7 @@ if (isPageChannel()) { description: '编辑 BV号黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { channelBvidAction.blacklist.show() }, }), @@ -381,10 +381,10 @@ if (isPageChannel()) { new CheckboxItem({ itemID: channelUploaderWhitelistAction.statusKey, description: '启用 UP主白名单 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { channelUploaderWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { channelUploaderWhitelistAction.disable() }, }), @@ -394,19 +394,19 @@ if (isPageChannel()) { description: '编辑 UP主白名单', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { + itemFunc: async () => { channelUploaderWhitelistAction.whitelist.show() }, }), // 启用 频道页标题关键词白名单 new CheckboxItem({ - itemID: channelTitleKeyworldWhitelistAction.statusKey, + itemID: channelTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { - channelTitleKeyworldWhitelistAction.enable() + enableFunc: async () => { + channelTitleKeywordWhitelistAction.enable() }, - callback: () => { - channelTitleKeyworldWhitelistAction.disable() + disableFunc: async () => { + channelTitleKeywordWhitelistAction.disable() }, }), // 编辑 关键词白名单 @@ -415,8 +415,8 @@ if (isPageChannel()) { description: '编辑 标题关键词白名单（支持正则）', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { - channelTitleKeyworldWhitelistAction.whitelist.show() + itemFunc: async () => { + channelTitleKeywordWhitelistAction.whitelist.show() }, }), ] diff --git a/src/filters/videoFilter/pages/homepage.ts b/src/filters/videoFilter/pages/homepage.ts index dbd611bf..f2b22309 100644 --- a/src/filters/videoFilter/pages/homepage.ts +++ b/src/filters/videoFilter/pages/homepage.ts @@ -144,7 +144,7 @@ if (isPageHomepage()) { 'global-uploader-whitelist-filter-value', checkVideoList, ) - const homepageTitleKeyworldWhitelistAction = new TitleKeywordWhitelistAction( + const homepageTitleKeywordWhitelistAction = new TitleKeywordWhitelistAction( 'homepage-title-keyword-whitelist-filter-status', 'global-title-keyword-whitelist-filter-value', checkVideoList, @@ -165,12 +165,12 @@ if (isPageHomepage()) { } if (videoListContainer) { // 初次全站检测 - check(true) - const videoObverser = new MutationObserver(() => { + check(true).then().catch() + const videoObserver = new MutationObserver(() => { // 增量检测 - check(false) + check(false).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true }) + videoObserver.observe(videoListContainer, { childList: true }) debug('watchVideoListContainer OK') } } @@ -242,7 +242,7 @@ if (isPageHomepage()) { homepageBvidAction.add(bvid) }) menu.registerMenu(`◎ 复制视频链接`, () => { - navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`) + navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`).then().catch() }) menu.show(e.clientX, e.clientY) } @@ -274,10 +274,10 @@ if (isPageHomepage()) { * * 可以在传递方法时使用箭头函数来保持 this 的上下文 */ - itemFunc: () => { + enableFunc: async () => { homepageDurationAction.enable() }, - callback: () => { + disableFunc: async () => { homepageDurationAction.disable() }, }), @@ -290,7 +290,7 @@ if (isPageHomepage()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { homepageDurationAction.change(value) }, }), @@ -303,13 +303,13 @@ if (isPageHomepage()) { new CheckboxItem({ itemID: homepageUploaderAction.statusKey, description: '启用 UP主过滤 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuUploaderEnable = true contextMenuFunc() homepageUploaderAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuUploaderEnable = false homepageUploaderAction.disable() @@ -321,7 +321,7 @@ if (isPageHomepage()) { description: '编辑 UP主黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { homepageUploaderAction.blacklist.show() }, }), @@ -329,10 +329,10 @@ if (isPageHomepage()) { new CheckboxItem({ itemID: homepageUploaderKeywordAction.statusKey, description: '启用 UP主昵称关键词过滤', - itemFunc: () => { + enableFunc: async () => { homepageUploaderKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { homepageUploaderKeywordAction.disable() }, }), @@ -341,7 +341,7 @@ if (isPageHomepage()) { itemID: 'homepage-uploader-keyword-edit-button', description: '编辑 UP主昵称关键词黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { homepageUploaderKeywordAction.blacklist.show() }, }), @@ -354,10 +354,10 @@ if (isPageHomepage()) { new CheckboxItem({ itemID: homepageTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { homepageTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { homepageTitleKeywordAction.disable() }, }), @@ -367,7 +367,7 @@ if (isPageHomepage()) { description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { homepageTitleKeywordAction.blacklist.show() }, }), @@ -382,13 +382,13 @@ if (isPageHomepage()) { new CheckboxItem({ itemID: homepageBvidAction.statusKey, description: '启用 BV号过滤 (右键单击标题)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuBvidEnable = true contextMenuFunc() homepageBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuBvidEnable = false homepageBvidAction.disable() @@ -400,7 +400,7 @@ if (isPageHomepage()) { description: '编辑 BV号黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { homepageBvidAction.blacklist.show() }, }), @@ -414,12 +414,12 @@ if (isPageHomepage()) { itemID: 'homepage-following-whitelist-filter-status', description: '标有 [已关注] 的视频免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isFollowingWhitelistEnable = true // 触发全站检测 checkVideoList(true) }, - callback: () => { + disableFunc: async () => { isFollowingWhitelistEnable = false checkVideoList(true) }, @@ -428,10 +428,10 @@ if (isPageHomepage()) { new CheckboxItem({ itemID: homepageUploaderWhitelistAction.statusKey, description: '启用 UP主白名单 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { homepageUploaderWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { homepageUploaderWhitelistAction.disable() }, }), @@ -441,19 +441,19 @@ if (isPageHomepage()) { description: '编辑 UP主白名单', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { + itemFunc: async () => { homepageUploaderWhitelistAction.whitelist.show() }, }), // 启用 首页标题关键词白名单 new CheckboxItem({ - itemID: homepageTitleKeyworldWhitelistAction.statusKey, + itemID: homepageTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { - homepageTitleKeyworldWhitelistAction.enable() + enableFunc: async () => { + homepageTitleKeywordWhitelistAction.enable() }, - callback: () => { - homepageTitleKeyworldWhitelistAction.disable() + disableFunc: async () => { + homepageTitleKeywordWhitelistAction.disable() }, }), // 编辑 关键词白名单 @@ -462,8 +462,8 @@ if (isPageHomepage()) { description: '编辑 标题关键词白名单（支持正则）', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { - homepageTitleKeyworldWhitelistAction.whitelist.show() + itemFunc: async () => { + homepageTitleKeywordWhitelistAction.whitelist.show() }, }), ] diff --git a/src/filters/videoFilter/pages/popular.ts b/src/filters/videoFilter/pages/popular.ts index 5536c692..6b616f0d 100644 --- a/src/filters/videoFilter/pages/popular.ts +++ b/src/filters/videoFilter/pages/popular.ts @@ -39,13 +39,12 @@ if (isPagePopular()) { // hook fetch let apiResp: Response | undefined = undefined const origFetch = unsafeWindow.fetch - unsafeWindow.fetch = (input, init?) => { + unsafeWindow.fetch = async (input, init?) => { if (typeof input === 'string' && input.includes('api.bilibili.com') && init?.method?.toUpperCase() === 'GET') { if (input.match(/web-interface\/(ranking|popular\/series\/one|popular\?ps)/)) { - return origFetch(input, init).then((resp: Response) => { - apiResp = resp.clone() - return resp - }) + const resp = await origFetch(input, init) + apiResp = resp.clone() + return resp } } return origFetch(input, init) @@ -242,18 +241,18 @@ if (isPagePopular()) { if (location.pathname.match(/\/v\/popular\/(?:all|rank|weekly)/)) { popularDurationAction.status || popularQualityAction.status || popularDimensionAction.status ? await parseResp() - : parseResp() + : parseResp().then().catch() } checkVideoList(fullSite) } } if (videoListContainer) { - check(true) - const videoObverser = new MutationObserver(async () => { - check(true) + check(true).then().catch() + const videoObserver = new MutationObserver(async () => { + check(true).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true, subtree: true }) + videoObserver.observe(videoListContainer, { childList: true, subtree: true }) debug('watchVideoListContainer OK') } } @@ -265,7 +264,7 @@ if (isPagePopular()) { }).then((ele) => { if (ele) { videoListContainer = ele - watchVideoListContainer() + watchVideoListContainer().then().catch() } }) } catch (err) { @@ -346,10 +345,10 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularDurationAction.statusKey, description: '启用 时长过滤 (刷新)', - itemFunc: () => { + enableFunc: async () => { popularDurationAction.enable() }, - callback: () => { + disableFunc: async () => { popularDurationAction.disable() }, }), @@ -361,7 +360,7 @@ if (isPagePopular()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { popularDurationAction.change(value) }, }), @@ -373,20 +372,20 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularDimensionAction.statusKey, description: '启用 竖屏视频过滤 (刷新)', - itemFunc: () => { + enableFunc: async () => { popularDimensionAction.enable() }, - callback: () => { + disableFunc: async () => { popularDimensionAction.disable() }, }), new CheckboxItem({ itemID: popularQualityAction.statusKey, description: '启用 劣质视频过滤 (刷新)', - itemFunc: () => { + enableFunc: async () => { popularQualityAction.enable() }, - callback: () => { + disableFunc: async () => { popularQualityAction.disable() }, }), @@ -398,7 +397,7 @@ if (isPagePopular()) { maxValue: 80, disableValue: 0, unit: '%', - callback: (value: number) => { + callback: async (value: number) => { popularQualityAction.change(value) }, }), @@ -413,13 +412,13 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularUploaderAction.statusKey, description: '启用 UP主过滤 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuUploaderEnable = true contextMenuFunc() popularUploaderAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuUploaderEnable = false popularUploaderAction.disable() @@ -431,7 +430,7 @@ if (isPagePopular()) { description: '编辑 UP主黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { popularUploaderAction.blacklist.show() }, }), @@ -439,10 +438,10 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularUploaderKeywordAction.statusKey, description: '启用 UP主昵称关键词过滤', - itemFunc: () => { + enableFunc: async () => { popularUploaderKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { popularUploaderKeywordAction.disable() }, }), @@ -451,7 +450,7 @@ if (isPagePopular()) { itemID: 'popular-uploader-keyword-edit-button', description: '编辑 UP主昵称关键词黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { popularUploaderKeywordAction.blacklist.show() }, }), @@ -464,10 +463,10 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { popularTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { popularTitleKeywordAction.disable() }, }), @@ -477,7 +476,7 @@ if (isPagePopular()) { description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { popularTitleKeywordAction.blacklist.show() }, }), @@ -492,13 +491,13 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularBvidAction.statusKey, description: '启用 BV号过滤 (右键单击标题)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuBvidEnable = true contextMenuFunc() popularBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuBvidEnable = false popularBvidAction.disable() @@ -510,7 +509,7 @@ if (isPagePopular()) { description: '编辑 BV号黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { popularBvidAction.blacklist.show() }, }), @@ -523,10 +522,10 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularUploaderWhitelistAction.statusKey, description: '启用 UP主白名单 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { popularUploaderWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { popularUploaderWhitelistAction.disable() }, }), @@ -536,7 +535,7 @@ if (isPagePopular()) { description: '编辑 UP主白名单', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { + itemFunc: async () => { popularUploaderWhitelistAction.whitelist.show() }, }), @@ -544,10 +543,10 @@ if (isPagePopular()) { new CheckboxItem({ itemID: popularTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { + enableFunc: async () => { popularTitleKeywordWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { popularTitleKeywordWhitelistAction.disable() }, }), @@ -557,7 +556,7 @@ if (isPagePopular()) { description: '编辑 标题关键词白名单（支持正则）', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { + itemFunc: async () => { popularTitleKeywordWhitelistAction.whitelist.show() }, }), diff --git a/src/filters/videoFilter/pages/search.ts b/src/filters/videoFilter/pages/search.ts index 58e49992..2441d078 100644 --- a/src/filters/videoFilter/pages/search.ts +++ b/src/filters/videoFilter/pages/search.ts @@ -115,7 +115,7 @@ if (isPageSearch()) { 'global-uploader-whitelist-filter-value', checkVideoList, ) - const searchTitleKeyworldWhitelistAction = new TitleKeywordWhitelistAction( + const searchTitleKeywordWhitelistAction = new TitleKeywordWhitelistAction( 'search-title-keyword-whitelist-filter-status', 'global-title-keyword-whitelist-filter-value', checkVideoList, @@ -135,11 +135,11 @@ if (isPageSearch()) { } } if (videoListContainer) { - check(true) - const videoObverser = new MutationObserver(() => { - check(true) + check(true).then().catch() + const videoObserver = new MutationObserver(() => { + check(true).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true, subtree: true }) + videoObserver.observe(videoListContainer, { childList: true, subtree: true }) debug('watchVideoListContainer OK') } } @@ -210,7 +210,7 @@ if (isPageSearch()) { searchBvidAction.add(bvid) }) menu.registerMenu(`◎ 复制视频链接`, () => { - navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`) + navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`).then().catch() }) menu.show(e.clientX, e.clientY) } @@ -231,10 +231,10 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchDurationAction.statusKey, description: '启用 时长过滤', - itemFunc: () => { + enableFunc: async () => { searchDurationAction.enable() }, - callback: () => { + disableFunc: async () => { searchDurationAction.disable() }, }), @@ -246,7 +246,7 @@ if (isPageSearch()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { searchDurationAction.change(value) }, }), @@ -258,13 +258,13 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchUploaderAction.statusKey, description: '启用 UP主过滤 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuUploaderEnable = true contextMenuFunc() searchUploaderAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuUploaderEnable = false searchUploaderAction.disable() @@ -276,7 +276,7 @@ if (isPageSearch()) { description: '编辑 UP主黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { searchUploaderAction.blacklist.show() }, }), @@ -284,10 +284,10 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchUploaderKeywordAction.statusKey, description: '启用 UP主昵称关键词过滤', - itemFunc: () => { + enableFunc: async () => { searchUploaderKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { searchUploaderKeywordAction.disable() }, }), @@ -296,7 +296,7 @@ if (isPageSearch()) { itemID: 'search-uploader-keyword-edit-button', description: '编辑 UP主昵称关键词黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { searchUploaderKeywordAction.blacklist.show() }, }), @@ -308,10 +308,10 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { searchTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { searchTitleKeywordAction.disable() }, }), @@ -321,7 +321,7 @@ if (isPageSearch()) { description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { searchTitleKeywordAction.blacklist.show() }, }), @@ -335,13 +335,13 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchBvidAction.statusKey, description: '启用 BV号过滤 (右键单击标题)', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuBvidEnable = true contextMenuFunc() searchBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuBvidEnable = false searchBvidAction.disable() @@ -353,7 +353,7 @@ if (isPageSearch()) { description: '编辑 BV号黑名单', name: '编辑', // 按钮功能 - itemFunc: () => { + itemFunc: async () => { searchBvidAction.blacklist.show() }, }), @@ -367,12 +367,12 @@ if (isPageSearch()) { itemID: 'search-top-uploader-whitelist-filter-status', description: '搜索结果顶部UP主视频免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isTopUploaderWhitelistEnable = true // 触发全站检测 checkVideoList(true) }, - callback: () => { + disableFunc: async () => { isTopUploaderWhitelistEnable = false checkVideoList(true) }, @@ -380,10 +380,10 @@ if (isPageSearch()) { new CheckboxItem({ itemID: searchUploaderWhitelistAction.statusKey, description: '启用 UP主白名单', - itemFunc: () => { + enableFunc: async () => { searchUploaderWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { searchUploaderWhitelistAction.disable() }, }), @@ -392,18 +392,18 @@ if (isPageSearch()) { description: '编辑 UP主白名单', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { + itemFunc: async () => { searchUploaderWhitelistAction.whitelist.show() }, }), new CheckboxItem({ - itemID: searchTitleKeyworldWhitelistAction.statusKey, + itemID: searchTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { - searchTitleKeyworldWhitelistAction.enable() + enableFunc: async () => { + searchTitleKeywordWhitelistAction.enable() }, - callback: () => { - searchTitleKeyworldWhitelistAction.disable() + disableFunc: async () => { + searchTitleKeywordWhitelistAction.disable() }, }), new ButtonItem({ @@ -411,8 +411,8 @@ if (isPageSearch()) { description: '编辑 标题关键词白名单（支持正则）', name: '编辑', // 按钮功能：显示白名单编辑器 - itemFunc: () => { - searchTitleKeyworldWhitelistAction.whitelist.show() + itemFunc: async () => { + searchTitleKeywordWhitelistAction.whitelist.show() }, }), ] diff --git a/src/filters/videoFilter/pages/space.ts b/src/filters/videoFilter/pages/space.ts index 52787c60..6857f781 100644 --- a/src/filters/videoFilter/pages/space.ts +++ b/src/filters/videoFilter/pages/space.ts @@ -82,7 +82,7 @@ if (isPageSpace()) { 'global-title-keyword-filter-value', checkVideoList, ) - const spaceTitleKeyworldWhitelistAction = new TitleKeywordWhitelistAction( + const spaceTitleKeywordWhitelistAction = new TitleKeywordWhitelistAction( 'space-title-keyword-whitelist-filter-status', 'global-title-keyword-whitelist-filter-value', checkVideoList, @@ -96,12 +96,12 @@ if (isPageSpace()) { } } if (videoListContainer) { - check(true) - const videoObverser = new MutationObserver(() => { + check(true).then().catch() + const videoObserver = new MutationObserver(() => { // 全量检测 - check(true) + check(true).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true, subtree: true }) + videoObserver.observe(videoListContainer, { childList: true, subtree: true }) debug('watchVideoListContainer OK') } } @@ -147,7 +147,7 @@ if (isPageSpace()) { spaceBvidAction.add(bvid) }) menu.registerMenu(`◎ 复制视频链接`, () => { - navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`) + navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`).then().catch() }) menu.show(e.clientX, e.clientY) } @@ -184,10 +184,10 @@ if (isPageSpace()) { new CheckboxItem({ itemID: spaceDurationAction.statusKey, description: '启用 时长过滤', - itemFunc: () => { + enableFunc: async () => { spaceDurationAction.enable() }, - callback: () => { + disableFunc: async () => { spaceDurationAction.disable() }, itemCSS: patchCSS, @@ -201,7 +201,7 @@ if (isPageSpace()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { spaceDurationAction.change(value) }, }), @@ -214,10 +214,10 @@ if (isPageSpace()) { new CheckboxItem({ itemID: spaceTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { spaceTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { spaceTitleKeywordAction.disable() }, itemCSS: patchCSS, @@ -227,7 +227,7 @@ if (isPageSpace()) { itemID: 'space-title-keyword-edit-button', description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', - itemFunc: () => { + itemFunc: async () => { spaceTitleKeywordAction.blacklist.show() }, }), @@ -242,13 +242,13 @@ if (isPageSpace()) { new CheckboxItem({ itemID: spaceBvidAction.statusKey, description: '启用 BV号过滤', - itemFunc: () => { + enableFunc: async () => { // 启用右键功能 isContextMenuBvidEnable = true contextMenuFunc() spaceBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键功能 isContextMenuBvidEnable = false spaceBvidAction.disable() @@ -260,7 +260,7 @@ if (isPageSpace()) { itemID: 'space-bvid-edit-button', description: '编辑 BV号黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { spaceBvidAction.blacklist.show() }, }), @@ -273,13 +273,13 @@ if (isPageSpace()) { const whitelistItems = [ // 启用 空间页标题关键词白名单 new CheckboxItem({ - itemID: spaceTitleKeyworldWhitelistAction.statusKey, + itemID: spaceTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { - spaceTitleKeyworldWhitelistAction.enable() + enableFunc: async () => { + spaceTitleKeywordWhitelistAction.enable() }, - callback: () => { - spaceTitleKeyworldWhitelistAction.disable() + disableFunc: async () => { + spaceTitleKeywordWhitelistAction.disable() }, }), // 编辑 标题关键词白名单 @@ -287,8 +287,8 @@ if (isPageSpace()) { itemID: 'space-title-keyword-whitelist-edit-button', description: '编辑 标题关键词白名单（支持正则）', name: '编辑', - itemFunc: () => { - spaceTitleKeyworldWhitelistAction.whitelist.show() + itemFunc: async () => { + spaceTitleKeywordWhitelistAction.whitelist.show() }, }), ] diff --git a/src/filters/videoFilter/pages/video.ts b/src/filters/videoFilter/pages/video.ts index 26c1dbe9..6a47d888 100644 --- a/src/filters/videoFilter/pages/video.ts +++ b/src/filters/videoFilter/pages/video.ts @@ -134,12 +134,12 @@ if (isPageVideo() || isPagePlaylist()) { } } if (videoListContainer) { - check(true) - const videoObverser = new MutationObserver(() => { + check(true).then().catch() + const videoObserver = new MutationObserver(() => { // 播放页右栏载入慢, 始终做全站检测 - check(true) + check(true).then().catch() }) - videoObverser.observe(videoListContainer, { childList: true, subtree: true }) + videoObserver.observe(videoListContainer, { childList: true, subtree: true }) debug('watchVideoListContainer OK') } } @@ -249,7 +249,7 @@ if (isPageVideo() || isPagePlaylist()) { const matches = url.match(/space\.bilibili\.com\/\d+/g) matches && menu.registerMenu(`◎ 复制主页链接`, () => { - navigator.clipboard.writeText(`https://${matches[0]}`) + navigator.clipboard.writeText(`https://${matches[0]}`).then().catch() }) } menu.show(e.clientX, e.clientY) @@ -265,7 +265,7 @@ if (isPageVideo() || isPagePlaylist()) { videoBvidAction.add(bvid) }) menu.registerMenu(`◎ 复制视频链接`, () => { - navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`) + navigator.clipboard.writeText(`https://www.bilibili.com/video/${bvid}`).then().catch() }) menu.show(e.clientX, e.clientY) } @@ -287,10 +287,10 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoDurationAction.statusKey, description: '启用 时长过滤', - itemFunc: () => { + enableFunc: async () => { videoDurationAction.enable() }, - callback: () => { + disableFunc: async () => { videoDurationAction.disable() }, }), @@ -303,7 +303,7 @@ if (isPageVideo() || isPagePlaylist()) { maxValue: 300, disableValue: 0, unit: '秒', - callback: (value: number) => { + callback: async (value: number) => { videoDurationAction.change(value) }, }), @@ -316,13 +316,13 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoUploaderAction.statusKey, description: '启用 UP主过滤 (右键单击UP主)', - itemFunc: () => { + enableFunc: async () => { // 启用右键菜单功能 isContextMenuUploaderEnable = true contextMenuFunc() videoUploaderAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用右键菜单功能 isContextMenuUploaderEnable = false videoUploaderAction.disable() @@ -334,7 +334,7 @@ if (isPageVideo() || isPagePlaylist()) { description: '编辑 UP主黑名单', name: '编辑', // 按钮功能：打开编辑器 - itemFunc: () => { + itemFunc: async () => { videoUploaderAction.blacklist.show() }, }), @@ -342,10 +342,10 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoUploaderKeywordAction.statusKey, description: '启用 UP主昵称关键词过滤', - itemFunc: () => { + enableFunc: async () => { videoUploaderKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { videoUploaderKeywordAction.disable() }, }), @@ -354,7 +354,7 @@ if (isPageVideo() || isPagePlaylist()) { itemID: 'video-uploader-keyword-edit-button', description: '编辑 UP主昵称关键词黑名单', name: '编辑', - itemFunc: () => { + itemFunc: async () => { videoUploaderKeywordAction.blacklist.show() }, }), @@ -367,10 +367,10 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoTitleKeywordAction.statusKey, description: '启用 标题关键词过滤', - itemFunc: () => { + enableFunc: async () => { videoTitleKeywordAction.enable() }, - callback: () => { + disableFunc: async () => { videoTitleKeywordAction.disable() }, }), @@ -380,7 +380,7 @@ if (isPageVideo() || isPagePlaylist()) { description: '编辑 标题关键词黑名单（支持正则）', name: '编辑', // 按钮功能：打开编辑器 - itemFunc: () => { + itemFunc: async () => { videoTitleKeywordAction.blacklist.show() }, }), @@ -395,13 +395,13 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoBvidAction.statusKey, description: '启用 BV号过滤 (右键单击标题)', - itemFunc: () => { + enableFunc: async () => { // 启用 右键功能 isContextMenuBvidEnable = true contextMenuFunc() videoBvidAction.enable() }, - callback: () => { + disableFunc: async () => { // 禁用 右键功能 isContextMenuBvidEnable = false videoBvidAction.disable() @@ -413,7 +413,7 @@ if (isPageVideo() || isPagePlaylist()) { description: '编辑 BV号黑名单', name: '编辑', // 按钮功能：打开编辑器 - itemFunc: () => { + itemFunc: async () => { videoBvidAction.blacklist.show() }, }), @@ -427,11 +427,11 @@ if (isPageVideo() || isPagePlaylist()) { itemID: 'video-next-play-whitelist-filter-status', description: '接下来播放 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isNextPlayWhitelistEnable = true checkVideoList(true) }, - callback: () => { + disableFunc: async () => { isNextPlayWhitelistEnable = false checkVideoList(true) }, @@ -441,13 +441,13 @@ if (isPageVideo() || isPagePlaylist()) { itemID: 'video-ending-whitelist-filter-status', description: '视频播放结束推荐 免过滤', defaultStatus: true, - itemFunc: () => { + enableFunc: async () => { isEndingWhitelistEnable = true document .querySelectorAll('.bpx-player-ending-related-item') .forEach((e: HTMLElement) => showEle(e)) }, - callback: () => { + disableFunc: async () => { isEndingWhitelistEnable = false watchPlayerEnding() }, @@ -456,10 +456,10 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoUploaderWhitelistAction.statusKey, description: '启用 UP主白名单', - itemFunc: () => { + enableFunc: async () => { videoUploaderWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { videoUploaderWhitelistAction.disable() }, }), @@ -469,7 +469,7 @@ if (isPageVideo() || isPagePlaylist()) { description: '编辑 UP主白名单', name: '编辑', // 按钮功能：打开编辑器 - itemFunc: () => { + itemFunc: async () => { videoUploaderWhitelistAction.whitelist.show() }, }), @@ -477,10 +477,10 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: videoTitleKeywordWhitelistAction.statusKey, description: '启用 标题关键词白名单', - itemFunc: () => { + enableFunc: async () => { videoTitleKeywordWhitelistAction.enable() }, - callback: () => { + disableFunc: async () => { videoTitleKeywordWhitelistAction.disable() }, }), @@ -490,7 +490,7 @@ if (isPageVideo() || isPagePlaylist()) { description: '编辑 标题关键词白名单（支持正则）', name: '编辑', // 按钮功能：打开编辑器 - itemFunc: () => { + itemFunc: async () => { videoTitleKeywordWhitelistAction.whitelist.show() }, }), diff --git a/src/global.d.ts b/src/global.d.ts index d2a632b5..cf2e27b1 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -7,5 +7,17 @@ export declare global { aid?: number bvid?: string } + player: + | { + __core: () => { + uiStore: { + state: { + miniScreenBottom: number + miniScreenRight: number + } + } + } + } + | undefined } } diff --git a/src/rules/bangumi.ts b/src/rules/bangumi.ts index ea585f61..d869a387 100644 --- a/src/rules/bangumi.ts +++ b/src/rules/bangumi.ts @@ -1,4 +1,4 @@ -import { GM_getValue, GM_setValue } from '$' +import { GM_getValue, GM_setValue, unsafeWindow } from '$' import { Group } from '../components/group' import { CheckboxItem, NumberItem } from '../components/item' import { error } from '../utils/logger' @@ -28,31 +28,27 @@ if (isPageBangumi()) { #share-container-id [class^='Share_boxTopRight'] {display: none !important;} #share-container-id [class^='Share_boxTopLeft'] {padding: 0 !important;} `, - itemFunc: () => { + enableFunc: async () => { // 监听shareBtn出现 - const listener = () => { - let counter = 0 - const id = setInterval(() => { - counter++ - const shareBtn = document.getElementById('share-container-id') - if (shareBtn) { - clearInterval(id) - // 新增click事件覆盖剪贴板 - shareBtn.addEventListener('click', () => { - const mainTitle = document.querySelector("[class^='mediainfo_mediaTitle']")?.textContent - const subTitle = document.getElementById('player-title')?.textContent - const shareText = `《${mainTitle}》${subTitle} \nhttps://www.bilibili.com${location.pathname}` - navigator.clipboard.writeText(shareText) - }) - } else if (counter > 50) { - clearInterval(id) - } - }, 200) - } - document.readyState === 'complete' - ? listener() - : document.addEventListener('DOMContentLoaded', listener) + let counter = 0 + const id = setInterval(() => { + counter++ + const shareBtn = document.getElementById('share-container-id') + if (shareBtn) { + clearInterval(id) + // 新增click事件覆盖剪贴板 + shareBtn.addEventListener('click', () => { + const mainTitle = document.querySelector("[class^='mediainfo_mediaTitle']")?.textContent + const subTitle = document.getElementById('player-title')?.textContent + const shareText = `《${mainTitle}》${subTitle} \nhttps://www.bilibili.com${location.pathname}` + navigator.clipboard.writeText(shareText).then().catch() + }) + } else if (counter > 50) { + clearInterval(id) + } + }, 200) }, + enableFuncRunAt: 'document-end', }), // 顶栏 滚动页面后不再吸附顶部 new CheckboxItem({ @@ -97,28 +93,24 @@ if (isPageBangumi()) { } } `, - itemFunc: () => { + enableFunc: async () => { // 在Chrome上可以神奇的禁用滚轮调节音量，Firefox不生效 document.addEventListener('wheel', disableAdjustVolume) // 监听网页全屏按钮出现 - const listener = () => { - waitForEle(document.body, '.bpx-player-ctrl-web', (node: HTMLElement): boolean => { - return node.className.includes('bpx-player-ctrl-web') - }).then((webBtn) => { - if (webBtn) { - webBtn.addEventListener('click', () => { - if (webBtn.classList.contains('bpx-state-entered')) { - window.scrollTo(0, 0) - } - }) - } - }) - } - document.readyState === 'complete' - ? listener() - : document.addEventListener('DOMContentLoaded', listener) + waitForEle(document.body, '.bpx-player-ctrl-web', (node: HTMLElement): boolean => { + return node.className.includes('bpx-player-ctrl-web') + }).then((webBtn) => { + if (webBtn) { + webBtn.addEventListener('click', () => { + if (webBtn.classList.contains('bpx-state-entered')) { + window.scrollTo(0, 0) + } + }) + } + }) }, - callback: () => document.removeEventListener('wheel', disableAdjustVolume), + enableFuncRunAt: 'document-end', + disableFunc: async () => document.removeEventListener('wheel', disableAdjustVolume), }), // 普通播放 视频宽度调节 new NumberItem({ @@ -203,6 +195,168 @@ if (isPageBangumi()) { ] bangumiGroupList.push(new Group('bangumi-player', '播放器 (★为独有项)', playerItems)) + // 小窗播放器 + const miniPlayerItems = [ + // 隐藏底边进度 + new CheckboxItem({ + itemID: 'video-page-hide-bpx-player-mini-mode-process', + description: '隐藏底边进度', + defaultStatus: true, + itemCSS: `.bpx-player-container[data-screen=mini]:not(:hover) .bpx-player-mini-progress {display: none;}`, + }), + // 隐藏弹幕 + new CheckboxItem({ + itemID: 'video-page-hide-bpx-player-mini-mode-danmaku', + description: '隐藏弹幕', + itemCSS: `.bpx-player-container[data-screen=mini] .bpx-player-row-dm-wrap {visibility: hidden !important;}`, + }), + // 滚轮调节大小 + new CheckboxItem({ + itemID: 'video-page-bpx-player-mini-mode-wheel-adjust', + description: '滚轮调节大小', + enableFunc: async () => { + try { + const insertCSS = (zoom: number) => { + const cssText = ` + .bpx-player-container[data-screen=mini] { + height: calc(225px * ${zoom}) !important; + width: calc(400px * ${zoom}) !important; + } + .bpx-player-container[data-revision="1"][data-screen=mini], + .bpx-player-container[data-revision="2"][data-screen=mini] { + height: calc(180px * ${zoom}) !important; + width: calc(320px * ${zoom}) !important; + } + @media screen and (min-width:1681px) { + .bpx-player-container[data-revision="1"][data-screen=mini], + .bpx-player-container[data-revision="2"][data-screen=mini] { + height: calc(203px * ${zoom}) !important; + width: calc(360px * ${zoom}) !important; + } + }` + .replace(/\n\s*/g, '') + .trim() + const node = document.querySelector( + `html>style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`, + ) + if (node) { + node.innerHTML = cssText + } else { + const style = document.createElement('style') + style.innerHTML = cssText + style.setAttribute('bili-cleaner-css', 'video-page-bpx-player-mini-mode-wheel-adjust') + document.documentElement.appendChild(style) + } + } + // 载入上次缩放 + const oldZoom: number | undefined = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom') + oldZoom && insertCSS(oldZoom) + + // 等player出现 + let cnt = 0 + const interval = setInterval(() => { + const player = document.querySelector('.bpx-player-container') as HTMLElement | null + if (player) { + clearInterval(interval) + // 判断鼠标位置，消除大播放器内下拉页面影响小窗大小的bug + let flag = false + player.addEventListener('mouseenter', () => { + if (player.getAttribute('data-screen') === 'mini') { + flag = true + } + }) + player.addEventListener('mouseleave', () => { + flag = false + }) + let lastZoom = oldZoom || 1 + // 监听滚轮 + player.addEventListener('wheel', (e) => { + if (flag) { + e.stopPropagation() + e.preventDefault() + const scaleSpeed = 5 + let zoom = lastZoom - (Math.sign(e.deltaY) * scaleSpeed) / 100 + zoom = zoom < 0.5 ? 0.5 : zoom + zoom = zoom > 3 ? 3 : zoom + if (zoom !== lastZoom) { + lastZoom = zoom + insertCSS(zoom) + GM_setValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom', zoom) + } + } + }) + } else { + cnt++ + if (cnt > 20) { + clearInterval(interval) + } + } + }, 500) + } catch (err) { + error('adjust mini player size error') + error(err) + } + }, + enableFuncRunAt: 'document-end', + disableFunc: async () => { + document.querySelector(`style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`)?.remove() + }, + }), + // 记录小窗位置 + new CheckboxItem({ + itemID: 'video-page-bpx-player-mini-mode-position-record', + description: '记录小窗位置', + enableFunc: async () => { + let player: HTMLElement + + // 监听mini播放器移动 + const addMiniPlayerMoveListener = () => { + if (!player) { + return + } + player.addEventListener('mouseup', () => { + if (player.getAttribute('data-screen') !== 'mini') { + return + } + GM_setValue( + 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-right', + parseInt(player.style.right), + ) + GM_setValue( + 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom', + parseInt(player.style.bottom), + ) + }) + } + // 设置player API内小窗播放器position初始值 + const setMiniPlayerState = () => { + const right = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-position-record-right') + const bottom = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom') + if (typeof right === 'number' && typeof bottom === 'number') { + if (unsafeWindow.player) { + unsafeWindow.player.__core().uiStore.state.miniScreenRight = right + unsafeWindow.player.__core().uiStore.state.miniScreenBottom = bottom + } + } + } + + waitForEle(document.body, `#bilibili-player [class^="bpx-player-video"]`, (node: HTMLElement) => { + return node.className.startsWith('bpx-player-video') + }).then(() => { + player = document.querySelector('#bilibili-player .bpx-player-container') as HTMLElement + try { + setMiniPlayerState() + addMiniPlayerMoveListener() + } catch { + // err + } + }) + }, + enableFuncRunAt: 'document-end', + }), + ] + bangumiGroupList.push(new Group('bangumi-mini-player', '小窗播放器', miniPlayerItems)) + // 播放控制 const playerControlItems = [ // 隐藏 上一个视频 @@ -302,115 +456,6 @@ if (isPageBangumi()) { defaultStatus: true, itemCSS: `.bpx-player-shadow-progress-area {display: none !important;}`, }), - // 小窗播放器 隐藏底边进度 - new CheckboxItem({ - itemID: 'video-page-hide-bpx-player-mini-mode-process', - description: '小窗播放器 隐藏底边进度', - defaultStatus: true, - itemCSS: `.bpx-player-container[data-screen=mini]:not(:hover) .bpx-player-mini-progress {display: none;}`, - }), - // 小窗播放器 隐藏弹幕 - new CheckboxItem({ - itemID: 'video-page-hide-bpx-player-mini-mode-danmaku', - description: '小窗播放器 隐藏弹幕', - itemCSS: `.bpx-player-container[data-screen=mini] .bpx-player-row-dm-wrap {visibility: hidden !important;}`, - }), - // 小窗播放器 滚轮调节大小 - new CheckboxItem({ - itemID: 'video-page-bpx-player-mini-mode-wheel-adjust', - description: '小窗播放器 滚轮调节大小', - itemFunc: () => { - const adjust = async () => { - try { - const insertCSS = (zoom: number) => { - const cssText = ` - .bpx-player-container[data-screen=mini] { - height: calc(225px * ${zoom}) !important; - width: calc(400px * ${zoom}) !important; - } - .bpx-player-container[data-revision="1"][data-screen=mini], - .bpx-player-container[data-revision="2"][data-screen=mini] { - height: calc(180px * ${zoom}) !important; - width: calc(320px * ${zoom}) !important; - } - @media screen and (min-width:1681px) { - .bpx-player-container[data-revision="1"][data-screen=mini], - .bpx-player-container[data-revision="2"][data-screen=mini] { - height: calc(203px * ${zoom}) !important; - width: calc(360px * ${zoom}) !important; - } - }` - .replace(/\n\s*/g, '') - .trim() - const node = document.querySelector( - `html>style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`, - ) - if (node) { - node.innerHTML = cssText - } else { - const style = document.createElement('style') - style.innerHTML = cssText - style.setAttribute('bili-cleaner-css', 'video-page-bpx-player-mini-mode-wheel-adjust') - document.documentElement.appendChild(style) - } - } - // 载入上次缩放 - const oldZoom: number | undefined = GM_getValue( - 'BILICLEANER_video-page-bpx-player-mini-mode-zoom', - ) - oldZoom && insertCSS(oldZoom) - - // 等player出现 - let cnt = 0 - const interval = setInterval(() => { - const player = document.querySelector('.bpx-player-container') as HTMLElement | null - if (player) { - clearInterval(interval) - // 判断鼠标位置，消除大播放器内下拉页面影响小窗大小的bug - let flag = false - player.addEventListener('mouseenter', () => { - if (player.getAttribute('data-screen') === 'mini') { - flag = true - } - }) - player.addEventListener('mouseleave', () => { - flag = false - }) - let lastZoom = oldZoom || 1 - // 监听滚轮 - player.addEventListener('wheel', (e) => { - if (flag) { - e.stopPropagation() - e.preventDefault() - const scaleSpeed = 5 - let zoom = lastZoom - (Math.sign(e.deltaY) * scaleSpeed) / 100 - zoom = zoom < 0.5 ? 0.5 : zoom - zoom = zoom > 3 ? 3 : zoom - if (zoom !== lastZoom) { - lastZoom = zoom - insertCSS(zoom) - GM_setValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom', zoom) - } - } - }) - } else { - cnt++ - if (cnt > 20) { - clearInterval(interval) - } - } - }, 500) - } catch (err) { - error('adjust mini player size error') - error(err) - } - } - document.readyState === 'complete' ? adjust() : document.addEventListener('DOMContentLoaded', adjust) - }, - callback: () => { - document.querySelector(`style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`)?.remove() - }, - }), ] bangumiGroupList.push(new Group('bangumi-player-control', '播放控制', playerControlItems)) @@ -507,7 +552,7 @@ if (isPageBangumi()) { new CheckboxItem({ itemID: 'video-page-coin-disable-auto-like', description: '投币时不自动点赞 (关闭需刷新)', - itemFunc: () => { + enableFunc: async () => { const disableAutoLike = () => { let counter = 0 const timer = setInterval(() => { diff --git a/src/rules/common.ts b/src/rules/common.ts index bf88d0b2..afe0cf47 100644 --- a/src/rules/common.ts +++ b/src/rules/common.ts @@ -340,7 +340,7 @@ const basicItems = [ * URL净化，移除query string中的跟踪参数/无用参数 * 净化掉vd_source参数会导致充电窗口载入失败 */ - itemFunc: () => { + enableFunc: async () => { const cleanParams = (url: string): string => { try { // 直播域名各种iframe页面（天选、抽奖）和活动页特殊处理 @@ -386,6 +386,8 @@ const basicItems = [ if (isPageLiveRoom()) { keysToRemove.add('bbid') keysToRemove.add('ts') + keysToRemove.add('hotRank') + keysToRemove.add('popular_rank') } const urlObj = new URL(url) const params = new URLSearchParams(urlObj.search) @@ -824,41 +826,37 @@ if (!isPageLiveHome()) { new CheckboxItem({ itemID: 'common-nav-favorite-select-watchlater', description: '收藏弹出框 自动选中稍后再看', - itemFunc: () => { - const listener = () => { - let cnt = 0 - const id = setInterval(() => { - const ele = document.querySelector( - `.right-entry .v-popover-wrap:has(.right-entry__outside[href$="/favlist"]), + enableFunc: async () => { + let cnt = 0 + const id = setInterval(() => { + const ele = document.querySelector( + `.right-entry .v-popover-wrap:has(.right-entry__outside[href$="/favlist"]), .nav-user-center .user-con .item:has(.mini-favorite)`, - ) - if (ele) { - clearInterval(id) - ele.addEventListener('mouseenter', () => { - let innerCnt = 0 - const watchLaterId = setInterval(() => { - const watchlater = document.querySelector( - `:is(.favorite-panel-popover, .vp-container .tabs-panel) .tab-item:nth-child(2)`, - ) as HTMLElement - if (watchlater) { - watchlater.click() - clearInterval(watchLaterId) - } else { - innerCnt++ - innerCnt > 250 && clearInterval(watchLaterId) - } - }, 20) - }) - } else { - cnt++ - cnt > 100 && clearInterval(id) - } - }, 200) - } - document.readyState === 'complete' - ? listener() - : document.addEventListener('DOMContentLoaded', listener) + ) + if (ele) { + clearInterval(id) + ele.addEventListener('mouseenter', () => { + let innerCnt = 0 + const watchLaterId = setInterval(() => { + const watchlater = document.querySelector( + `:is(.favorite-panel-popover, .vp-container .tabs-panel) .tab-item:nth-child(2)`, + ) as HTMLElement + if (watchlater) { + watchlater.click() + clearInterval(watchLaterId) + } else { + innerCnt++ + innerCnt > 250 && clearInterval(watchLaterId) + } + }, 20) + }) + } else { + cnt++ + cnt > 100 && clearInterval(id) + } + }, 200) }, + enableFuncRunAt: 'document-end', }), // 隐藏 历史 new CheckboxItem({ diff --git a/src/rules/dynamic.ts b/src/rules/dynamic.ts index fd73ead7..dcb2447d 100644 --- a/src/rules/dynamic.ts +++ b/src/rules/dynamic.ts @@ -348,7 +348,7 @@ if (isPageDynamic()) { new CheckboxItem({ itemID: 'dynamic-page-unfold-dynamic', description: '自动展开 相同UP主被折叠的动态', - itemFunc: () => { + enableFunc: async () => { // 大量动态下，单次耗时10ms内 const unfold = () => { const dynFoldNodes = document.querySelectorAll('main .bili-dyn-list__item .bili-dyn-item-fold') diff --git a/src/rules/homepage.ts b/src/rules/homepage.ts index 8cc686ac..ebe11388 100644 --- a/src/rules/homepage.ts +++ b/src/rules/homepage.ts @@ -465,6 +465,9 @@ if (isPageHomepage()) { } .skeleton .skeleton-item { animation: none !important; + } + .floor-skeleton .skeleton-item { + animation: none !important; }`, }), // 隐藏 视频载入 骨架(skeleton) @@ -488,7 +491,7 @@ if (isPageHomepage()) { .floor-single-card:has(.skeleton, .skeleton-item) { display: none; }`, - itemFunc: () => { + enableFunc: async () => { // hook fetch const origFetch = unsafeWindow.fetch unsafeWindow.fetch = (input, init?) => { diff --git a/src/rules/live.ts b/src/rules/live.ts index 6f901b1b..e03fa260 100644 --- a/src/rules/live.ts +++ b/src/rules/live.ts @@ -128,19 +128,14 @@ if (isPageLiveRoom()) { new CheckboxItem({ itemID: 'activity-live-auto-jump', description: '活动直播页 自动跳转普通直播 (实验功能)', - itemFunc: () => { - const jump = () => { - if (document.querySelector('#internationalHeader')) { - if (!location.href.includes('/blanc/')) { - window.location.href = location.href.replace( - 'live.bilibili.com/', - 'live.bilibili.com/blanc/', - ) - } + enableFunc: async () => { + if (document.querySelector('#internationalHeader')) { + if (!location.href.includes('/blanc/')) { + window.location.href = location.href.replace('live.bilibili.com/', 'live.bilibili.com/blanc/') } } - document.readyState === 'complete' ? jump() : document.addEventListener('DOMContentLoaded', jump) }, + enableFuncRunAt: 'document-end', }), ] liveGroupList.push(new Group('live-basic', '直播页 基本功能', basicItems)) @@ -287,7 +282,7 @@ if (isPageLiveRoom()) { new CheckboxItem({ itemID: 'live-page-clean-counter-danmaku', description: '隐藏 计数结尾弹幕，如 ???? x24', - itemFunc: () => { + enableFunc: async () => { enableCleanCounter = true cleanLiveDanmaku() }, @@ -296,7 +291,7 @@ if (isPageLiveRoom()) { new CheckboxItem({ itemID: 'live-page-clean-redundant-text-danmaku', description: '隐藏 文字重复多遍的弹幕 (n≥5)\n如 prprprprpr, 88888888', - itemFunc: () => { + enableFunc: async () => { enableCleanRedundant = true cleanLiveDanmaku() }, @@ -340,15 +335,39 @@ if (isPageLiveRoom()) { ] liveGroupList.push(new Group('live-player', '播放器', playerItems)) - // 右栏 + // 右栏 弹幕列表 const rightContainerItems = [ - // 隐藏 高能榜/大航海 (需刷新) + // 隐藏 高能榜/大航海 new CheckboxItem({ itemID: 'live-page-rank-list-vm', - description: '隐藏 高能榜/大航海 (需刷新)', - itemCSS: `#rank-list-vm {display: none !important;} - #aside-area-vm {overflow: hidden;} - .chat-history-panel {height: calc(100% - 145px) !important; padding-top: 8px;}`, + description: '隐藏 高能榜/大航海', + // calc中强调单位，var变量必须添加单位，否则fallback + itemCSS: ` + #rank-list-vm { + display: none !important; + } + .chat-history-panel { + --rank-list-height: 0px; + height: calc(100% - var(--rank-list-height, 178px) - var(--chat-control-panel-height, 145px)) !important; + } + #chat-control-panel-vm { + height: var(--chat-control-panel-height, 145px) !important; + } + #aside-area-vm { + overflow: hidden; + } + `, + }), + // 使弹幕列表紧凑, 默认开启 + new CheckboxItem({ + itemID: 'live-page-compact-danmaku', + description: '使弹幕列表紧凑', + defaultStatus: true, + itemCSS: `.chat-history-panel .chat-history-list .chat-item.danmaku-item.chat-colorful-bubble {margin: 2px 0 !important;} + .chat-history-panel .chat-history-list .chat-item {padding: 3px 5px !important; font-size: 1.2rem !important;} + .chat-history-panel .chat-history-list .chat-item.danmaku-item .user-name {font-size: 1.2rem !important;} + .chat-history-panel .chat-history-list .chat-item.danmaku-item .reply-uname {font-size: 1.2rem !important;} + .chat-history-panel .chat-history-list .chat-item.danmaku-item .reply-uname .common-nickname-wrapper {font-size: 1.2rem !important;}`, }), // 隐藏 系统提示, 默认开启 new CheckboxItem({ @@ -388,10 +407,10 @@ if (isPageLiveRoom()) { description: '隐藏 粉丝牌', itemCSS: `.chat-item .fans-medal-item-ctnr {display: none !important;}`, }), - // 隐藏 弹幕的高亮底色 + // 隐藏 弹幕高亮底色 new CheckboxItem({ itemID: 'live-page-chat-item-background-color', - description: '隐藏 弹幕的高亮底色', + description: '隐藏 弹幕高亮底色', itemCSS: `.chat-item {background-color: unset !important; border-image-source: unset !important;}`, }), // 隐藏 礼物弹幕 @@ -415,60 +434,130 @@ if (isPageLiveRoom()) { /* 弹幕栏高度 */ .chat-history-panel .chat-history-list.with-brush-prompt {height: 100% !important;}`, }), - // 隐藏 互动框(他们都在说) + // 隐藏 互动框 (倒计时互动), 默认开启 + new CheckboxItem({ + itemID: 'live-page-combo-card-countdown', + description: '隐藏 互动框 (倒计时互动)', + defaultStatus: true, + itemCSS: `#combo-card:has(.countDownBtn) {display: none !important;} + .chat-history-panel.new {padding-bottom: 0 !important;}`, + }), + // 隐藏 互动框 (他们都在说), 默认开启 new CheckboxItem({ itemID: 'live-page-combo-card', - description: '隐藏 互动框(他们都在说)', + description: '隐藏 互动框 (他们都在说)', + defaultStatus: true, itemCSS: `#combo-card:has(.combo-tips) {display: none !important;}`, }), - // 隐藏 互动框(找TA玩) + // 隐藏 互动框 (找TA玩), 默认开启 new CheckboxItem({ itemID: 'live-page-service-card-container', - description: '隐藏 互动框(找TA玩)', - itemCSS: `.play-together-service-card-container {display: none !important;}`, - }), - // 弹幕栏 使弹幕列表紧凑, 默认开启 - new CheckboxItem({ - itemID: 'live-page-compact-danmaku', - description: '弹幕栏 使弹幕列表紧凑', + description: '隐藏 互动框 (找TA玩)', defaultStatus: true, - itemCSS: `.chat-history-panel .chat-history-list .chat-item.danmaku-item.chat-colorful-bubble {margin: 2px 0 !important;} - .chat-history-panel .chat-history-list .chat-item {padding: 3px 5px !important; font-size: 1.2rem !important;} - .chat-history-panel .chat-history-list .chat-item.danmaku-item .user-name {font-size: 1.2rem !important;} - .chat-history-panel .chat-history-list .chat-item.danmaku-item .reply-uname {font-size: 1.2rem !important;} - .chat-history-panel .chat-history-list .chat-item.danmaku-item .reply-uname .common-nickname-wrapper {font-size: 1.2rem !important;}`, + itemCSS: `.play-together-service-card-container {display: none !important;}`, }), - // 隐藏 弹幕控制按钮 左侧 + // 隐藏 发送框 左侧功能按钮 new CheckboxItem({ itemID: 'live-page-control-panel-icon-row-left', - description: '隐藏 弹幕控制按钮 左侧', + description: '隐藏 发送框 左侧功能按钮', itemCSS: `#chat-control-panel-vm .control-panel-icon-row .icon-left-part {display: none !important;}`, }), - // 隐藏 弹幕控制按钮 右侧 + // 隐藏 发送框 右侧功能按钮 new CheckboxItem({ itemID: 'live-page-control-panel-icon-row-right', - description: '隐藏 弹幕控制按钮 右侧', + description: '隐藏 发送框 右侧功能按钮', itemCSS: `#chat-control-panel-vm .control-panel-icon-row .icon-right-part {display: none !important;}`, }), - // 隐藏 弹幕发送框 + // 隐藏 发送框 粉丝勋章 + new CheckboxItem({ + itemID: 'live-page-chat-input-ctnr-medal-section', + description: '隐藏 发送框 粉丝勋章', + itemCSS: `.medal-section {display: none !important;}`, + }), + // 隐藏 发送框 发送按钮 + new CheckboxItem({ + itemID: 'live-page-chat-input-ctnr-send-btn', + description: '隐藏 发送框 发送按钮 (回车发送)', + itemCSS: ` + :root { + --ctrlh1: calc(145px - 36px); + --chat-control-panel-height: min(min(var(--ctrlh1, 145px), var(--ctrlh2, 145px)), var(--ctrlh3, 145px)); + } + .bottom-actions { + display: none !important; + } + .chat-history-panel { + height: calc(100% - var(--rank-list-height, 178px) - var(--chat-control-panel-height, 145px)) !important; + } + #chat-control-panel-vm { + height: var(--chat-control-panel-height, 145px) !important; + } + #aside-area-vm { + overflow: hidden; + } + .chat-history-panel .danmaku-at-prompt { + bottom: calc(var(--chat-control-panel-height) + 3px); + } + `, + }), + // 隐藏 发送框 new CheckboxItem({ itemID: 'live-page-chat-input-ctnr', - description: '隐藏 弹幕发送框', - itemCSS: `#chat-control-panel-vm .chat-input-ctnr, #chat-control-panel-vm .bottom-actions {display: none !important;} - .chat-control-panel {height: unset !important;} - .chat-history-panel {height: calc(100% - 45px) !important; padding-top: 8px;} - .chat-history-panel .danmaku-at-prompt {bottom: 50px !important;}`, + description: '隐藏 发送框', + itemCSS: ` + :root { + --ctrlh2: calc(145px - 105px); + --chat-control-panel-height: min(min(var(--ctrlh1, 145px), var(--ctrlh2, 145px)), var(--ctrlh3, 145px)); + } + #chat-control-panel-vm .chat-input-ctnr, + #chat-control-panel-vm .bottom-actions { + display: none !important; + } + .chat-history-panel { + height: calc(100% - var(--rank-list-height, 178px) - var(--chat-control-panel-height, 145px)) !important; + } + #chat-control-panel-vm { + height: var(--chat-control-panel-height) !important; + } + #aside-area-vm { + overflow: hidden; + } + .chat-history-panel .danmaku-at-prompt { + bottom: calc(var(--chat-control-panel-height) + 10px); + } + `, }), - // 隐藏 关闭全部互动框和控制栏 + // 隐藏 弹幕栏底部全部功能 new CheckboxItem({ itemID: 'live-page-chat-control-panel', - description: '隐藏 关闭全部互动框和控制栏', - itemCSS: `#chat-control-panel-vm {display: none !important;} - /* 高权限调高度 */ - #aside-area-vm .chat-history-panel {height: 100% !important;}`, + description: '隐藏 弹幕栏底部全部功能', + itemCSS: ` + :root { + --ctrlh3: 0px; + --chat-control-panel-height: min(min(var(--ctrlh1, 145px), var(--ctrlh2, 145px)), var(--ctrlh3, 145px)); + } + #chat-control-panel-vm { + display: none !important; + } + .chat-history-panel, .chat-history-panel.new { + height: calc(100% - var(--rank-list-height, 178px) - var(--chat-control-panel-height, 145px)) !important; + } + .chat-history-panel .chat-history-list { + padding: 10px !important; + } + #chat-control-panel-vm { + height: var(--chat-control-panel-height, 145px) !important; + } + #aside-area-vm { + overflow: hidden; + } + .chat-history-panel .danmaku-at-prompt { + bottom: calc(var(--chat-control-panel-height) + 30px); + } + `, }), ] - liveGroupList.push(new Group('live-right-container', '右栏 高能榜/弹幕列表', rightContainerItems)) + liveGroupList.push(new Group('live-right-container', '右栏 弹幕列表', rightContainerItems)) // 视频下方页面 const belowItems = [ @@ -674,7 +763,7 @@ if (isPageLiveHome() || isPageLiveRoom()) { // 隐藏 更多, 默认开启 new CheckboxItem({ itemID: 'live-page-header-showmore-link', - description: '隐藏 顶栏-更多', + description: '隐藏 更多', defaultStatus: true, itemCSS: ` #main-ctnr .showmore-link {display: none !important;} diff --git a/src/rules/video.ts b/src/rules/video.ts index 536d5f13..b3d646f8 100644 --- a/src/rules/video.ts +++ b/src/rules/video.ts @@ -48,7 +48,7 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: 'video-page-bv2av', description: 'BV号转AV号', - itemFunc: () => { + enableFunc: async () => { const bv2av = (url: string): string => { /** * algo by bilibili-API-collect @@ -110,45 +110,41 @@ if (isPageVideo() || isPagePlaylist()) { .video-share-popover .video-share-dropdown .dropdown-top .dropdown-top-left {padding-right: 0 !important;} `, // 净化分享按钮功能 - itemFunc: () => { + enableFunc: async () => { // 监听shareBtn出现 - const listener = () => { - let counter = 0 - const id = setInterval(() => { - counter++ - const shareBtn = document.getElementById('share-btn-outer') - if (shareBtn) { - // 新增click事件 - // 若replace element, 会在切换视频后无法更新视频分享数量, 故直接新增click事件覆盖剪贴板 - shareBtn.addEventListener('click', () => { - let title = document.querySelector( - '.video-info-title .video-title, #viewbox_report > h1, .video-title-href', - )?.textContent - if (title && !title.match(/^[（【［《「＜｛〔〖〈『].*|.*[）】］》」＞｝〕〗〉』]$/)) { - title = `【${title}】` - } - // 匹配av号, BV号, 分P号 - const avbv = matchAvidBvid(location.href) - let shareText = title - ? `${title} \nhttps://www.bilibili.com/video/${avbv}` - : `https://www.bilibili.com/video/${avbv}` - const urlObj = new URL(location.href) - const params = new URLSearchParams(urlObj.search) - if (params.has('p')) { - shareText += `?p=${params.get('p')}` - } - navigator.clipboard.writeText(shareText) - }) - clearInterval(id) - } else if (counter > 50) { - clearInterval(id) - } - }, 200) - } - document.readyState === 'complete' - ? listener() - : document.addEventListener('DOMContentLoaded', listener) + let counter = 0 + const id = setInterval(() => { + counter++ + const shareBtn = document.getElementById('share-btn-outer') + if (shareBtn) { + // 新增click事件 + // 若replace element, 会在切换视频后无法更新视频分享数量, 故直接新增click事件覆盖剪贴板 + shareBtn.addEventListener('click', () => { + let title = document.querySelector( + '.video-info-title .video-title, #viewbox_report > h1, .video-title-href', + )?.textContent + if (title && !title.match(/^[（【［《「＜｛〔〖〈『].*|.*[）】］》」＞｝〕〗〉』]$/)) { + title = `【${title}】` + } + // 匹配av号, BV号, 分P号 + const avbv = matchAvidBvid(location.href) + let shareText = title + ? `${title} \nhttps://www.bilibili.com/video/${avbv}` + : `https://www.bilibili.com/video/${avbv}` + const urlObj = new URL(location.href) + const params = new URLSearchParams(urlObj.search) + if (params.has('p')) { + shareText += `?p=${params.get('p')}` + } + navigator.clipboard.writeText(shareText).then().catch() + }) + clearInterval(id) + } else if (counter > 50) { + clearInterval(id) + } + }, 200) }, + enableFuncRunAt: 'document-end', }), // 顶栏 滚动页面后不再吸附顶部 new CheckboxItem({ @@ -171,7 +167,7 @@ if (isPageVideo() || isPagePlaylist()) { width: fit-content; } `, - itemFunc: () => { + enableFunc: async () => { wideScreenLock = true unsafeWindow.isWide = true const listener = () => { @@ -188,7 +184,7 @@ if (isPageVideo() || isPagePlaylist()) { } document.addEventListener('DOMContentLoaded', listener) }, - callback: () => { + disableFunc: async () => { wideScreenLock = false }, }), @@ -261,30 +257,25 @@ if (isPageVideo() || isPagePlaylist()) { } } `, - itemFunc: () => { + enableFunc: async () => { // 在Chrome上可以神奇的禁用滚轮调节音量，Firefox不生效 document.addEventListener('wheel', disableAdjustVolume) // 监听网页全屏按钮出现 - const listener = () => { - waitForEle(document.body, '.bpx-player-ctrl-web', (node: HTMLElement): boolean => { - return node.className.includes('bpx-player-ctrl-web') - }).then((webBtn) => { - if (webBtn) { - webBtn.addEventListener('click', () => { - if (webBtn.classList.contains('bpx-state-entered')) { - window.scrollTo(0, 0) - } - }) - } - }) - } - document.readyState === 'complete' - ? listener() - : document.addEventListener('DOMContentLoaded', listener) + waitForEle(document.body, '.bpx-player-ctrl-web', (node: HTMLElement): boolean => { + return node.className.includes('bpx-player-ctrl-web') + }).then((webBtn) => { + if (webBtn) { + webBtn.addEventListener('click', () => { + if (webBtn.classList.contains('bpx-state-entered')) { + window.scrollTo(0, 0) + } + }) + } + }) }, - - callback: () => document.removeEventListener('wheel', disableAdjustVolume), + enableFuncRunAt: 'document-end', + disableFunc: async () => document.removeEventListener('wheel', disableAdjustVolume), }), // 播放器和视频标题 交换位置 new CheckboxItem({ @@ -618,181 +609,172 @@ if (isPageVideo() || isPagePlaylist() || isPageFestival()) { -ms-text-stroke: 3px transparent; }`, }), - // 小窗播放器 隐藏底边进度 + ] + videoGroupList.push(new Group('video-player', '播放器', playerItems)) + + // 小窗播放器 + const miniPlayerItems = [ + // 隐藏底边进度 new CheckboxItem({ itemID: 'video-page-hide-bpx-player-mini-mode-process', - description: '小窗播放器 隐藏底边进度', + description: '隐藏底边进度', defaultStatus: true, itemCSS: `.bpx-player-container[data-screen=mini]:not(:hover) .bpx-player-mini-progress {display: none;}`, }), - // 小窗播放器 隐藏弹幕 + // 隐藏弹幕 new CheckboxItem({ itemID: 'video-page-hide-bpx-player-mini-mode-danmaku', - description: '小窗播放器 隐藏弹幕', + description: '隐藏弹幕', itemCSS: `.bpx-player-container[data-screen=mini] .bpx-player-row-dm-wrap {visibility: hidden !important;}`, }), - // 小窗播放器 滚轮调节大小 + // 滚轮调节大小 new CheckboxItem({ itemID: 'video-page-bpx-player-mini-mode-wheel-adjust', - description: '小窗播放器 滚轮调节大小', - itemFunc: () => { - const adjust = async () => { - try { - const insertCSS = (zoom: number) => { - const cssText = ` - .bpx-player-container[data-screen=mini] { - height: calc(225px * ${zoom}) !important; - width: calc(400px * ${zoom}) !important; - } - .bpx-player-container[data-revision="1"][data-screen=mini], - .bpx-player-container[data-revision="2"][data-screen=mini] { - height: calc(180px * ${zoom}) !important; - width: calc(320px * ${zoom}) !important; - } - @media screen and (min-width:1681px) { - .bpx-player-container[data-revision="1"][data-screen=mini], - .bpx-player-container[data-revision="2"][data-screen=mini] { - height: calc(203px * ${zoom}) !important; - width: calc(360px * ${zoom}) !important; - } - }` - .replace(/\n\s*/g, '') - .trim() - const node = document.querySelector( - `html>style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`, - ) - if (node) { - node.innerHTML = cssText - } else { - const style = document.createElement('style') - style.innerHTML = cssText - style.setAttribute('bili-cleaner-css', 'video-page-bpx-player-mini-mode-wheel-adjust') - document.documentElement.appendChild(style) + description: '滚轮调节大小', + enableFunc: async () => { + try { + const insertCSS = (zoom: number) => { + const cssText = ` + .bpx-player-container[data-screen=mini] { + height: calc(225px * ${zoom}) !important; + width: calc(400px * ${zoom}) !important; } - } - // 载入上次缩放 - const oldZoom: number | undefined = GM_getValue( - 'BILICLEANER_video-page-bpx-player-mini-mode-zoom', + .bpx-player-container[data-revision="1"][data-screen=mini], + .bpx-player-container[data-revision="2"][data-screen=mini] { + height: calc(180px * ${zoom}) !important; + width: calc(320px * ${zoom}) !important; + } + @media screen and (min-width:1681px) { + .bpx-player-container[data-revision="1"][data-screen=mini], + .bpx-player-container[data-revision="2"][data-screen=mini] { + height: calc(203px * ${zoom}) !important; + width: calc(360px * ${zoom}) !important; + } + }` + .replace(/\n\s*/g, '') + .trim() + const node = document.querySelector( + `html>style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`, ) - oldZoom && insertCSS(oldZoom) + if (node) { + node.innerHTML = cssText + } else { + const style = document.createElement('style') + style.innerHTML = cssText + style.setAttribute('bili-cleaner-css', 'video-page-bpx-player-mini-mode-wheel-adjust') + document.documentElement.appendChild(style) + } + } + // 载入上次缩放 + const oldZoom: number | undefined = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom') + oldZoom && insertCSS(oldZoom) - // 等player出现 - let cnt = 0 - const interval = setInterval(() => { - const player = document.querySelector('.bpx-player-container') as HTMLElement | null - if (player) { - clearInterval(interval) - // 判断鼠标位置，消除大播放器内下拉页面影响小窗大小的bug - let flag = false - player.addEventListener('mouseenter', () => { - if (player.getAttribute('data-screen') === 'mini') { - flag = true - } - }) - player.addEventListener('mouseleave', () => { - flag = false - }) - let lastZoom = oldZoom || 1 - // 监听滚轮 - player.addEventListener('wheel', (e) => { - if (flag) { - e.stopPropagation() - e.preventDefault() - const scaleSpeed = 5 - let zoom = lastZoom - (Math.sign(e.deltaY) * scaleSpeed) / 100 - zoom = zoom < 0.5 ? 0.5 : zoom - zoom = zoom > 3 ? 3 : zoom - if (zoom !== lastZoom) { - lastZoom = zoom - insertCSS(zoom) - GM_setValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom', zoom) - } + // 等player出现 + let cnt = 0 + const interval = setInterval(() => { + const player = document.querySelector('.bpx-player-container') as HTMLElement | null + if (player) { + clearInterval(interval) + // 判断鼠标位置，消除大播放器内下拉页面影响小窗大小的bug + let flag = false + player.addEventListener('mouseenter', () => { + if (player.getAttribute('data-screen') === 'mini') { + flag = true + } + }) + player.addEventListener('mouseleave', () => { + flag = false + }) + let lastZoom = oldZoom || 1 + // 监听滚轮 + player.addEventListener('wheel', (e) => { + if (flag) { + e.stopPropagation() + e.preventDefault() + const scaleSpeed = 5 + let zoom = lastZoom - (Math.sign(e.deltaY) * scaleSpeed) / 100 + zoom = zoom < 0.5 ? 0.5 : zoom + zoom = zoom > 3 ? 3 : zoom + if (zoom !== lastZoom) { + lastZoom = zoom + insertCSS(zoom) + GM_setValue('BILICLEANER_video-page-bpx-player-mini-mode-zoom', zoom) } - }) - } else { - cnt++ - if (cnt > 20) { - clearInterval(interval) } + }) + } else { + cnt++ + if (cnt > 20) { + clearInterval(interval) } - }, 500) - } catch (err) { - error('adjust mini player size error') - error(err) - } + } + }, 500) + } catch (err) { + error('adjust mini player size error') + error(err) } - document.readyState === 'complete' ? adjust() : document.addEventListener('DOMContentLoaded', adjust) }, - callback: () => { + enableFuncRunAt: 'document-end', + disableFunc: async () => { document.querySelector(`style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`)?.remove() }, }), - // // 小窗播放器 记录小窗位置 - // new CheckboxItem({ - // itemID: 'video-page-bpx-player-mini-mode-position-record', - // description: '小窗播放器 记录小窗位置', - // itemFunc: () => { - // let isListening = false - // const listener = () => { - // waitForEle(document.body, '#bilibili-player .bpx-player-container', (node: HTMLElement) => { - // return node.className.startsWith('bpx-player-container') - // }).then((player) => { - // if (player) { - // const observer = new MutationObserver((mutationsList) => { - // console.log('fired') - // for (const mutation of mutationsList) { - // if (mutation.attributeName === 'data-screen') { - // const target = mutation.target as HTMLElement - // if ( - // target instanceof HTMLElement && - // target.getAttribute('data-screen') === 'mini' - // ) { - // const right = GM_getValue( - // 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-right', - // ) - // const bottom = GM_getValue( - // 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom', - // ) - // if (right !== undefined && bottom !== undefined) { - // target.style.right = `${right}px` - // target.style.bottom = `${bottom}px` - // } - // // 监听小窗移动 - // if (!isListening) { - // isListening = true - // player.addEventListener('mouseleave', () => { - // if (player.getAttribute('data-screen') !== 'mini') { - // return - // } - // GM_setValue( - // 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-right', - // parseInt(player.style.right), - // ) - // GM_setValue( - // 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom', - // parseInt(player.style.bottom), - // ) - // }) - // } - // break - // } - // } - // } - // }) - // observer.observe(player, { attributes: true, subtree: false }) - // } - // }) - // } - // document.readyState === 'complete' - // ? listener() - // : document.addEventListener('DOMContentLoaded', listener) - // }, - // callback: () => { - // document.querySelector(`style[bili-cleaner-css=video-page-bpx-player-mini-mode-wheel-adjust]`)?.remove() - // }, - // }), + // 记录小窗位置 + new CheckboxItem({ + itemID: 'video-page-bpx-player-mini-mode-position-record', + description: '记录小窗位置', + enableFunc: async () => { + let player: HTMLElement + + // 监听mini播放器移动 + const addMiniPlayerMoveListener = () => { + if (!player) { + return + } + player.addEventListener('mouseup', () => { + if (player.getAttribute('data-screen') !== 'mini') { + return + } + GM_setValue( + 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-right', + parseInt(player.style.right), + ) + GM_setValue( + 'BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom', + parseInt(player.style.bottom), + ) + }) + } + // 设置player API内小窗播放器position初始值 + const setMiniPlayerState = () => { + const right = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-position-record-right') + const bottom = GM_getValue('BILICLEANER_video-page-bpx-player-mini-mode-position-record-bottom') + if (typeof right === 'number' && typeof bottom === 'number') { + if (unsafeWindow.player) { + unsafeWindow.player.__core().uiStore.state.miniScreenRight = right + unsafeWindow.player.__core().uiStore.state.miniScreenBottom = bottom + } + } + } + + waitForEle(document.body, '#bilibili-player .bpx-player-container', (node: HTMLElement) => { + return node.className.startsWith('bpx-player-container') + }).then((ele) => { + if (ele) { + player = ele + try { + setMiniPlayerState() + addMiniPlayerMoveListener() + } catch { + // err + } + } + }) + }, + enableFuncRunAt: 'document-end', + }), ] - videoGroupList.push(new Group('video-player', '播放器', playerItems)) + videoGroupList.push(new Group('video-mini-player', '小窗播放器', miniPlayerItems)) // 播放控制 const playerControlItems = [ @@ -978,7 +960,7 @@ if (isPageVideo() || isPagePlaylist() || isPageFestival()) { .festival-video-player #bilibili-player:not(.mode-webscreen) {height: calc(100% - 46px) !important;} `, // 隐藏弹幕栏时，强行调节播放器高度 - itemFunc: () => { + enableFunc: async () => { // 念咒 const genSizeCSS = (): string => { const e = unsafeWindow.isWide @@ -1081,7 +1063,7 @@ if (isPageVideo() || isPagePlaylist()) { new CheckboxItem({ itemID: 'video-page-coin-disable-auto-like', description: '投币时不自动点赞 (关闭需刷新)', - itemFunc: () => { + enableFunc: async () => { const disableAutoLike = () => { let counter = 0 const timer = setInterval(() => { diff --git a/src/utils/tool.ts b/src/utils/tool.ts index e08a8745..76d4e823 100644 --- a/src/utils/tool.ts +++ b/src/utils/tool.ts @@ -1,6 +1,18 @@ -const bvidPattern = /(BV[1-9A-HJ-NP-Za-km-z]+)/ +// export const debounce = void>( +// func: T, +// wait: number, +// ): ((...args: Parameters) => void) => { +// let timeout: ReturnType +// return (...args: Parameters): void => { +// clearTimeout(timeout) +// timeout = setTimeout(() => { +// func(...args) +// }, wait) +// } +// } // 匹配BV号 +const bvidPattern = /(BV[1-9A-HJ-NP-Za-km-z]+)/ export const matchBvid = (s: string): string | null => { const match = bvidPattern.exec(s) if (match && match.length >= 2) { @@ -53,12 +65,12 @@ export const waitForEle = async ( return ele } return await new Promise((resolve) => { - const obverser = new MutationObserver((mutationList) => { + const observer = new MutationObserver((mutationList) => { mutationList.forEach((mutation) => { if (mutation.addedNodes) { mutation.addedNodes.forEach((node) => { if (node instanceof HTMLElement && isTargetNode(node)) { - obverser.disconnect() + observer.disconnect() ele = watchEle.querySelector(selector) as HTMLElement | null resolve(ele) } @@ -66,6 +78,6 @@ export const waitForEle = async ( } }) }) - obverser.observe(watchEle, { childList: true, subtree: true }) + observer.observe(watchEle, { childList: true, subtree: true }) }) } diff --git a/vite.config.ts b/vite.config.ts index c07e5279..84709225 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ userscript: { name: 'bilibili 页面净化大师', namespace: 'http://tampermonkey.net/', - version: '3.7.2', + version: '3.7.3', description: '净化 B站/哔哩哔哩 页面，支持「精简功能、播放器净化、过滤视频、过滤评论、全站黑白名单」，提供 300+ 功能，定制自己的 B 站', author: 'festoney8',