chatterino2
Code Issues

refactored SignalVector

Browse Source
This commit is contained in:
fourtf
2020-02-23 17:10:49 +01:00
parent 2b5c6ffe33
commit e1838154ff
4 changed files with 161 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchMessageBuilder.cpp
+6 -7
View File
@@ -170,7 +170,8 @@ bool TwitchMessageBuilder::isIgnored() const
auto app = getApp();
// TODO(pajlada): Do we need to check if the phrase is valid first?
for (const auto &phrase : app->ignores->phrases)
auto phrases = app->ignores->phrases.readOnly();
for (const auto &phrase : *phrases)
{
if (phrase.isBlock() && phrase.isMatch(this->originalMessage_))
{
@@ -765,7 +766,7 @@ void TwitchMessageBuilder::runIgnoreReplaces(
std::vector<std::tuple<int, EmotePtr, EmoteName>> &twitchEmotes)
{
auto app = getApp();
const auto &phrases = app->ignores->phrases;
auto phrases = app->ignores->phrases.readOnly();
auto removeEmotesInRange =
[](int pos, int len,
std::vector<std::tuple<int, EmotePtr, EmoteName>>
@@ -828,7 +829,7 @@ void TwitchMessageBuilder::runIgnoreReplaces(
}
};
for (const auto &phrase : phrases)
for (const auto &phrase : *phrases)
{
if (phrase.isBlock())
{
@@ -1056,11 +1057,9 @@ void TwitchMessageBuilder::parseHighlights()
*/
}
std::vector<HighlightPhrase> userHighlights =
app->highlights->highlightedUsers.cloneVector();
// Highlight because of sender
for (const HighlightPhrase &userHighlight : userHighlights)
auto userHighlights = app->highlights->highlightedUsers.readOnly();
for (const HighlightPhrase &userHighlight : *userHighlights)
{
if (!userHighlight.isMatch(this->ircMessage->nick()))
{