diff options
| author | Markus Mittendrein <git@maxmitti.tk> | 2015-10-14 14:43:32 +0200 |
|---|---|---|
| committer | Markus Mittendrein <git@maxmitti.tk> | 2015-10-14 14:43:32 +0200 |
| commit | 6eff9ce662873553a4511920577e37aaff5893f0 (patch) | |
| tree | 84612ee5c4ef36625509ac55e5aea19df8f38d32 | |
| parent | 1158e57f400de8f0e9ec0b8b21bfcf0d5dfc830f (diff) | |
| download | manager-6eff9ce662873553a4511920577e37aaff5893f0.tar.gz manager-6eff9ce662873553a4511920577e37aaff5893f0.zip | |
Forward /me-messages from Clonk to IngameChannel
| -rw-r--r-- | src/crsm.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp index 3fe1000..08edc4a 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -149,13 +149,13 @@ void CRSM::readServerOutput() if(pcName != Config.Auto.Volatile.Clonk.ServerPCName) { ClientInfo& info = getClientInfo(pcName, cuid, user); + QString msg = userexp.cap(5).trimmed(); if(info.floodCheck(Config.Clonk.Chat.AntiFlood.Count, Config.Clonk.Chat.AntiFlood.Time, QDateTime(QDate::currentDate(), QTime::fromString(timeRemover.cap(1), "hh:mm:ss")))) { kick(pcName, "Flooding! Maximal " + QString::number(Config.Clonk.Chat.AntiFlood.Count) + " Nachrichten in " + QString::number(Config.Clonk.Chat.AntiFlood.Time) + "s"); } else if(!isMeMessage) { - QString msg = userexp.cap(5).trimmed(); if(msg.length() > Config.CRSM.CommandSign.length() && msg.left(Config.CRSM.CommandSign.length()) == Config.CRSM.CommandSign) { QString command = msg.mid(Config.CRSM.CommandSign.length()); @@ -170,6 +170,10 @@ void CRSM::readServerOutput() connection->sendCommand(IrcCommand::createMessage(Config.IRC.IngameChannel, "[Clonk]<" + user + "> " + msg)); } } + else if(Session.IRC.UseIngameChat) + { + connection->sendCommand(IrcCommand::createCtcpAction(Config.IRC.IngameChannel, "[Clonk] " + user + " " + msg)); + } } } static QRegExp joinExp("^Client (.+) (?:verbunden|connected)\\.\\s*$"); |