chatterino2
Code Issues

refactor: Remove Leading Mention in Replies and Highlight Participated Threads (#4047)

Browse Source
This commit is contained in:
nerix
2022-10-08 16:25:32 +02:00
committed by GitHub
parent 29272e130a
commit 4e2da540d2
19 changed files with 286 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/highlights/HighlightController.cpp
+60 -6
View File
@@ -11,10 +11,12 @@ auto highlightPhraseCheck(const HighlightPhrase &highlight) -> HighlightCheck
return HighlightCheck{
[highlight](const auto &args, const auto &badges,
const auto &senderName, const auto &originalMessage,
const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
(void)args; // unused
(void)badges; // unused
(void)senderName; // unused
(void)flags; // unused
if (self)
{
@@ -60,11 +62,12 @@ void rebuildSubscriptionHighlights(Settings &settings,
checks.emplace_back(HighlightCheck{
[=](const auto &args, const auto &badges, const auto &senderName,
const auto &originalMessage,
const auto &originalMessage, const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
(void)badges; // unused
(void)senderName; // unused
(void)originalMessage; // unused
(void)flags; // unused
(void)self; // unused
if (!args.isSubscriptionMessage)
@@ -105,11 +108,12 @@ void rebuildWhisperHighlights(Settings &settings,
checks.emplace_back(HighlightCheck{
[=](const auto &args, const auto &badges, const auto &senderName,
const auto &originalMessage,
const auto &originalMessage, const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
(void)badges; // unused
(void)senderName; // unused
(void)originalMessage; // unused
(void)flags; // unused
(void)self; // unused
if (!args.isReceivedWhisper)
@@ -128,6 +132,44 @@ void rebuildWhisperHighlights(Settings &settings,
}
}
void rebuildReplyThreadHighlight(Settings &settings,
std::vector<HighlightCheck> &checks)
{
if (settings.enableThreadHighlight)
{
auto highlightSound = settings.enableThreadHighlightSound.getValue();
auto highlightAlert = settings.enableThreadHighlightTaskbar.getValue();
auto highlightSoundUrlValue =
settings.threadHighlightSoundUrl.getValue();
boost::optional<QUrl> highlightSoundUrl;
if (!highlightSoundUrlValue.isEmpty())
{
highlightSoundUrl = highlightSoundUrlValue;
}
auto highlightInMentions =
settings.showThreadHighlightInMentions.getValue();
checks.emplace_back(HighlightCheck{
[=](const auto & /*args*/, const auto & /*badges*/,
const auto & /*senderName*/, const auto & /*originalMessage*/,
const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
if (flags.has(MessageFlag::ParticipatedThread) && !self)
{
return HighlightResult{
highlightAlert,
highlightSound,
highlightSoundUrl,
ColorProvider::instance().color(
ColorType::ThreadMessageHighlight),
highlightInMentions,
};
}
return boost::none;
}});
}
}
void rebuildMessageHighlights(Settings &settings,
std::vector<HighlightCheck> &checks)
{
@@ -163,10 +205,12 @@ void rebuildUserHighlights(Settings &settings,
checks.emplace_back(HighlightCheck{
[highlight](const auto &args, const auto &badges,
const auto &senderName, const auto &originalMessage,
const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
(void)args; // unused
(void)badges; // unused
(void)originalMessage; // unused
(void)flags; // unused
(void)self; // unused
if (!highlight.isMatch(senderName))
@@ -201,10 +245,12 @@ void rebuildBadgeHighlights(Settings &settings,
checks.emplace_back(HighlightCheck{
[highlight](const auto &args, const auto &badges,
const auto &senderName, const auto &originalMessage,
const auto &flags,
const auto self) -> boost::optional<HighlightResult> {
(void)args; // unused
(void)senderName; // unused
(void)originalMessage; // unused
(void)flags; // unused
(void)self; // unused
for (const Badge &badge : badges)
@@ -247,6 +293,11 @@ void HighlightController::initialize(Settings &settings, Paths & /*paths*/)
this->rebuildListener_.addSetting(settings.enableSubHighlight);
this->rebuildListener_.addSetting(settings.enableSubHighlightSound);
this->rebuildListener_.addSetting(settings.enableSubHighlightTaskbar);
this->rebuildListener_.addSetting(settings.enableThreadHighlight);
this->rebuildListener_.addSetting(settings.enableThreadHighlightSound);
this->rebuildListener_.addSetting(settings.enableThreadHighlightTaskbar);
this->rebuildListener_.addSetting(settings.threadHighlightSoundUrl);
this->rebuildListener_.addSetting(settings.showThreadHighlightInMentions);
this->rebuildListener_.setCB([this, &settings] {
qCDebug(chatterinoHighlights)
@@ -294,7 +345,7 @@ void HighlightController::rebuildChecks(Settings &settings)
checks->clear();
// CURRENT ORDER:
// Subscription -> Whisper -> User -> Message -> Badge
// Subscription -> Whisper -> User -> Message -> Reply Threads -> Badge
rebuildSubscriptionHighlights(settings, *checks);
@@ -304,12 +355,15 @@ void HighlightController::rebuildChecks(Settings &settings)
rebuildMessageHighlights(settings, *checks);
rebuildReplyThreadHighlight(settings, *checks);
rebuildBadgeHighlights(settings, *checks);
}
std::pair<bool, HighlightResult> HighlightController::check(
const MessageParseArgs &args, const std::vector<Badge> &badges,
const QString &senderName, const QString &originalMessage) const
const QString &senderName, const QString &originalMessage,
const MessageFlags &messageFlags) const
{
bool highlighted = false;
auto result = HighlightResult::emptyResult();
@@ -322,8 +376,8 @@ std::pair<bool, HighlightResult> HighlightController::check(
for (const auto &check : *checks)
{
if (auto checkResult =
check.cb(args, badges, senderName, originalMessage, self);
if (auto checkResult = check.cb(args, badges, senderName,
originalMessage, messageFlags, self);
checkResult)
{
highlighted = true;