diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp index e60e90827..bdf571fd2 100644 --- a/src/controllers/ignores/IgnorePhrase.hpp +++ b/src/controllers/ignores/IgnorePhrase.hpp @@ -150,23 +150,21 @@ struct Deserialize<chatterino::IgnorePhrase> { QString(), false, false, ::chatterino::getSettings()->ignoredPhraseReplace.getValue(), true); } - }; - QString _pattern; - bool _isRegex = false; - bool _isBlock = false; - QString _replace; - bool _caseSens = true; + QString _pattern; + bool _isRegex = false; + bool _isBlock = false; + QString _replace; + bool _caseSens = true; - chatterino::rj::getSafe(value, "pattern", _pattern); - chatterino::rj::getSafe(value, "regex", _isRegex); - chatterino::rj::getSafe(value, "isBlock", _isBlock); - chatterino::rj::getSafe(value, "replaceWith", _replace); - chatterino::rj::getSafe(value, "caseSensitive", _caseSens); - - return chatterino::IgnorePhrase(_pattern, _isRegex, _isBlock, _replace, _caseSens); -} -}; // namespace Settings + chatterino::rj::getSafe(value, "pattern", _pattern); + chatterino::rj::getSafe(value, "regex", _isRegex); + chatterino::rj::getSafe(value, "isBlock", _isBlock); + chatterino::rj::getSafe(value, "replaceWith", _replace); + chatterino::rj::getSafe(value, "caseSensitive", _caseSens); -} // namespace pajlada + return chatterino::IgnorePhrase(_pattern, _isRegex, _isBlock, _replace, _caseSens); + } +}; +} // namespace Settings } // namespace pajlada diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index f6feb61d9..aa0ef33e2 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -154,7 +154,7 @@ MessagePtr TwitchMessageBuilder::build() this->appendTwitchEmote(ircMessage, emote, twitchEmotes); } } - + auto app = getApp(); const auto &phrases = app->ignores->phrases.getVector(); auto removeEmotesInRange = [&twitchEmotes](int pos, int len) mutable { auto it = std::remove_if(