/***************************************************************************
- * Copyright (C) 2005/06 by The Quassel Team *
+ * Copyright (C) 2005-07 by The Quassel Team *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
ctcpMDequoteHash[MQUOTE + 'n'] = QString('\n');
ctcpMDequoteHash[MQUOTE + 'r'] = QString('\r');
ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
+
+ XDELIM = QString('\001');
+ QString XQUOTE = QString('\134');
+ ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
+ ctcpXDelimDequoteHash[XQUOTE + QString('a')] = XDELIM;
}
Server::~Server() {
return;
}
// OK, first we split the raw message into its various parts...
- QString prefix;
+ QString prefix = "";
QString cmd;
QStringList params;
QString Server::ctcpDequote(QString message) {
QString dequotedMessage;
QString messagepart;
- int offset;
-
+ QHash<QString, QString>::iterator ctcpquote;
+
// copy dequote Message
for(int i = 0; i < message.size(); i++) {
messagepart = message[i];
- offset = 0;
if(i+1 < message.size()) {
- for(QHash<QString, QString>::iterator ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) {
+ for(ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) {
if(message.mid(i,2) == ctcpquote.key()) {
dequotedMessage += ctcpquote.value();
- offset = 1;
+ i++;
+ break;
}
}
}
dequotedMessage += messagepart;
- i += offset;
}
return dequotedMessage;
}
+
QString Server::ctcpXdelimDequote(QString message) {
QString dequotedMessage;
QString messagepart;
- QString XQUOTE = QString('\134');
- QString XQUOTEQUOTED = XQUOTE + QString('\134');
- QString XDELIM = QString('\001');
- QString XDELIMQUOTED = XQUOTE + QString('a');
-
+ QHash<QString, QString>::iterator xdelimquote;
+
for(int i = 0; i < message.size(); i++) {
messagepart = message[i];
if(i+1 < message.size()) {
- if(message.mid(i,2) == XQUOTEQUOTED) {
- messagepart = XQUOTE;
- i++;
- } else if(message.mid(i,2) == XDELIMQUOTED) {
- messagepart = XDELIM;
- i++;
+ for(xdelimquote = ctcpXDelimDequoteHash.begin(); xdelimquote != ctcpXDelimDequoteHash.end(); ++xdelimquote) {
+ if(message.mid(i,2) == xdelimquote.key()) {
+ messagepart = xdelimquote.value();
+ i++;
+ break;
+ }
}
}
dequotedMessage += messagepart;
QString dequotedMessage = ctcpDequote(message);
// extract tagged / extended data
- QString XDELIM = QString('\001');
while(dequotedMessage.contains(XDELIM)) {
messages << dequotedMessage.section(XDELIM,0,0);
- ctcp = dequotedMessage.section(XDELIM,1,1);
+ ctcp = ctcpXdelimDequote(dequotedMessage.section(XDELIM,1,1));
dequotedMessage = dequotedMessage.section(XDELIM,2,2);
//dispatch the ctcp command
QString ctcpcmd = ctcp.section(' ', 0, 0);
QString ctcpparam = ctcp.section(' ', 1);
- // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
QString hname = ctcpcmd.toLower();
hname[0] = hname[0].toUpper();
hname = "handleCtcp" + hname;
// Ok. Default handler it is.
defaultCtcpHandler(ctcptype, prefix, ctcpcmd, target, ctcpparam);
}
-
-
}
if(!dequotedMessage.isEmpty()) {
messages << dequotedMessage;
}
return messages;
-
+}
+
+QString Server::ctcpPack(QString ctcpTag, QString message) {
+ return XDELIM + ctcpTag + ' ' + message + XDELIM;
+}
+
+void Server::ctcpQuery(QString bufname, QString ctcpTag, QString message) {
+ QStringList params;
+ params << bufname << ctcpPack(ctcpTag, message);
+ putCmd("PRIVMSG", params);
+}
+
+void Server::ctcpReply(QString bufname, QString ctcpTag, QString message) {
+ QStringList params;
+ params << bufname << ctcpPack(ctcpTag, message);
+ putCmd("NOTICE", params);
}
/**********************************************************************************/
}
}
+void Server::handleUserMe(QString bufname, QString msg) {
+ if(bufname.isEmpty()) return; // server buffer
+ ctcpQuery(bufname, "ACTION", msg);
+ emit displayMsg(Message::Action, bufname, msg, ownNick);
+}
+
void Server::handleUserTopic(QString bufname, QString msg) {
if(bufname.isEmpty()) return;
QStringList params;
QString nick = updateNickFromMask(prefix);
Q_ASSERT(nicks.contains(nick));
VarMap chans = nicks[nick]["Channels"].toMap();
+ QString msg;
+ if(params.count()) msg = params[0];
foreach(QString c, chans.keys()) {
- emit displayMsg(Message::Quit, c, params[0], prefix);
+ emit displayMsg(Message::Quit, c, msg, prefix);
}
nicks.remove(nick);
emit nickRemoved(network, nick);
/* RPL_ISUPPORT */
// TODO Complete 005 handling, also use sensible defaults for non-sent stuff
void Server::handleServer005(QString prefix, QStringList params) {
+ //qDebug() << prefix << params;
params.removeLast();
foreach(QString p, params) {
QString key = p.section("=", 0, 0);
// CTCP HANDLER
void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target, QString param) {
- emit displayMsg(Message::Action, target, param, userFromMask(prefix));
+ emit displayMsg(Message::Action, target, param, prefix);
+}
+
+void Server::handleCtcpPing(CtcpType ctcptype, QString prefix, QString target, QString param) {
+ if(ctcptype == CtcpQuery) {
+ ctcpReply(nickFromMask(prefix), "PING", param);
+ emit displayMsg(Message::Server, "", tr("Received CTCP PING request by %1").arg(prefix));
+ } else {
+ // display ping answer
+ }
+}
+
+void Server::handleCtcpVersion(CtcpType ctcptype, QString prefix, QString target, QString param) {
+ if(ctcptype == CtcpQuery) {
+ // FIXME use real Info about quassel :)
+ ctcpReply(nickFromMask(prefix), "VERSION", QString("Quassel:pre Release:*nix"));
+ emit displayMsg(Message::Server, "", tr("Received CTCP VERSION request by %1").arg(prefix));
+ } else {
+ // TODO display Version answer
+ }
}
void Server::defaultCtcpHandler(CtcpType ctcptype, QString prefix, QString cmd, QString target, QString param) {
- emit displayMsg(Message::Error, "", QString("Unknown CTCP: ") + cmd + (" ") + param, prefix);
+ emit displayMsg(Message::Error, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix));
}