From: Marcus Eggenberger Date: Sun, 20 Jan 2008 23:30:39 +0000 (+0000) Subject: closing BR #57 - handle empty messages properly X-Git-Tag: 0.2.0-alpha1~214 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7b645ac74dc0d272dcf70f16b4dfd5a294f95ba7;hp=e2aa07398950ba83b47d1772eb8fb23bc8fdd931 closing BR #57 - handle empty messages properly --- diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 6780147a..a5e09d5d 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -311,13 +311,15 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { } } } else { - Q_ASSERT(isChannelName(target)); // should be channel! - QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); - foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, target, message, prefix); - } + // so it's probably a channel.. + if(!isChannelName(target)) { + qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!"; + return; } + + QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); + foreach(QString message, messages) + emit displayMsg(Message::Plain, target, message, prefix); } } diff --git a/version.inc b/version.inc index 28569292..de9c9e77 100644 --- a/version.inc +++ b/version.inc @@ -4,8 +4,8 @@ { using namespace Global; quasselVersion = "0.2.0-pre"; - quasselDate = "2008-01-20"; - quasselBuild = 365; + quasselDate = "2008-01-21"; + quasselBuild = 366; //! Minimum client build number the core needs clientBuildNeeded = 358;