From d329046faaae47c39af14d9019b542b945e628d7 Mon Sep 17 00:00:00 2001 From: Sebastian Goth Date: Wed, 27 Jan 2010 11:06:48 +0100 Subject: [PATCH] Handle unknown CTCP stuff a little bit nicer - unknown replies are now shown with its arguments Fixes #889 - arguments to unknown CTCP queries are actually transmitted Fixes #795 - show target's nick for queries --- src/core/coreuserinputhandler.cpp | 4 ++-- src/core/ctcphandler.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp index a5a3d875..b7f1cc02 100644 --- a/src/core/coreuserinputhandler.cpp +++ b/src/core/coreuserinputhandler.cpp @@ -128,8 +128,8 @@ void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QStrin if(ctcpTag.isEmpty()) return; - QString message = ""; - QString verboseMessage = tr("sending CTCP-%1 request").arg(ctcpTag); + QString message = msg.section(' ', 2); + QString verboseMessage = tr("sending CTCP-%1 request to %2").arg(ctcpTag).arg(nick); if(ctcpTag == "PING") { uint now = QDateTime::currentDateTime().toTime_t(); diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp index 2b606f6b..8b17de19 100644 --- a/src/core/ctcphandler.cpp +++ b/src/core/ctcphandler.cpp @@ -218,9 +218,11 @@ void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const void CtcpHandler::defaultHandler(const QString &cmd, CtcpType ctcptype, const QString &prefix, const QString &target, const QString ¶m) { Q_UNUSED(ctcptype); Q_UNUSED(target); - Q_UNUSED(param); if(!_ignoreListManager->ctcpMatch(prefix, network()->networkName())) { - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix)); + QString str = tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix); + if(!param.isEmpty()) + str.append(tr(" with arguments: %1").arg(param)); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", str); } } -- 2.20.1