noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable empty-string sending

Browse source 
Fixes #191
This commit is contained in:
Rasmus Karlsson 2018-01-04 02:32:24 +01:00
parent 96fa242e65
commit 27dacdde36
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/singletons/ircmanager.cpp
View file

@ -200,14 +200,19 @@ void IrcManager::disconnect()
void IrcManager::sendMessage(const QString &channelName, QString message) void IrcManager::sendMessage(const QString &channelName, QString message)
{ {
QString trimmedMessage = message.trimmed();
if (trimmedMessage.isEmpty()) {
return;
}
this->connectionMutex.lock(); this->connectionMutex.lock();
static int i = 0; static int i = 0;
if (this->writeConnection) { if (this->writeConnection) {
if (singletons::SettingManager::getInstance().allowDuplicateMessages && (++i % 2) == 0) { if (singletons::SettingManager::getInstance().allowDuplicateMessages && (++i % 2) == 0) {
message.append(this->messageSuffix); trimmedMessage.append(this->messageSuffix);
} }
this->writeConnection->sendRaw("PRIVMSG #" + channelName + " :" + message); this->writeConnection->sendRaw("PRIVMSG #" + channelName + " :" + trimmedMessage);
} }
this->connectionMutex.unlock(); this->connectionMutex.unlock();
@ -399,5 +404,5 @@ Communi::IrcConnection *IrcManager::getReadConnection()
return this->readConnection.get(); return this->readConnection.get();
} }
} // namespace singletons
} // namespace chatterino } // namespace chatterino
}