diff --git a/src/providers/twitch/ircmessagehandler.cpp b/src/providers/twitch/ircmessagehandler.cpp index 796f048d5..4a882b11b 100644 --- a/src/providers/twitch/ircmessagehandler.cpp +++ b/src/providers/twitch/ircmessagehandler.cpp @@ -11,6 +11,7 @@ #include "singletons/windowmanager.hpp" #include +#include using namespace chatterino::singletons; using namespace chatterino::messages; @@ -159,7 +160,8 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message) twitch::TwitchMessageBuilder builder(c, message, message->parameter(1), args); - if (!builder.isIgnored()) { + const static std::vector vec{"airbrushgrenade", "scizth0"}; + if (!builder.isIgnored() && std::find(vec.begin(), vec.end(), message->nick()) == vec.end()) { messages::MessagePtr _message = builder.build(); if (_message->flags & messages::Message::Highlighted) { TwitchServer::getInstance().mentionsChannel->addMessage(_message); diff --git a/src/providers/twitch/twitchchannel.cpp b/src/providers/twitch/twitchchannel.cpp index cdb16af8a..b68dc06a5 100644 --- a/src/providers/twitch/twitchchannel.cpp +++ b/src/providers/twitch/twitchchannel.cpp @@ -310,7 +310,8 @@ void TwitchChannel::fetchRecentMessages() messages::MessageParseArgs args; twitch::TwitchMessageBuilder builder(channel, privMsg, args); - if (!builder.isIgnored()) { + const static std::vector vec{"airbrushgrenade", "scizth0"}; + if (!builder.isIgnored() && std::find(vec.begin(), vec.end(), privMsg->nick()) == vec.end()) { messages.push_back(builder.build()); } } diff --git a/src/providers/twitch/twitchserver.cpp b/src/providers/twitch/twitchserver.cpp index aec19a32e..bb57212a0 100644 --- a/src/providers/twitch/twitchserver.cpp +++ b/src/providers/twitch/twitchserver.cpp @@ -90,7 +90,8 @@ void TwitchServer::privateMessageReceived(IrcPrivateMessage *message) TwitchMessageBuilder builder(chan.get(), message, args); - if (!builder.isIgnored()) { + const static std::vector vec{"airbrushgrenade", "scizth0"}; + if (!builder.isIgnored() && std::find(vec.begin(), vec.end(), message->nick()) == vec.end()) { messages::MessagePtr _message = builder.build(); if (_message->flags & messages::Message::Highlighted) { TwitchServer::getInstance().mentionsChannel->addMessage(_message);