Fixes #210 aallow duplicate messages behaves weird

This commit is contained in:
fourtf
2018-01-22 15:24:39 +01:00
parent d966c24bc3
commit 9d8edc4ae0
4 changed files with 18 additions and 11 deletions
+16 -1
View File
@@ -41,6 +41,9 @@ TwitchChannel::TwitchChannel(const QString &channelName)
this->connectedConnection = singletons::IrcManager::getInstance().connected.connect(
[this] { this->userStateChanged(); });
this->messageSuffix.append(' ');
this->messageSuffix.append(QChar(0x206D));
}
TwitchChannel::~TwitchChannel()
@@ -87,6 +90,19 @@ void TwitchChannel::sendMessage(const QString &message)
// Do last message processing
QString parsedMessage = emoteManager.replaceShortCodes(message);
parsedMessage = parsedMessage.trimmed();
if (parsedMessage.isEmpty())
return;
if (singletons::SettingManager::getInstance().allowDuplicateMessages) {
if (parsedMessage == this->lastSentMessage) {
parsedMessage.append(this->messageSuffix);
this->lastSentMessage = "";
}
}
singletons::IrcManager::getInstance().sendMessage(this->name, parsedMessage);
}
@@ -228,6 +244,5 @@ void TwitchChannel::fetchRecentMessages()
}
});
}
} // namespace twitch
} // namespace chatterino
+2
View File
@@ -57,6 +57,8 @@ private:
boost::signals2::connection connectedConnection;
bool mod;
QByteArray messageSuffix;
QString lastSentMessage;
};
} // namespace twitch