fixed resub messages

This commit is contained in:
fourtf
2018-06-04 12:23:23 +02:00
parent 04b7cc5ce8
commit 4a2709cbc3
14 changed files with 141 additions and 36 deletions
+2 -26
View File
@@ -77,31 +77,7 @@ std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
void TwitchServer::privateMessageReceived(IrcPrivateMessage *message)
{
QString channelName;
if (!trimChannelName(message->target(), channelName)) {
return;
}
this->onPrivateMessage.invoke(message);
auto chan = this->getChannelOrEmpty(channelName);
if (chan->isEmpty()) {
return;
}
messages::MessageParseArgs args;
TwitchMessageBuilder builder(chan.get(), message, args);
if (!builder.isIgnored()) {
messages::MessagePtr msg = builder.build();
if (msg->flags & messages::Message::Highlighted) {
this->mentionsChannel->addMessage(msg);
getApp()->highlights->addHighlight(msg);
}
chan->addMessage(msg);
}
IrcMessageHandler::getInstance().handlePrivMessage(message, *this);
}
void TwitchServer::messageReceived(IrcMessage *message)
@@ -125,7 +101,7 @@ void TwitchServer::messageReceived(IrcMessage *message)
} else if (command == "WHISPER") {
handler.handleWhisperMessage(message);
} else if (command == "USERNOTICE") {
handler.handleUserNoticeMessage(message);
handler.handleUserNoticeMessage(message, *this);
} else if (command == "MODE") {
handler.handleModeMessage(message);
} else if (command == "NOTICE") {