author | skyhusker <skyhusker> | 2005-01-23 23:02:00 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-01-23 23:02:00 (UTC) |
commit | 42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc (patch) (side-by-side diff) | |
tree | 6536ec388af2314ecfaecdeb923b4c2e76b0de29 /noncore | |
parent | 2074382fccea58a55b68c51815abc5df463473aa (diff) | |
download | opie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.zip opie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.tar.gz opie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.tar.bz2 |
Added distinction between CTCP requests and CTCP replies
-rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 27 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessage.h | 3 |
2 files changed, 24 insertions, 6 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 @@ -49,30 +49,37 @@ 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; + } + /* Strip CTCP \001 characters */ m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), ""); QTextIStream ctcpStream(&m_allParameters); - if (m_command == "PRIVMSG") - ctcpStream >> m_ctcpDestination; + 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; + 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; @@ -141,12 +148,20 @@ bool IRCMessage::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; diff --git a/noncore/net/opieirc/ircmessage.h b/noncore/net/opieirc/ircmessage.h index 10ba450..40bb210 100644 --- a/noncore/net/opieirc/ircmessage.h +++ b/noncore/net/opieirc/ircmessage.h @@ -35,12 +35,14 @@ public: /* Return the IRC message prefix (usually sender etc) */ QString prefix(); /* Check if this IRCMessage's command is literal or numerical */ bool isNumerical(); /* CHeck if this IRCMessage is a CTCP message */ bool isCTCP(); + bool isCTCPRequest(); + bool isCTCPReply(); /* Return the IRC command (literal commands) */ QString command(); /* Return the CTCP command */ QString ctcpCommand(); /* Return the CTCP destination if applicable (channel/person) */ QString ctcpDestination(); @@ -62,9 +64,10 @@ protected: unsigned short m_commandNumber; QString m_allParameters; QString m_trailing; QStringList m_parameters; bool m_isNumerical; bool m_ctcp; + bool m_ctcpRequest; }; #endif |