X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fserver.cpp;h=e5ed4eb33f32638588c4221da2264049416ad32a;hp=df7b576b371c49010cb7e57ae6507d52ba1cf4b6;hb=26586e615ffe42bb2b1b307ed1324a6e3051f5da;hpb=b10bb4b6768536f34fd5e7b00cb8755279af135d diff --git a/core/server.cpp b/core/server.cpp index df7b576b..e5ed4eb3 100644 --- a/core/server.cpp +++ b/core/server.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -26,9 +26,17 @@ #include #include -Server::Server(QString net) : network(net) { - +Server::Server(UserId uid, QString net) : user(uid), network(net) { + QString MQUOTE = QString('\020'); + ctcpMDequoteHash[MQUOTE + '0'] = QString('\000'); + 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() { @@ -59,8 +67,8 @@ void Server::sendState() { void Server::connectToIrc(QString net) { if(net != network) return; // not me! - networkSettings = global->getData("Networks").toMap()[net].toMap(); - identity = global->getData("Identities").toMap()[networkSettings["Identity"].toString()].toMap(); + networkSettings = Global::data(user, "Networks").toMap()[net].toMap(); + identity = Global::data(user, "Identities").toMap()[networkSettings["Identity"].toString()].toMap(); QList servers = networkSettings["Servers"].toList(); QString host = servers[0].toMap()["Address"].toString(); quint16 port = servers[0].toMap()["Port"].toUInt(); @@ -159,7 +167,7 @@ void Server::handleServerMsg(QString msg) { return; } // OK, first we split the raw message into its various parts... - QString prefix; + QString prefix = ""; QString cmd; QStringList params; @@ -293,6 +301,96 @@ QStringList Server::providesUserHandlers() { return userHandlers; } +QString Server::ctcpDequote(QString message) { + QString dequotedMessage; + QString messagepart; + QHash::iterator ctcpquote; + + // copy dequote Message + for(int i = 0; i < message.size(); i++) { + messagepart = message[i]; + if(i+1 < message.size()) { + for(ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) { + if(message.mid(i,2) == ctcpquote.key()) { + dequotedMessage += ctcpquote.value(); + i++; + break; + } + } + } + dequotedMessage += messagepart; + } + return dequotedMessage; +} + + +QString Server::ctcpXdelimDequote(QString message) { + QString dequotedMessage; + QString messagepart; + QHash::iterator xdelimquote; + + for(int i = 0; i < message.size(); i++) { + messagepart = message[i]; + if(i+1 < message.size()) { + for(xdelimquote = ctcpXDelimDequoteHash.begin(); xdelimquote != ctcpXDelimDequoteHash.end(); ++xdelimquote) { + if(message.mid(i,2) == xdelimquote.key()) { + messagepart = xdelimquote.value(); + i++; + break; + } + } + } + dequotedMessage += messagepart; + } + return dequotedMessage; +} + +QStringList Server::parseCtcp(CtcpType ctcptype, QString prefix, QString target, QString message) { + QStringList messages; + QString ctcp; + + //lowlevel message dequote + QString dequotedMessage = ctcpDequote(message); + + // extract tagged / extended data + while(dequotedMessage.contains(XDELIM)) { + messages << dequotedMessage.section(XDELIM,0,0); + 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); + + QString hname = ctcpcmd.toLower(); + hname[0] = hname[0].toUpper(); + hname = "handleCtcp" + hname; + if(!QMetaObject::invokeMethod(this, hname.toAscii(), Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam))) { + // 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); +} /**********************************************************************************/ @@ -402,6 +500,12 @@ void Server::handleUserSay(QString bufname, QString msg) { } } +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; @@ -568,11 +672,23 @@ void Server::handleServerPrivmsg(QString prefix, QStringList params) { Q_ASSERT(params.count() >= 2); if(params.count()<2) emit displayMsg(Message::Plain, params[0], "", prefix); else { - if(params[0] == ownNick) { - emit displayMsg(Message::Plain, "", params[1], prefix, Message::PrivMsg); + // it's possible to pack multiple privmsgs into one param using ctcp + QStringList messages = parseCtcp(Server::CtcpQuery, prefix, params[0], params[1]); + if(params[0].toLower() == ownNick.toLower()) { // Freenode sends nickname in lower case! + foreach(QString message, messages) { + if(!message.isEmpty()) { + emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg); + } + } + } else { + //qDebug() << prefix << params; Q_ASSERT(isChannelName(params[0])); // should be channel! - emit displayMsg(Message::Plain, params[0], params[1], prefix); + foreach(QString message, messages) { + if(!message.isEmpty()) { + emit displayMsg(Message::Plain, params[0], message, prefix); + } + } } } } @@ -581,8 +697,10 @@ void Server::handleServerQuit(QString prefix, 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); @@ -620,6 +738,7 @@ void Server::handleServer001(QString prefix, QStringList params) { /* 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); @@ -741,6 +860,38 @@ void Server::handleServer433(QString prefix, QStringList params) { } } +/***********************************************************************************/ +// CTCP HANDLER + +void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target, QString param) { + 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")); + ctcpReply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (Pre-Release) - http://www.quassel-irc.org")); + 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, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix)); +} + + /***********************************************************************************/ /* Exception classes for message handling */