summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessage.cpp27
-rw-r--r--noncore/net/opieirc/ircmessage.h3
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
@@ -7,148 +7,163 @@ using namespace Opie::Core;
#include <qstring.h>
#include <qstringlist.h>
#include <qregexp.h>
#include "ircmessage.h"
/*
* Create a new IRCMessage by evaluating
* a received string
*/
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_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;
odebug << "CTCP Destination: " << m_ctcpDestination << oendl;
odebug << "CTCP param count is: " << m_parameters.count() << oendl;
}
QString IRCMessage::param(int param) {
return m_parameters[param];
}
QStringList IRCMessage::params(const QString &paramstring) const {
QStringList params, retvalue;
params = QStringList::split(',', paramstring);
QStringList::Iterator end = params.end();
for (QStringList::Iterator it = params.begin(); it != end; ++it) {
int pos = (*it).find(':');
if(pos < 0) {
if((*it).toUInt() < m_parameters.count())
retvalue << m_parameters[(*it).toUInt()];
}
else {
unsigned int start, end;
start = (*it).left(pos).toUInt();
end = (*it).mid(pos+1).toUInt();
for (unsigned int i=start;i<=end && i < m_parameters.count() ;++i) {
retvalue << m_parameters[i];
}
}
}
return retvalue;
}
QString IRCMessage::prefix() {
return m_prefix;
}
QString IRCMessage::command() {
return m_command;
}
QString IRCMessage::ctcpCommand() {
return m_ctcpCommand;
}
QString IRCMessage::ctcpDestination() {
return m_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
@@ -1,70 +1,73 @@
/*
OpieIRC - An embedded IRC client
Copyright (C) 2002 Wenzel Jakob
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __IRCMESSAGE_H
#define __IRCMESSAGE_H
class QString;
class QStringList;
/* IRCMessage objects are used to encapsulate information
which the IRC server sent to us. */
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();
/* Return one parameter */
QString param(int param);
/* Return some parameters */
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