noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow your own username to be set in "highlight users"

Browse source 
Fixes #1181
This commit is contained in:
Rasmus Karlsson 2019-08-10 13:11:53 +02:00
parent 8f44f18d46
commit 6e1ee84d90
1 changed files with 54 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -488,6 +488,13 @@ void TwitchMessageBuilder::parseUsername()
// }
this->message().loginName = this->userName;
// Update current user color if this is our message
auto currentUser = getApp()->accounts->twitch.getCurrent();
if (this->ircMessage->nick() == currentUser->getUserName())
{
currentUser->setColor(this->usernameColor_);
}
}
void TwitchMessageBuilder::appendUsername()
@ -834,25 +841,58 @@ void TwitchMessageBuilder::parseHighlights()
QString currentUsername = currentUser->getUserName();
if (this->ircMessage->nick() == currentUsername)
{
currentUser->setColor(this->usernameColor_);
// Do nothing. Highlights cannot be triggered by yourself
return;
}
if (app->highlights->blacklistContains(this->ircMessage->nick()))
{
// Do nothing. We ignore highlights from this user.
return;
}
std::vector<HighlightPhrase> userHighlights =
app->highlights->highlightedUsers.cloneVector();
// Highlight because of sender
for (const HighlightPhrase &userHighlight : userHighlights)
{
if (!userHighlight.isMatch(this->ircMessage->nick()))
{
continue;
}
log("Highlight because user {} sent a message",
this->ircMessage->nick());
if (!this->highlightVisual_)
{
this->highlightVisual_ = true;
this->message().flags.set(MessageFlag::Highlighted);
}
if (userHighlight.getAlert())
{
this->highlightAlert_ = true;
}
if (userHighlight.getSound())
{
this->highlightSound_ = true;
}
if (this->highlightAlert_ && this->highlightSound_)
{
// Break if no further action can be taken from other
// usernames Mostly used for regex stuff
break;
}
}
if (this->ircMessage->nick() == currentUsername)
{
// Do nothing. Highlights cannot be triggered by yourself
return;
}
// TODO: This vector should only be rebuilt upon highlights being changed
// fourtf: should be implemented in the HighlightsController
std::vector<HighlightPhrase> activeHighlights =
app->highlights->phrases.cloneVector();
std::vector<HighlightPhrase> userHighlights =
app->highlights->highlightedUsers.cloneVector();
if (getSettings()->enableSelfHighlight && currentUsername.size() > 0)
{
@ -872,7 +912,11 @@ void TwitchMessageBuilder::parseHighlights()
log("Highlight because {} matches {}", this->originalMessage_,
highlight.getPattern());
this->highlightVisual_ = true;
if (!this->highlightVisual_)
{
this->highlightVisual_ = true;
this->message().flags.set(MessageFlag::Highlighted);
}
if (highlight.getAlert())
{
@ -893,35 +937,6 @@ void TwitchMessageBuilder::parseHighlights()
}
}
// Highlight because of sender
for (const HighlightPhrase &userHighlight : userHighlights)
{
if (!userHighlight.isMatch(this->ircMessage->nick()))
{
continue;
}
log("Highlight because user {} sent a message",
this->ircMessage->nick());
this->highlightVisual_ = true;
if (userHighlight.getAlert())
{
this->highlightAlert_ = true;
}
if (userHighlight.getSound())
{
this->highlightSound_ = true;
}
if (this->highlightAlert_ && this->highlightSound_)
{
// Break if no further action can be taken from other
// usernames Mostly used for regex stuff
break;
}
}
// Highlight because it's a whisper
if (this->args.isReceivedWhisper && getSettings()->enableWhisperHighlight)
{
@ -934,8 +949,6 @@ void TwitchMessageBuilder::parseHighlights()
this->highlightSound_ = true;
}
}
this->message().flags.set(MessageFlag::Highlighted, this->highlightVisual_);
}
void TwitchMessageBuilder::appendTwitchEmote(