| -rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp index 1b7072e..da8db77 100644 --- a/noncore/net/opieirc/ircmessage.cpp +++ b/noncore/net/opieirc/ircmessage.cpp @@ -47,22 +47,18 @@ IRCMessage::IRCMessage(QString line) { } } m_commandNumber = m_command.toInt(&m_isNumerical); /* Is this a CTCP command */ if ((m_command == "PRIVMSG" || m_command == "NOTICE") && m_trailing.length()>0 && m_trailing.left(1) == QChar(1)) { m_ctcp = TRUE; - if (m_command == "PRIVMSG") { - m_ctcpRequest = TRUE; - } - else { - m_ctcpRequest = FALSE; - } + + m_ctcpRequest = (m_command == "PRIVMSG"); /* Strip CTCP \001 characters */ m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), ""); QTextIStream ctcpStream(&m_allParameters); ctcpStream >> m_ctcpDestination; ctcpStream >> temp; m_ctcpCommand = temp.upper().right(temp.length()-1); m_parameters.clear(); @@ -80,22 +76,26 @@ IRCMessage::IRCMessage(QString line) { m_ctcp = FALSE; } odebug << "Parsed: " << line << oendl; odebug << "Prefix: " << m_prefix << oendl; odebug << "Command: " << m_command << oendl; odebug << "Allparameters: " << m_allParameters << oendl; + for (unsigned int i=0; i<m_parameters.count(); i++) { odebug << "Parameter " << i << ":" << m_parameters[i] << oendl; } - odebug << "CTCP Command: " << m_ctcpCommand << oendl; - odebug << "CTCP Destination: " << m_ctcpDestination << oendl; - odebug << "CTCP param count is: " << m_parameters.count() << oendl; + + if(m_ctcp) { + odebug << "CTCP " << (m_ctcpRequest? "Request" : "Reply") << ": " << m_ctcpCommand << oendl; + odebug << "CTCP Destination: " << m_ctcpDestination << oendl; + odebug << "CTCP param count is: " << m_parameters.count() << oendl; + } } QString IRCMessage::param(int param) { return m_parameters[param]; } QStringList IRCMessage::params(const QString ¶mstring) const { |