summaryrefslogtreecommitdiff
authorskyhusker <skyhusker>2005-01-23 23:02:00 (UTC)
committer skyhusker <skyhusker>2005-01-23 23:02:00 (UTC)
commit42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc (patch) (side-by-side diff)
tree6536ec388af2314ecfaecdeb923b4c2e76b0de29
parent2074382fccea58a55b68c51815abc5df463473aa (diff)
downloadopie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.zip
opie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.tar.gz
opie-42df856b4e4741cf5ebdd267cf370e5a9eaf3dbc.tar.bz2
Added distinction between CTCP requests and CTCP replies
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
@@ -53,22 +53,29 @@ IRCMessage::IRCMessage(QString line) {
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;
}
@@ -145,4 +152,12 @@ bool IRCMessage::isCTCP() {
}
+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
@@ -39,4 +39,6 @@ public:
/* CHeck if this IRCMessage is a CTCP message */
bool isCTCP();
+ bool isCTCPRequest();
+ bool isCTCPReply();
/* Return the IRC command (literal commands) */
QString command();
@@ -66,4 +68,5 @@ protected:
bool m_isNumerical;
bool m_ctcp;
+ bool m_ctcpRequest;
};