From 08c5444b73212154431ab3a7398b9bca0561f090 Mon Sep 17 00:00:00 2001 From: Grigory Date: Mon, 11 May 2026 16:25:48 +0500 Subject: [PATCH 1/6] `conversation-activity-filter` - Fix hiding bots. events, collapsed comments --- source/features/conversation-activity-filter.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/features/conversation-activity-filter.css b/source/features/conversation-activity-filter.css index 807287612417..e1d381356e88 100644 --- a/source/features/conversation-activity-filter.css +++ b/source/features/conversation-activity-filter.css @@ -7,7 +7,7 @@ } } -[data-rgh-conversation-activity-filter='hideEventsAndCollapsedComments'] { +[data-rgh-conversation-activity-filter='hideEventsBotsCollapsedComments'] { .rgh-conversation-activity-filtered-event, .rgh-conversation-activity-bot-comment, .rgh-conversation-activity-collapsed-comment, @@ -47,7 +47,7 @@ } &:is( - [data-rgh-conversation-activity-filter='hideEventsAndCollapsedComments'] * + [data-rgh-conversation-activity-filter='hideEventsBotsCollapsedComments'] * ) { .octicon-eye { display: none; From b810928c429f9ee9913c775e2b114a328f9a2ec7 Mon Sep 17 00:00:00 2001 From: Grigory Date: Mon, 11 May 2026 16:42:57 +0500 Subject: [PATCH 2/6] add comment --- source/features/conversation-activity-filter.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/features/conversation-activity-filter.tsx b/source/features/conversation-activity-filter.tsx index 426c02b86bab..fcc4217c321d 100644 --- a/source/features/conversation-activity-filter.tsx +++ b/source/features/conversation-activity-filter.tsx @@ -33,6 +33,7 @@ const minorFixesIssuePages = [ 'https://github.com/refined-github/refined-github/issues/8000', ]; +// Keys are used as CSS selectors const states = { showAll: 'Show all activities', hideEvents: 'Hide events', From 6c60c930e06d2b040c59d120642bd1e2cfd14fe9 Mon Sep 17 00:00:00 2001 From: Grigory Date: Mon, 11 May 2026 20:09:08 +0500 Subject: [PATCH 3/6] `hideEventsBotsCollapsedComments` -> `hideAllNoise` --- source/features/conversation-activity-filter.css | 4 ++-- source/features/conversation-activity-filter.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/features/conversation-activity-filter.css b/source/features/conversation-activity-filter.css index e1d381356e88..4ef621fa778a 100644 --- a/source/features/conversation-activity-filter.css +++ b/source/features/conversation-activity-filter.css @@ -7,7 +7,7 @@ } } -[data-rgh-conversation-activity-filter='hideEventsBotsCollapsedComments'] { +[data-rgh-conversation-activity-filter='hideAllNoise'] { .rgh-conversation-activity-filtered-event, .rgh-conversation-activity-bot-comment, .rgh-conversation-activity-collapsed-comment, @@ -47,7 +47,7 @@ } &:is( - [data-rgh-conversation-activity-filter='hideEventsBotsCollapsedComments'] * + [data-rgh-conversation-activity-filter='hideAllNoise'] * ) { .octicon-eye { display: none; diff --git a/source/features/conversation-activity-filter.tsx b/source/features/conversation-activity-filter.tsx index fcc4217c321d..7eef54b04f31 100644 --- a/source/features/conversation-activity-filter.tsx +++ b/source/features/conversation-activity-filter.tsx @@ -37,7 +37,7 @@ const minorFixesIssuePages = [ const states = { showAll: 'Show all activities', hideEvents: 'Hide events', - hideEventsBotsCollapsedComments: 'Hide events, bots, collapsed comments', + hideAllNoise: 'Hide events, bots, collapsed comments', } as const; type State = keyof typeof states; @@ -291,7 +291,7 @@ function switchToNextFilter(): void { async function init(signal: AbortSignal): Promise { currentState = SessionPageSetting.get() ?? (minorFixesIssuePages.some(url => location.href.startsWith(url)) - ? 'hideEventsBotsCollapsedComments' // Automatically hide resolved comments on "Minor codebase updates and fixes" issue pages + ? 'hideAllNoise' // Automatically hide resolved comments on "Minor codebase updates and fixes" issue pages : 'showAll'); const initialSetupOnce = onetime(() => { From d04aaa63750cdde38af295102561a9de239bdb09 Mon Sep 17 00:00:00 2001 From: Grigory Date: Mon, 11 May 2026 20:16:06 +0500 Subject: [PATCH 4/6] remove `:is` --- source/features/conversation-activity-filter.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/features/conversation-activity-filter.css b/source/features/conversation-activity-filter.css index 4ef621fa778a..fbe7ffcec1fd 100644 --- a/source/features/conversation-activity-filter.css +++ b/source/features/conversation-activity-filter.css @@ -33,7 +33,7 @@ display: none; } - &:is([data-rgh-conversation-activity-filter='hideEvents'] *) { + [data-rgh-conversation-activity-filter='hideEvents'] & { .octicon-eye { display: none; } @@ -46,9 +46,7 @@ } } - &:is( - [data-rgh-conversation-activity-filter='hideAllNoise'] * - ) { + [data-rgh-conversation-activity-filter='hideAllNoise'] & { .octicon-eye { display: none; } From 5b4c222b663d9a28c44f02b7f9764325228aaaab Mon Sep 17 00:00:00 2001 From: Grigory Date: Tue, 12 May 2026 12:50:59 +0500 Subject: [PATCH 5/6] don't pollute session storage --- source/features/conversation-activity-filter.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/features/conversation-activity-filter.tsx b/source/features/conversation-activity-filter.tsx index 7eef54b04f31..2477b4569061 100644 --- a/source/features/conversation-activity-filter.tsx +++ b/source/features/conversation-activity-filter.tsx @@ -295,7 +295,10 @@ async function init(signal: AbortSignal): Promise { : 'showAll'); const initialSetupOnce = onetime(() => { - applyState(currentState); + if (currentState !== 'showAll') { + applyState(currentState); + } + registerHotkey('h', switchToNextFilter, {signal}); delegate(`.${menuClass}`, 'itemActivated', handleSelection); }); From 49fc23ed73f55cf653b4dd132d2525b134c376a2 Mon Sep 17 00:00:00 2001 From: Grigory Date: Tue, 12 May 2026 13:14:23 +0500 Subject: [PATCH 6/6] `conversation-activity-filter` - Fix getting issue comment author --- source/features/conversation-activity-filter.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/features/conversation-activity-filter.tsx b/source/features/conversation-activity-filter.tsx index 2477b4569061..a5208cd1e7bd 100644 --- a/source/features/conversation-activity-filter.tsx +++ b/source/features/conversation-activity-filter.tsx @@ -66,6 +66,7 @@ const timelineItem = [ // React issue pages '[data-wrapper-timeline-id]:not([data-wrapper-timeline-id="load-top"])', // Exclude "Load more" button ]; +const comment = ['.comment-body', '.react-issue-comment']; function processTimelineEvent(item: HTMLElement): void { // Don't hide commits in PR conversation timelines #5581 @@ -82,7 +83,7 @@ function processSimpleComment(item: HTMLElement): void { item.classList.add(collapsedClassName); } - if (getCommentAuthor(item.firstElementChild!).endsWith('[bot]')) { + if (getCommentAuthor($(comment, item)).endsWith('[bot]')) { item.classList.add(botClassName); } } @@ -128,7 +129,7 @@ function processItem(item: HTMLElement): void { processReview(item); } else if (elementExists('.TimelineItem-badge .octicon-x', item)) { processDissmissedReviewEvent(item); - } else if (elementExists(['.comment-body', '.react-issue-comment'], item)) { + } else if (elementExists(comment, item)) { processSimpleComment(item); } else { processTimelineEvent(item);