Diffstat (limited to 'noncore/net/opieirc/ircmessage.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 27 |
1 files changed, 21 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) { | |||
43 | m_parameters << m_trailing; | 43 | m_parameters << m_trailing; |
44 | break; | 44 | break; |
45 | } else { | 45 | } else { |
46 | m_parameters << temp; | 46 | m_parameters << temp; |
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | m_commandNumber = m_command.toInt(&m_isNumerical); | 51 | m_commandNumber = m_command.toInt(&m_isNumerical); |
52 | /* Is this a CTCP command */ | 52 | /* Is this a CTCP command */ |
53 | if ((m_command == "PRIVMSG" || m_command == "NOTICE") && m_trailing.length()>0 && m_trailing.left(1) == QChar(1)) { | 53 | if ((m_command == "PRIVMSG" || m_command == "NOTICE") && m_trailing.length()>0 && m_trailing.left(1) == QChar(1)) { |
54 | m_ctcp = TRUE; | 54 | m_ctcp = TRUE; |
55 | if (m_command == "PRIVMSG") { | ||
56 | m_ctcpRequest = TRUE; | ||
57 | } | ||
58 | else { | ||
59 | m_ctcpRequest = FALSE; | ||
60 | } | ||
61 | |||
55 | /* Strip CTCP \001 characters */ | 62 | /* Strip CTCP \001 characters */ |
56 | m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), ""); | 63 | m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), ""); |
57 | QTextIStream ctcpStream(&m_allParameters); | 64 | QTextIStream ctcpStream(&m_allParameters); |
58 | if (m_command == "PRIVMSG") | 65 | ctcpStream >> m_ctcpDestination; |
59 | ctcpStream >> m_ctcpDestination; | ||
60 | ctcpStream >> temp; | 66 | ctcpStream >> temp; |
61 | m_ctcpCommand = temp.upper().right(temp.length()-1); | 67 | m_ctcpCommand = temp.upper().right(temp.length()-1); |
62 | m_parameters.clear(); | 68 | m_parameters.clear(); |
63 | int length = m_allParameters.length() - m_ctcpCommand.length() - 1; | 69 | int length = m_allParameters.length() - m_ctcpCommand.length() - 1; |
64 | if (m_command == "PRIVMSG") | 70 | length -= m_ctcpDestination.length() + 1; |
65 | length -= m_ctcpDestination.length() + 1; | ||
66 | if (length <= 0) { | 71 | if (length <= 0) { |
67 | m_allParameters = ""; | 72 | m_allParameters = ""; |
68 | } else { | 73 | } |
74 | else { | ||
69 | m_allParameters = m_allParameters.right(length); | 75 | m_allParameters = m_allParameters.right(length); |
70 | m_parameters << m_allParameters; | 76 | m_parameters << m_allParameters; |
71 | } | 77 | } |
72 | } else { | 78 | } |
79 | else { | ||
73 | m_ctcp = FALSE; | 80 | m_ctcp = FALSE; |
74 | } | 81 | } |
75 | 82 | ||
76 | 83 | ||
77 | odebug << "Parsed: " << line << oendl; | 84 | odebug << "Parsed: " << line << oendl; |
78 | odebug << "Prefix: " << m_prefix << oendl; | 85 | odebug << "Prefix: " << m_prefix << oendl; |
79 | odebug << "Command: " << m_command << oendl; | 86 | odebug << "Command: " << m_command << oendl; |
80 | odebug << "Allparameters: " << m_allParameters << oendl; | 87 | odebug << "Allparameters: " << m_allParameters << oendl; |
81 | for (unsigned int i=0; i<m_parameters.count(); i++) { | 88 | for (unsigned int i=0; i<m_parameters.count(); i++) { |
82 | odebug << "Parameter " << i << ":" << m_parameters[i] << oendl; | 89 | odebug << "Parameter " << i << ":" << m_parameters[i] << oendl; |
83 | } | 90 | } |
84 | odebug << "CTCP Command: " << m_ctcpCommand << oendl; | 91 | odebug << "CTCP Command: " << m_ctcpCommand << oendl; |
@@ -135,20 +142,28 @@ QString IRCMessage::ctcpDestination() { | |||
135 | unsigned short IRCMessage::commandNumber() { | 142 | unsigned short IRCMessage::commandNumber() { |
136 | return m_commandNumber; | 143 | return m_commandNumber; |
137 | } | 144 | } |
138 | 145 | ||
139 | bool IRCMessage::isNumerical() { | 146 | bool IRCMessage::isNumerical() { |
140 | return m_isNumerical; | 147 | return m_isNumerical; |
141 | } | 148 | } |
142 | 149 | ||
143 | bool IRCMessage::isCTCP() { | 150 | bool IRCMessage::isCTCP() { |
144 | return m_ctcp; | 151 | return m_ctcp; |
145 | } | 152 | } |
146 | 153 | ||
154 | bool IRCMessage::isCTCPRequest() { | ||
155 | return m_ctcpRequest; | ||
156 | } | ||
157 | |||
158 | bool IRCMessage::isCTCPReply() { | ||
159 | return !m_ctcpRequest; | ||
160 | } | ||
161 | |||
147 | QString IRCMessage::trailing() { | 162 | QString IRCMessage::trailing() { |
148 | return m_trailing; | 163 | return m_trailing; |
149 | } | 164 | } |
150 | 165 | ||
151 | QString IRCMessage::allParameters() { | 166 | QString IRCMessage::allParameters() { |
152 | return m_allParameters; | 167 | return m_allParameters; |
153 | } | 168 | } |
154 | 169 | ||