noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix historical messages not triggering highlights

Browse source 
For now they only trigger the highlighting of the message, but not sound
or flash alerts as I think that's weird.

Fix #308
This commit is contained in:
Rasmus Karlsson 2018-07-08 09:43:44 +00:00
parent aaa82dce75
commit da1627e47d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,9 +141,7 @@ MessagePtr TwitchMessageBuilder::build()
this->appendUsername(); this->appendUsername();
// highlights // highlights
if (/*app->settings->enableHighlights &&*/ !isPastMsg) { this->parseHighlights(isPastMsg);
this->parseHighlights();
}
QString bits; QString bits;
auto iterator = this->tags.find("bits"); auto iterator = this->tags.find("bits");
@ -420,7 +418,7 @@ void TwitchMessageBuilder::appendUsername()
} }
} }
void TwitchMessageBuilder::parseHighlights() void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
{ {
static auto player = new QMediaPlayer; static auto player = new QMediaPlayer;
static QUrl currentPlayerUrl; static QUrl currentPlayerUrl;
@ -513,6 +511,7 @@ void TwitchMessageBuilder::parseHighlights()
this->setHighlight(doHighlight); this->setHighlight(doHighlight);
if (!isPastMsg) {
if (playSound && (!hasFocus || app->settings->highlightAlwaysPlaySound)) { if (playSound && (!hasFocus || app->settings->highlightAlwaysPlaySound)) {
player->play(); player->play();
} }
@ -520,6 +519,7 @@ void TwitchMessageBuilder::parseHighlights()
if (doAlert) { if (doAlert) {
QApplication::alert(getApp()->windows->getMainWindow().window(), 2500); QApplication::alert(getApp()->windows->getMainWindow().window(), 2500);
} }
}
if (doHighlight) { if (doHighlight) {
this->message_->flags |= Message::Highlighted; this->message_->flags |= Message::Highlighted;

2
src/providers/twitch/TwitchMessageBuilder.hpp
View file

@ -48,7 +48,7 @@ private:
void appendChannelName(); void appendChannelName();
void parseUsername(); void parseUsername();
void appendUsername(); void appendUsername();
void parseHighlights(); void parseHighlights(bool isPastMsg);
void appendTwitchEmote(const Communi::IrcMessage *ircMessage, const QString &emote, void appendTwitchEmote(const Communi::IrcMessage *ircMessage, const QString &emote,
std::vector<std::pair<long, EmoteData>> &vec); std::vector<std::pair<long, EmoteData>> &vec);