feat: comment filter hide callUserOnly #139

festoney8 · Sep 27, 2024 · 325a7af · 325a7af
1 parent 1caedef
commit 325a7af
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.11.4
 
 -   更新：播放页视频合集相关净化功能，适配网页变化
+-   新增：评论区过滤 过滤只含@其他用户的评论
 
 ## 3.11.3
 

diff --git a/src/filters/comment/dyn.ts b/src/filters/comment/dyn.ts
@@ -14,6 +14,7 @@ import {
     CommentBotFilter,
     CommentCallBotFilter,
     CommentCallUserFilter,
+    CommentCallUserOnlyFilter,
     CommentContentFilter,
     CommentLevelFilter,
     CommentUsernameFilter,
@@ -43,6 +44,9 @@ const GM_KEYS = {
         callUser: {
             statusKey: 'dynamic-comment-call-user-filter-status',
         },
+        callUserOnly: {
+            statusKey: 'dynamic-comment-call-user-only-filter-status',
+        },
         isAD: {
             statusKey: 'dynamic-comment-ad-filter-status',
         },
@@ -81,6 +85,9 @@ const selectorFns = {
         callUser: (comment: HTMLElement): SelectorResult => {
             return (comment as any).__data?.content?.members[0]?.uname
         },
+        callUserOnly: (comment: HTMLElement): SelectorResult => {
+            return (comment as any).__data?.content?.message?.replace(/@[^@ ]+/g, '').trim() === ''
+        },
         level: (comment: HTMLElement): SelectorResult => {
             return (comment as any).__data?.member?.level_info?.current_level
         },
@@ -127,6 +134,9 @@ const selectorFns = {
                 .replace('@', '')
                 .trim()
         },
+        callUserOnly: (comment: HTMLElement): SelectorResult => {
+            return (comment as any).__data?.content?.message?.replace(/@[^@ ]+/g, '').trim() === ''
+        },
         level: (comment: HTMLElement): SelectorResult => {
             return (comment as any).__data?.member?.level_info?.current_level
         },
@@ -221,6 +231,8 @@ if (isPageDynamic()) {
     const commentCallUserFilter = new CommentCallUserFilter()
     commentCallUserFilter.addParam(`/./`)
 
+    const commentCallUserOnlyFilter = new CommentCallUserOnlyFilter()
+
     // 初始化白名单
     const commentIsUpFilter = new CommentIsUpFilter()
     const commentIsPinFilter = new CommentIsPinFilter()
@@ -236,7 +248,8 @@ if (isPageDynamic()) {
                 commentLevelFilter.isEnable ||
                 commentBotFilter.isEnable ||
                 commentCallBotFilter.isEnable ||
-                commentCallUserFilter.isEnable
+                commentCallUserFilter.isEnable ||
+                commentCallUserOnlyFilter.isEnable
             )
         ) {
             return
@@ -262,6 +275,7 @@ if (isPageDynamic()) {
         //             `username: ${selectorFns.root.username(v)}`,
         //             `content: ${selectorFns.root.content(v)}`,
         //             `callUser: ${selectorFns.root.callUser(v)}`,
+        //             `callUserOnly: ${selectorFns.root.callUserOnly(v)}`,
         //             `level: ${selectorFns.root.level(v)}`,
         //             `isUp: ${selectorFns.root.isUp(v)}`,
         //             `isPin: ${selectorFns.root.isPin(v)}`,
@@ -283,6 +297,8 @@ if (isPageDynamic()) {
         commentBotFilter.isEnable && blackPairs.push([commentBotFilter, selectorFns.root.username])
         commentCallBotFilter.isEnable && blackPairs.push([commentCallBotFilter, selectorFns.root.callUser])
         commentCallUserFilter.isEnable && blackPairs.push([commentCallUserFilter, selectorFns.root.callUser])
+        commentCallUserOnlyFilter.isEnable &&
+            blackPairs.push([commentCallUserOnlyFilter, selectorFns.root.callUserOnly])
 
         const whitePairs: SubFilterPair[] = []
         commentIsUpFilter.isEnable && whitePairs.push([commentIsUpFilter, selectorFns.root.isUp])
@@ -303,7 +319,8 @@ if (isPageDynamic()) {
                 commentLevelFilter.isEnable ||
                 commentBotFilter.isEnable ||
                 commentCallBotFilter.isEnable ||
-                commentCallUserFilter.isEnable
+                commentCallUserFilter.isEnable ||
+                commentCallUserOnlyFilter.isEnable
             )
         ) {
             return
@@ -329,6 +346,7 @@ if (isPageDynamic()) {
         //             `username: ${selectorFns.sub.username(v)}`,
         //             `content: ${selectorFns.sub.content(v)}`,
         //             `callUser: ${selectorFns.sub.callUser(v)}`,
+        //             `callUserOnly: ${selectorFns.sub.callUserOnly(v)}`,
         //             `level: ${selectorFns.sub.level(v)}`,
         //             `isUp: ${selectorFns.sub.isUp(v)}`,
         //             `isLink: ${selectorFns.sub.isLink(v)}`,
@@ -348,6 +366,7 @@ if (isPageDynamic()) {
         commentBotFilter.isEnable && blackPairs.push([commentBotFilter, selectorFns.sub.username])
         commentCallBotFilter.isEnable && blackPairs.push([commentCallBotFilter, selectorFns.sub.callUser])
         commentCallUserFilter.isEnable && blackPairs.push([commentCallUserFilter, selectorFns.sub.callUser])
+        commentCallUserOnlyFilter.isEnable && blackPairs.push([commentCallUserOnlyFilter, selectorFns.sub.callUserOnly])
 
         const whitePairs: SubFilterPair[] = []
         commentIsUpFilter.isEnable && whitePairs.push([commentIsUpFilter, selectorFns.sub.isUp])
@@ -365,7 +384,8 @@ if (isPageDynamic()) {
             commentLevelFilter.isEnable ||
             commentBotFilter.isEnable ||
             commentCallBotFilter.isEnable ||
-            commentCallUserFilter.isEnable
+            commentCallUserFilter.isEnable ||
+            commentCallUserOnlyFilter.isEnable
         ) {
             checkRoot(fullSite).then().catch()
             checkSub(fullSite).then().catch()
@@ -565,10 +585,23 @@ if (isPageDynamic()) {
                 checkAll(true)
             },
         }),
-        // 过滤 @其他用户的评论
+        // 过滤 只含 @其他用户 的评论
+        new CheckboxItem({
+            itemID: GM_KEYS.black.callUserOnly.statusKey,
+            description: '过滤 只含 @其他用户 的评论',
+            enableFunc: () => {
+                commentCallUserOnlyFilter.enable()
+                checkAll(true)
+            },
+            disableFunc: () => {
+                commentCallUserOnlyFilter.disable()
+                checkAll(true)
+            },
+        }),
+        // 过滤 包含 @其他用户 的评论
         new CheckboxItem({
             itemID: GM_KEYS.black.callUser.statusKey,
-            description: '过滤 @其他用户的评论',
+            description: '过滤 包含 @其他用户 的评论',
             enableFunc: () => {
                 commentCallUserFilter.enable()
                 checkAll(true)

diff --git a/src/filters/comment/space.ts b/src/filters/comment/space.ts
@@ -13,6 +13,7 @@ import {
     CommentBotFilter,
     CommentCallBotFilter,
     CommentCallUserFilter,
+    CommentCallUserOnlyFilter,
     CommentContentFilter,
     CommentLevelFilter,
     CommentUsernameFilter,
@@ -42,8 +43,11 @@ const GM_KEYS = {
         callUser: {
             statusKey: 'dynamic-comment-call-user-filter-status',
         },
+        callUserOnly: {
+            statusKey: 'dynamic-comment-call-user-only-filter-status',
+        },
         isAD: {
-            statusKey: 'video-comment-ad-filter-status',
+            statusKey: 'dynamic-comment-ad-filter-status',
         },
     },
     white: {
@@ -70,12 +74,6 @@ const GM_KEYS = {
 
 // 一二级评论信息提取
 const selectorFns = {
-    // 测试视频：
-    // https://b23.tv/av810872
-    // https://b23.tv/av1855797296
-    // https://b23.tv/av1706101190
-    // https://b23.tv/av1705573085
-    // https://b23.tv/av1350214762
     root: {
         username: (comment: HTMLElement): SelectorResult => {
             return comment.querySelector('.root-reply-container .user-name')?.textContent?.trim()
@@ -93,6 +91,15 @@ const selectorFns = {
                 ?.textContent?.replace('@', '')
                 .trim()
         },
+        callUserOnly: (comment: HTMLElement): SelectorResult => {
+            return (
+                comment
+                    .querySelector('.root-reply-container .reply-content')
+                    ?.textContent?.trim()
+                    .replace(/@[^@ ]+/g, '')
+                    .trim() === ''
+            )
+        },
         level: (comment: HTMLElement): SelectorResult => {
             const c = comment.querySelector('.root-reply-container .user-level')?.className
             const lv = c?.match(/level-([1-6])/)?.[1] // 忽略level-hardcore
@@ -133,6 +140,15 @@ const selectorFns = {
                 .replace('@', '')
                 .trim()
         },
+        callUserOnly: (comment: HTMLElement): SelectorResult => {
+            return (
+                comment
+                    .querySelector('.reply-content')
+                    ?.textContent?.trim()
+                    .replace(/@[^@ ]+/g, '')
+                    .trim() === ''
+            )
+        },
         level: (comment: HTMLElement): SelectorResult => {
             const c = comment.querySelector('.sub-user-level')?.className
             const lv = c?.match(/level-([1-6])/)?.[1] // 忽略level-hardcore
@@ -219,6 +235,8 @@ if (isPageSpace()) {
     const commentCallUserFilter = new CommentCallUserFilter()
     commentCallUserFilter.addParam(`/./`)
 
+    const commentCallUserOnlyFilter = new CommentCallUserOnlyFilter()
+
     // 初始化白名单
     const commentIsUpFilter = new CommentIsUpFilter()
     const commentIsPinFilter = new CommentIsPinFilter()
@@ -255,6 +273,7 @@ if (isPageSpace()) {
             //             `username: ${selectorFns.root.username(v)}`,
             //             `content: ${selectorFns.root.content(v)}`,
             //             `callUser: ${selectorFns.root.callUser(v)}`,
+            //             `callUserOnly: ${selectorFns.root.callUserOnly(v)}`,
             //             `level: ${selectorFns.root.level(v)}`,
             //             `isUp: ${selectorFns.root.isUp(v)}`,
             //             `isPin: ${selectorFns.root.isPin(v)}`,
@@ -270,6 +289,7 @@ if (isPageSpace()) {
             //             `username: ${selectorFns.sub.username(v)}`,
             //             `content: ${selectorFns.sub.content(v)}`,
             //             `callUser: ${selectorFns.sub.callUser(v)}`,
+            //             `callUserOnly: ${selectorFns.sub.callUserOnly(v)}`,
             //             `level: ${selectorFns.sub.level(v)}`,
             //             `isUp: ${selectorFns.sub.isUp(v)}`,
             //             `isLink: ${selectorFns.sub.isLink(v)}`,
@@ -286,6 +306,8 @@ if (isPageSpace()) {
                 commentBotFilter.isEnable && blackPairs.push([commentBotFilter, selectorFns.root.username])
                 commentCallBotFilter.isEnable && blackPairs.push([commentCallBotFilter, selectorFns.root.callUser])
                 commentCallUserFilter.isEnable && blackPairs.push([commentCallUserFilter, selectorFns.root.callUser])
+                commentCallUserOnlyFilter.isEnable &&
+                    blackPairs.push([commentCallUserOnlyFilter, selectorFns.root.callUserOnly])
 
                 const whitePairs: SubFilterPair[] = []
                 commentIsUpFilter.isEnable && whitePairs.push([commentIsUpFilter, selectorFns.root.isUp])
@@ -305,6 +327,8 @@ if (isPageSpace()) {
                 commentBotFilter.isEnable && blackPairs.push([commentBotFilter, selectorFns.sub.username])
                 commentCallBotFilter.isEnable && blackPairs.push([commentCallBotFilter, selectorFns.sub.callUser])
                 commentCallUserFilter.isEnable && blackPairs.push([commentCallUserFilter, selectorFns.sub.callUser])
+                commentCallUserOnlyFilter.isEnable &&
+                    blackPairs.push([commentCallUserOnlyFilter, selectorFns.sub.callUserOnly])
 
                 const whitePairs: SubFilterPair[] = []
                 commentIsUpFilter.isEnable && whitePairs.push([commentIsUpFilter, selectorFns.sub.isUp])
@@ -327,7 +351,8 @@ if (isPageSpace()) {
             commentLevelFilter.isEnable ||
             commentBotFilter.isEnable ||
             commentCallBotFilter.isEnable ||
-            commentCallUserFilter.isEnable
+            commentCallUserFilter.isEnable ||
+            commentCallUserOnlyFilter.isEnable
         ) {
             checkCommentList(fullSite).then().catch()
         }
@@ -524,10 +549,23 @@ if (isPageSpace()) {
                 check(true)
             },
         }),
-        // 过滤 @其他用户的评论
+        // 过滤 只含 @其他用户 的评论
+        new CheckboxItem({
+            itemID: GM_KEYS.black.callUserOnly.statusKey,
+            description: '过滤 只含 @其他用户 的评论',
+            enableFunc: () => {
+                commentCallUserOnlyFilter.enable()
+                check(true)
+            },
+            disableFunc: () => {
+                commentCallUserOnlyFilter.disable()
+                check(true)
+            },
+        }),
+        // 过滤 包含 @其他用户 的评论
         new CheckboxItem({
             itemID: GM_KEYS.black.callUser.statusKey,
-            description: '过滤 @其他用户的评论',
+            description: '过滤 包含 @其他用户 的评论',
             enableFunc: () => {
                 commentCallUserFilter.enable()
                 check(true)

diff --git a/src/filters/comment/subFilters/black.ts b/src/filters/comment/subFilters/black.ts
@@ -1,3 +1,4 @@
+import { BooleanFilter } from '../../core/subFilters/booleanFilter'
 import { KeywordFilter } from '../../core/subFilters/keywordFilter'
 import { NumberMinFilter } from '../../core/subFilters/numberMinFilter'
 import { StringFilter } from '../../core/subFilters/stringFilter'
@@ -13,3 +14,5 @@ export class CommentBotFilter extends StringFilter {}
 export class CommentCallBotFilter extends StringFilter {}
 
 export class CommentCallUserFilter extends KeywordFilter {}
+
+export class CommentCallUserOnlyFilter extends BooleanFilter {}