Diffstat (limited to 'noncore/net/opieirc/ircmessage.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp index d19e9e6..1b7072e 100644 --- a/noncore/net/opieirc/ircmessage.cpp +++ b/noncore/net/opieirc/ircmessage.cpp @@ -43,42 +43,49 @@ IRCMessage::IRCMessage(QString line) { m_parameters << m_trailing; break; } else { m_parameters << temp; } } 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; + } + /* Strip CTCP \001 characters */ m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), ""); QTextIStream ctcpStream(&m_allParameters); - if (m_command == "PRIVMSG") ctcpStream >> m_ctcpDestination; ctcpStream >> temp; m_ctcpCommand = temp.upper().right(temp.length()-1); m_parameters.clear(); int length = m_allParameters.length() - m_ctcpCommand.length() - 1; - if (m_command == "PRIVMSG") length -= m_ctcpDestination.length() + 1; if (length <= 0) { m_allParameters = ""; - } else { + } + else { m_allParameters = m_allParameters.right(length); m_parameters << m_allParameters; } - } else { + } + else { 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; @@ -135,20 +142,28 @@ QString IRCMessage::ctcpDestination() { unsigned short IRCMessage::commandNumber() { return m_commandNumber; } bool IRCMessage::isNumerical() { return m_isNumerical; } bool IRCMessage::isCTCP() { return m_ctcp; } +bool IRCMessage::isCTCPRequest() { + return m_ctcpRequest; +} + +bool IRCMessage::isCTCPReply() { + return !m_ctcpRequest; +} + QString IRCMessage::trailing() { return m_trailing; } QString IRCMessage::allParameters() { return m_allParameters; } |