| -rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 23 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircmessage.h | 3 |
2 files changed, 22 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 @@ -54,2 +54,9 @@ IRCMessage::IRCMessage(QString line) { m_ctcp = TRUE; + if (m_command == "PRIVMSG") { + m_ctcpRequest = TRUE; + } + else { + m_ctcpRequest = FALSE; + } + /* Strip CTCP \001 characters */ @@ -57,3 +64,2 @@ IRCMessage::IRCMessage(QString line) { QTextIStream ctcpStream(&m_allParameters); - if (m_command == "PRIVMSG") ctcpStream >> m_ctcpDestination; @@ -63,3 +69,2 @@ IRCMessage::IRCMessage(QString line) { int length = m_allParameters.length() - m_ctcpCommand.length() - 1; - if (m_command == "PRIVMSG") length -= m_ctcpDestination.length() + 1; @@ -67,3 +72,4 @@ IRCMessage::IRCMessage(QString line) { m_allParameters = ""; - } else { + } + else { m_allParameters = m_allParameters.right(length); @@ -71,3 +77,4 @@ IRCMessage::IRCMessage(QString line) { } - } else { + } + else { m_ctcp = FALSE; @@ -146,2 +153,10 @@ bool IRCMessage::isCTCP() { +bool IRCMessage::isCTCPRequest() { + return m_ctcpRequest; +} + +bool IRCMessage::isCTCPReply() { + return !m_ctcpRequest; +} + QString IRCMessage::trailing() { 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 @@ -40,2 +40,4 @@ public: bool isCTCP(); + bool isCTCPRequest(); + bool isCTCPReply(); /* Return the IRC command (literal commands) */ @@ -67,2 +69,3 @@ protected: bool m_ctcp; + bool m_ctcpRequest; }; |