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

fixes #525

Browse source
This commit is contained in:
ch-ems 2018-06-26 19:37:04 +01:00 committed by fourtf
parent 1bd97d853e
commit b2d18ddd7f
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/providers/twitch/IrcMessageHandler.cpp
View file

@ -210,7 +210,6 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
if (!builder.isIgnored()) { if (!builder.isIgnored()) {
chatterino::MessagePtr _message = builder.build(); chatterino::MessagePtr _message = builder.build();
_message->flags |= chatterino::Message::DoNotTriggerNotification;
if (_message->flags & chatterino::Message::Highlighted) { if (_message->flags & chatterino::Message::Highlighted) {
app->twitch.server->mentionsChannel->addMessage(_message); app->twitch.server->mentionsChannel->addMessage(_message);
@ -220,6 +219,8 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
c->addMessage(_message); c->addMessage(_message);
_message->flags |= chatterino::Message::DoNotTriggerNotification;
if (app->settings->inlineWhispers) { if (app->settings->inlineWhispers) {
app->twitch.server->forEachChannel([_message](ChannelPtr channel) { app->twitch.server->forEachChannel([_message](ChannelPtr channel) {
channel->addMessage(_message); // channel->addMessage(_message); //
@ -321,12 +322,22 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
void IrcMessageHandler::handleWriteConnectionNoticeMessage(Communi::IrcNoticeMessage *message) void IrcMessageHandler::handleWriteConnectionNoticeMessage(Communi::IrcNoticeMessage *message)
{ {
static std::unordered_set<std::string> readConnectionOnlyIDs{ static std::unordered_set<std::string> readConnectionOnlyIDs{
"host_on", "host_off", "host_target_went_offline", "emote_only_on", "emote_only_off", "host_on",
"slow_on", "slow_off", "subs_on", "subs_off", "r9k_on", "r9k_off", "host_off",
"host_target_went_offline",
"emote_only_on",
"emote_only_off",
"slow_on",
"slow_off",
"subs_on",
"subs_off",
"r9k_on",
"r9k_off",
// Display for user who times someone out. This implies you're a moderator, at which point // Display for user who times someone out. This implies you're a moderator, at which point
// you will be connected to PubSub and receive a better message from there // you will be connected to PubSub and receive a better message from there
"timeout_success", "ban_success", "timeout_success",
"ban_success",
}; };
QVariant v = message->tag("msg-id"); QVariant v = message->tag("msg-id");