From 6c4596b7597e3aee69eb191a54dde234508fe2c2 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 14 Jan 2023 12:20:53 +0100 Subject: [PATCH 1/3] Change the highlight order to prioritize Message highlights over User highlights --- src/controllers/highlights/HighlightController.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/highlights/HighlightController.cpp b/src/controllers/highlights/HighlightController.cpp index 58eee196efb..6e94ebdcacc 100644 --- a/src/controllers/highlights/HighlightController.cpp +++ b/src/controllers/highlights/HighlightController.cpp @@ -445,16 +445,16 @@ void HighlightController::rebuildChecks(Settings &settings) checks->clear(); // CURRENT ORDER: - // Subscription -> Whisper -> User -> Message -> Reply Threads -> Badge + // Subscription -> Whisper -> Message -> User -> Reply Threads -> Badge rebuildSubscriptionHighlights(settings, *checks); rebuildWhisperHighlights(settings, *checks); - rebuildUserHighlights(settings, *checks); - rebuildMessageHighlights(settings, *checks); + rebuildUserHighlights(settings, *checks); + rebuildReplyThreadHighlight(settings, *checks); rebuildBadgeHighlights(settings, *checks); From 07539587f31105862cd0a2d66b4bba6c3e34ff4b Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 14 Jan 2023 12:21:28 +0100 Subject: [PATCH 2/3] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f775be91d2f..54da89bf8e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unversioned +- Minor: Change the highlight order to prioritize Message highlights over User highlights. (#4303) - Minor: Added ability to negate search options by prefixing it with an exclamation mark (e.g. `!badge:mod` to search for messages where the author does not have the moderator badge). (#4207) - Minor: Search window input will automatically use currently selected text if present. (#4178) - Minor: Cleared up highlight sound settings (#4194) From 7047110ad860f5910c817785e765c2378d58a808 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 14 Jan 2023 12:23:29 +0100 Subject: [PATCH 3/3] Update UI to match new highlight order --- src/widgets/settingspages/HighlightingPage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp index 04b5058bf62..60873bbcb07 100644 --- a/src/widgets/settingspages/HighlightingPage.cpp +++ b/src/widgets/settingspages/HighlightingPage.cpp @@ -63,8 +63,8 @@ HighlightingPage::HighlightingPage() highlights.emplace( "Play notification sounds and highlight messages based on " "certain patterns.\n" - "Message highlights are prioritized over badge highlights, " - "but under user highlights"); + "Message highlights are prioritized over badge highlights " + "and user highlights."); auto view = highlights @@ -109,8 +109,8 @@ HighlightingPage::HighlightingPage() pingUsers.emplace( "Play notification sounds and highlight messages from " "certain users.\n" - "User highlights are prioritized over message and badge " - "highlights."); + "User highlights are prioritized badge highlights, but " + "under message highlights."); EditableModelView *view = pingUsers .emplace(