Added distinction between CTCP requests and CTCP replies

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
@@ -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 >> 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;
     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;
 }
 
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
@@ -29,24 +29,26 @@ class QStringList;
 
 class IRCMessage {
 public:
     /* Parse an IRC message and create the IRCMessage object */
     IRCMessage(QString line);
 
     /* 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();
     /* Return the IRC command (numerical commands) */
     unsigned short commandNumber();
     /* Return the trailing parameter string */
     QString trailing();
     /* Return the complete parameter string */
     QString allParameters();
@@ -56,15 +58,16 @@ public:
     QStringList params(const QString &paramstring) const;
 protected:
     QString         m_prefix;
     QString         m_command;
     QString         m_ctcpCommand;
     QString         m_ctcpDestination;
     unsigned short  m_commandNumber;
     QString         m_allParameters;
     QString         m_trailing;
     QStringList     m_parameters;
     bool            m_isNumerical;
     bool            m_ctcp;
+    bool            m_ctcpRequest;
 };
 
 #endif