summaryrefslogtreecommitdiff
authorskyhusker <skyhusker>2005-06-09 20:06:01 (UTC)
committer skyhusker <skyhusker>2005-06-09 20:06:01 (UTC)
commitccc819750468aa161255e863dac4d2ca55ace253 (patch) (side-by-side diff)
treedcd5f82590f051fe6c6efc6380cc4fc603bb1ae9
parent5173a392a1422add3e3ae2a38d6bd4eb5df3cf87 (diff)
downloadopie-ccc819750468aa161255e863dac4d2ca55ace253.zip
opie-ccc819750468aa161255e863dac4d2ca55ace253.tar.gz
opie-ccc819750468aa161255e863dac4d2ca55ace253.tar.bz2
Fix #1665
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp
index da8db77..f4b09bc 100644
--- a/noncore/net/opieirc/ircmessage.cpp
+++ b/noncore/net/opieirc/ircmessage.cpp
@@ -18,49 +18,49 @@ using namespace Opie::Core;
IRCMessage::IRCMessage(QString line) {
/* Remove CRs from the message */
while((line.right(1) == "\n") || (line.right(1) == "\r"))
line = line.left(line.length() - 1);
QTextIStream stream(&line);
QString temp;
stream >> temp;
if (temp.startsWith(":")) {
/* extract the prefix */
m_prefix = temp.right(temp.length()-1);
stream >> temp;
m_command = temp.upper();
m_allParameters = line.right(line.length() - m_prefix.length() - m_command.length() - 3);
} else {
m_command = temp.upper();
m_allParameters = line.right(line.length() - m_command.length() - 1);
}
/* Create a list of all parameters */
while(!(stream.atEnd())) {
stream >> temp;
if (temp.startsWith(":")) {
/* last parameter */
- m_trailing = line.right(line.length() - line.find(QChar(':'), 1) - 1);
+ m_trailing = line.right(line.length() - line.find(" :") - 2);
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;
m_ctcpRequest = (m_command == "PRIVMSG");
/* Strip CTCP \001 characters */
m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), "");
QTextIStream ctcpStream(&m_allParameters);
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;
length -= m_ctcpDestination.length() + 1;