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
@@ -52,24 +52,31 @@ IRCMessage::IRCMessage(QString line) {
     /* 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;
     }
 
@@ -144,6 +151,14 @@ bool IRCMessage::isCTCP() {
     return m_ctcp;
 }
 
+bool IRCMessage::isCTCPRequest() {
+    return m_ctcpRequest;
+}
+
+bool IRCMessage::isCTCPReply() {
+    return !m_ctcpRequest;
+}
+
 QString IRCMessage::trailing() {
     return m_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
@@ -38,6 +38,8 @@ public:
     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 */
@@ -65,6 +67,7 @@ protected:
     QStringList     m_parameters;
     bool            m_isNumerical;
     bool            m_ctcp;
+    bool            m_ctcpRequest;
 };
 
 #endif