X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=0499c85901e76e8e152bc04fb35ea9e62d2dc22d;hp=53f6846bb7a2d00e02a1a807032c67ca0f1ccd97;hb=dcba0652ac1275877b98b06d6482924ee6df0cd1;hpb=c6df551bf5d6b2f33daa5235d320239fcca37688 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 53f6846b..0499c859 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,8 +21,10 @@ #include "util.h" -#include "server.h" -#include "networkinfo.h" +#include "coresession.h" +#include "networkconnection.h" +#include "network.h" +#include "identity.h" #include "ctcphandler.h" #include "ircuser.h" @@ -30,44 +32,16 @@ #include -IrcServerHandler::IrcServerHandler(Server *parent) - : BasicHandler(parent), server(parent) { +IrcServerHandler::IrcServerHandler(NetworkConnection *parent) + : BasicHandler(parent), + _whois(false) +{ } IrcServerHandler::~IrcServerHandler() { } -QString IrcServerHandler::serverDecode(const QByteArray &string) { - return server->serverDecode(string); -} - -QStringList IrcServerHandler::serverDecode(const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << server->serverDecode(s); - return list; -} - -QString IrcServerHandler::bufferDecode(const QString &bufferName, const QByteArray &string) { - return server->bufferDecode(bufferName, string); -} - -QStringList IrcServerHandler::bufferDecode(const QString &bufferName, const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << server->bufferDecode(bufferName, s); - return list; -} - -QString IrcServerHandler::userDecode(const QString &userNick, const QByteArray &string) { - return server->userDecode(userNick, string); -} - -QStringList IrcServerHandler::userDecode(const QString &userNick, const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << server->userDecode(userNick, s); - return list; -} - /*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */ void IrcServerHandler::handleServerMsg(QByteArray msg) { try { @@ -126,12 +100,12 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList, params)); //handle(cmd, Q_ARG(QString, prefix)); } catch(Exception e) { - emit displayMsg(Message::Error, "", e.msg()); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", e.msg()); } } -void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList rawparams) { +void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList &rawparams) { // we assume that all this happens in server encoding QStringList params; foreach(QByteArray r, rawparams) params << serverDecode(r); @@ -142,26 +116,31 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList params) { +void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { Q_ASSERT(params.count() == 1); QString channel = serverDecode(params[0]); - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); - emit displayMsg(Message::Join, channel, channel, prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); + emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix); //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); + if(network()->isMe(ircuser)) network()->addPersistentChannel(channel, networkConnection()->channelKey(channel)); } -void IrcServerHandler::handleKick(QString prefix, QList params) { - networkInfo()->updateNickFromMask(prefix); - IrcUser *victim = networkInfo()->ircUser(serverDecode(params[1])); +void IrcServerHandler::handleKick(const QString &prefix, const QList ¶ms) { + network()->updateNickFromMask(prefix); + IrcUser *victim = network()->ircUser(params[1]); QString channel = serverDecode(params[0]); Q_ASSERT(victim); @@ -201,29 +181,30 @@ void IrcServerHandler::handleKick(QString prefix, QList params) { QString msg; if(params.count() > 2) // someone got a reason! - msg = QString("%1 %2").arg(victim->nick()).arg(bufferDecode(channel, params[2])); + msg = QString("%1 %2").arg(victim->nick()).arg(channelDecode(channel, params[2])); else msg = victim->nick(); - emit displayMsg(Message::Kick, channel, msg, prefix); + emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); + //if(network()->isMe(victim)) networkConnection()->setKickedFromChannel(channel); } -void IrcServerHandler::handleMode(QString prefix, QList params) { +void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { if(params.count() < 2) { - emit displayMsg(Message::Error, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); return; } - if(networkInfo()->isChannelName(params[0])) { + if(network()->isChannelName(serverDecode(params[0]))) { // Channel Modes - emit displayMsg(Message::Mode, serverDecode(params[0]), serverDecode(params).join(" "), prefix); + emit displayMsg(Message::Mode, BufferInfo::ChannelBuffer, serverDecode(params[0]), serverDecode(params).join(" "), prefix); - IrcChannel *channel = networkInfo()->ircChannel(params.takeFirst()); + IrcChannel *channel = network()->ircChannel(params[0]); // FIXME: currently the IrcChannels only support PREFIX-Modes for users // This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore - QString modes = params.takeFirst(); + QString modes = params[1]; bool add = true; - int modeIndex = 0; + int modeIndex = 2; for(int c = 0; c < modes.length(); c++) { if(modes[c] == '+') { add = true; @@ -235,8 +216,8 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { } // this is the part where we restrict the mode changes to PREFIXES: - if(networkInfo()->prefixModes().contains(modes[c]) && modeIndex < params.count()) { - IrcUser *ircUser = networkInfo()->ircUser(params[modeIndex]); + if(network()->prefixModes().contains(modes[c]) && modeIndex < params.count()) { + IrcUser *ircUser = network()->ircUser(params[modeIndex]); if(add) channel->addUserMode(ircUser, QString(modes[c])); else @@ -247,35 +228,46 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { } else { // pure User Modes - emit displayMsg(Message::Mode, "", serverDecode(params).join(" "), prefix); + // FIXME: redirect + emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix); } } -void IrcServerHandler::handleNick(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); +void IrcServerHandler::handleNick(const QString &prefix, const QList ¶ms) { + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); QString newnick = serverDecode(params[0]); QString oldnick = ircuser->nick(); - foreach(QString channel, ircuser->channels()) { - if(networkInfo()->isMyNick(oldnick)) { - emit displayMsg(Message::Nick, channel, newnick, newnick); - } else { - emit displayMsg(Message::Nick, channel, newnick, prefix); - } - } + QString sender = network()->isMyNick(oldnick) + ? newnick + : prefix; + + + emit nickChanged(newnick, oldnick); + foreach(QString channel, ircuser->channels()) + emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender); + ircuser->setNick(newnick); } -void IrcServerHandler::handleNotice(QString prefix, QList params) { - if(networkInfo()->currentServer().isEmpty() || networkInfo()->currentServer() == prefix) - emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix); - else - emit displayMsg(Message::Notice, "", userDecode(prefix, params[1]), prefix); +void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { + if(params.count() < 2) { + qWarning() << "IrcServerHandler::handleNotice(): not enough Parameters:" << prefix << serverDecode(params); + return; + } + + QString target = serverDecode(params[0]); + if(prefix.isEmpty() || target == "AUTH") + target = ""; + else if(!network()->isChannelName(target)) + target = nickFromMask(prefix); + + networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]); } -void IrcServerHandler::handlePart(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); +void IrcServerHandler::handlePart(const QString &prefix, const QList ¶ms) { + IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); Q_ASSERT(ircuser); @@ -285,199 +277,362 @@ void IrcServerHandler::handlePart(QString prefix, QList params) { if(params.count() > 1) msg = userDecode(ircuser->nick(), params[1]); - emit displayMsg(Message::Part, channel, msg, prefix); + emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); + if(network()->isMe(ircuser)) network()->removePersistentChannel(channel); } -void IrcServerHandler::handlePing(QString prefix, QList params) { +void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); - emit putCmd("PONG", serverDecode(params)); + putCmd("PONG", params); } -void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); +void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList ¶ms) { + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); - if(params.count() < 2) - params << QByteArray(""); + if(params.isEmpty()) { + qWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix; + return; + } + QString target = serverDecode(params[0]); - // are we the target or is it a channel? - if(networkInfo()->isMyNick(target)) { - // it's possible to pack multiple privmsgs into one param using ctcp - QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1])); - foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg); - } - } - } else { - Q_ASSERT(isChannelName(target)); // should be channel! - QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); - foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, target, message, prefix); - } - } - } + QByteArray msg = params.count() < 2 + ? QByteArray("") + : params[1]; + // are we the target? + if(network()->isMyNick(target)) + target = nickFromMask(ircuser->nick()); + + // it's possible to pack multiple privmsgs into one param using ctcp + // - > we let the ctcpHandler do the work + networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); } -void IrcServerHandler::handleQuit(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); - Q_ASSERT(ircuser); +void IrcServerHandler::handleQuit(const QString &prefix, const QList ¶ms) { + IrcUser *ircuser = network()->updateNickFromMask(prefix); + if(!ircuser) return; QString msg; if(params.count()) msg = userDecode(ircuser->nick(), params[0]); foreach(QString channel, ircuser->channels()) - emit displayMsg(Message::Quit, channel, msg, prefix); + emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix); - networkInfo()->removeIrcUser(nickFromMask(prefix)); + network()->removeIrcUser(nickFromMask(prefix)); } -void IrcServerHandler::handleTopic(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); +void IrcServerHandler::handleTopic(const QString &prefix, const QList ¶ms) { + IrcUser *ircuser = network()->updateNickFromMask(prefix); + if(!ircuser) return; QString channel = serverDecode(params[0]); - QString topic = bufferDecode(channel, params[1]); - Q_ASSERT(ircuser); + QString topic; + if(params.count() >= 2) topic = channelDecode(channel, params[1]); - networkInfo()->ircChannel(channel)->setTopic(topic); + network()->ircChannel(channel)->setTopic(topic); - emit displayMsg(Message::Server, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic)); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic)); } /* RPL_WELCOME */ -void IrcServerHandler::handle001(QString prefix, QList params) { +void IrcServerHandler::handle001(const QString &prefix, const QList ¶ms) { // there should be only one param: "Welcome to the Internet Relay Network !@" QString param = serverDecode(params[0]); QString myhostmask = param.section(' ', -1, -1); - networkInfo()->setCurrentServer(prefix); - networkInfo()->setMyNick(nickFromMask(myhostmask)); + network()->setCurrentServer(prefix); + network()->setMyNick(nickFromMask(myhostmask)); - emit displayMsg(Message::Server, "", param, prefix); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix); } /* RPL_ISUPPORT */ // TODO Complete 005 handling, also use sensible defaults for non-sent stuff -void IrcServerHandler::handle005(QString prefix, QList params) { - Q_UNUSED(prefix) - QString rpl_isupport_suffix = serverDecode(params.takeLast()); - if(rpl_isupport_suffix.toLower() != QString("are supported by this server")) { +void IrcServerHandler::handle005(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + const int numParams = params.size(); + if(numParams < 1) { + qWarning() << "IrcServerHandler::handle005(): received RPL_ISUPPORT (005) with too few parameters:" << serverDecode(params); + return; + } + + QString rpl_isupport_suffix = serverDecode(params.last()); + if(!rpl_isupport_suffix.toLower().contains("supported")) { qWarning() << "Received invalid RPL_ISUPPORT! Suffix is:" << rpl_isupport_suffix << "Excpected: are supported by this server"; return; } - - foreach(QString param, serverDecode(params)) { - QString key = param.section("=", 0, 0); - QString value = param.section("=", 1); - networkInfo()->addSupport(key, value); + + QString rawSupport; + QString key, value; + for(int i = 0; i < numParams - 1; i++) { + QString rawSupport = serverDecode(params[i]); + QString key = rawSupport.section("=", 0, 0); + QString value = rawSupport.section("=", 1); + network()->addSupport(key, value); } } +/* +WHOIS-Message: + Replies 311 - 313, 317 - 319 are all replies generated in response to a WHOIS message. + and 301 (RPL_AWAY) + " :" +WHO-Message: + Replies 352 and 315 paired are used to answer a WHO message. + +WHOWAS-Message: + Replies 314 and 369 are responses to a WHOWAS message. + +*/ + + +/* RPL_AWAY - " :" */ +void IrcServerHandler::handle301(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + QString nickName = serverDecode(params[0]); + QString awayMessage = userDecode(nickName, params.last()); + + IrcUser *ircuser = network()->ircUser(nickName); + if(ircuser) { + ircuser->setAwayMessage(awayMessage); + ircuser->setAway(true); + } + + // FIXME: proper redirection needed + if(_whois) { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } else { + if(ircuser) { + int now = QDateTime::currentDateTime().toTime_t(); + int silenceTime = 60; + if(ircuser->lastAwayMessage() + silenceTime < now) { + emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } + ircuser->setLastAwayMessage(now); + } else { + // probably should not happen + emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } + } +} + +/* RPL_WHOISUSER - " * :" */ +void IrcServerHandler::handle311(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + _whois = true; + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setUser(serverDecode(params[1])); + ircuser->setHost(serverDecode(params[2])); + ircuser->setRealName(serverDecode(params.last())); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1") .arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOISSERVER - " :" */ +void IrcServerHandler::handle312(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setServer(serverDecode(params[1])); + } + if(_whois) { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + } +} + +/* RPL_WHOISOPERATOR - " :is an IRC operator" */ +void IrcServerHandler::handle313(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setIrcOperator(params.last()); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOWASUSER - " * :" */ +void IrcServerHandler::handle314(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_ENDOFWHO: " :End of WHO list" */ +void IrcServerHandler::handle315(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + // FIXME temporarily made silent + Q_UNUSED(params) + // emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOISIDLE - " :seconds idle" + (real life: " :seconds idle, signon time) */ + //TODO: parse real life message +void IrcServerHandler::handle317(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + QString nick = serverDecode(params[0]); + IrcUser *ircuser = network()->ircUser(nick); + if(ircuser) { + QDateTime now = QDateTime::currentDateTime(); + int idleSecs = serverDecode(params[1]).toInt(); + idleSecs *= -1; + ircuser->setIdleTime(now.addSecs(idleSecs)); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now))); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(userDecode(nick, params).join(" "))); + } +} + +/* RPL_ENDOFWHOIS - " :End of WHOIS list" */ +void IrcServerHandler::handle318(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + _whois = false; + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOISCHANNELS - " :*( ( "@" / "+" ) " " )" */ +void IrcServerHandler::handle319(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + /* RPL_NOTOPIC */ -void IrcServerHandler::handle331(QString prefix, QList params) { +void IrcServerHandler::handle331(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); - networkInfo()->ircChannel(channel)->setTopic(QString()); - emit displayMsg(Message::Server, channel, tr("No topic is set for %1.").arg(channel)); + network()->ircChannel(channel)->setTopic(QString()); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel)); } /* RPL_TOPIC */ -void IrcServerHandler::handle332(QString prefix, QList params) { +void IrcServerHandler::handle332(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); - QString topic = bufferDecode(channel, params[1]); - networkInfo()->ircChannel(channel)->setTopic(topic); - emit displayMsg(Message::Server, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic)); + QString topic = channelDecode(channel, params[1]); + network()->ircChannel(channel)->setTopic(topic); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic)); } /* Topic set by... */ -void IrcServerHandler::handle333(QString prefix, QList params) { +void IrcServerHandler::handle333(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); - emit displayMsg(Message::Server, channel, tr("Topic set by %1 on %2") - .arg(bufferDecode(channel, params[1]), QDateTime::fromTime_t(bufferDecode(channel, params[2]).toUInt()).toString())); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, + tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString())); } -/* RPL_NAMREPLY */ -void IrcServerHandler::handle353(QString prefix, QList params) { +/* RPL_WHOREPLY: " + ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ +void IrcServerHandler::handle352(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) - params.removeFirst(); // either "=", "*" or "@" indicating a public, private or secret channel - QString channelname = serverDecode(params.takeFirst()); + QString channel = serverDecode(params[0]); + IrcUser *ircuser = network()->ircUser(serverDecode(params[4])); + if(ircuser) { + ircuser->setUser(serverDecode(params[1])); + ircuser->setHost(serverDecode(params[2])); + + bool away = serverDecode(params[5]).startsWith("G") ? true : false; + ircuser->setAway(away); + ircuser->setServer(serverDecode(params[3])); + ircuser->setRealName(serverDecode(params.last()).section(" ", 1)); + } - foreach(QString nick, serverDecode(params.takeFirst()).split(' ')) { + // FIXME temporarily made silent + //emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_NAMREPLY */ +void IrcServerHandler::handle353(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + const int numParams = params.count(); + if(numParams < 2) { + qWarning() << "IrcServerHandler::handler353() received not enough params:" << serverDecode(params); + return; + } + + // param[0] is either "=", "*" or "@" indicating a public, private or secret channel + // we don't use this information at the time beeing + QString channelname = serverDecode(params[1]); + + foreach(QString nick, serverDecode(params[2]).split(' ')) { QString mode = QString(); - if(networkInfo()->prefixes().contains(nick[0])) { - mode = networkInfo()->prefixToMode(nick[0]); + if(network()->prefixes().contains(nick[0])) { + mode = network()->prefixToMode(nick[0]); nick = nick.mid(1); } - IrcUser *ircuser = networkInfo()->newIrcUser(nick); + IrcUser *ircuser = network()->newIrcUser(nick); ircuser->joinChannel(channelname); if(!mode.isNull()) - networkInfo()->ircChannel(channelname)->addUserMode(ircuser, mode); + network()->ircChannel(channelname)->addUserMode(ircuser, mode); } } -/* ERR_ERRONEUSNICKNAME */ -void IrcServerHandler::handle432(QString prefix, QList params) { +/* RPL_ENDOFWHOWAS - " :End of WHOWAS" */ +void IrcServerHandler::handle369(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) - Q_UNUSED(params) - emit displayMsg(Message::Error, "", tr("Your desired nickname contains illegal characters!")); - emit displayMsg(Message::Error, "", tr("Please use /nick to continue your IRC-Session!")); - // FIXME! - -// if(params.size() < 2) { -// // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase: -// // nick @@@ -// // :irc.scortum.moep.net 432 @@@ :Erroneous Nickname: Illegal characters -// // correct server reply: -// // :irc.scortum.moep.net 432 * @@@ :Erroneous Nickname: Illegal characters -// emit displayMsg(Message::Error, "", tr("There is a nickname in your identity's nicklist which contains illegal characters")); -// emit displayMsg(Message::Error, "", tr("Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're unable to determine the erroneous nick")); -// emit displayMsg(Message::Error, "", tr("Please use: /nick to continue or clean up your nicklist")); -// } else { -// QString errnick = params[0]; -// emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").arg(errnick)); -// // if there is a problem while connecting to the server -> we handle it -// // TODO rely on another source... -// if(currentServer.isEmpty()) { -// QStringList desiredNicks = identity["NickList"].toStringList(); -// int nextNick = desiredNicks.indexOf(errnick) + 1; -// if (desiredNicks.size() > nextNick) { -// putCmd("NICK", QStringList(desiredNicks[nextNick])); -// } else { -// emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); -// } -// } -// } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); +} + +/* ERR_ERRONEUSNICKNAME */ +void IrcServerHandler::handle432(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + + if(params.size() < 2) { + // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase: + // nick @@@ + // :irc.scortum.moep.net 432 @@@ :Erroneous Nickname: Illegal characters + // correct server reply: + // :irc.scortum.moep.net 432 * @@@ :Erroneous Nickname: Illegal characters + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("There is a nickname in your identity's nicklist which contains illegal characters")); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're unable to determine the erroneous nick")); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Please use: /nick to continue or clean up your nicklist")); + } else { + QString errnick = params[0]; + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick)); + tryNextNick(errnick); + } } /* ERR_NICKNAMEINUSE */ -void IrcServerHandler::handle433(QString prefix, QList params) { - Q_UNUSED(prefix) +void IrcServerHandler::handle433(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + QString errnick = serverDecode(params[0]); - emit displayMsg(Message::Error, "", tr("Nick %1 is already taken").arg(errnick)); - emit displayMsg(Message::Error, "", tr("Please use /nick to continue your IRC-Session!")); - // FIXME! - -// // if there is a problem while connecting to the server -> we handle it -// // TODO rely on another source... -// if(currentServer.isEmpty()) { -// QStringList desiredNicks = identity["NickList"].toStringList(); -// int nextNick = desiredNicks.indexOf(errnick) + 1; -// if (desiredNicks.size() > nextNick) { -// putCmd("NICK", QStringList(desiredNicks[nextNick])); -// } else { -// emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); -// } -// } + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick already in use: %1").arg(errnick)); + + // if there is a problem while connecting to the server -> we handle it + // but only if our connection has not been finished yet... + if(!network()->currentServer().isEmpty()) + return; + + tryNextNick(errnick); } +/* */ + +// FIXME networkConnection()->setChannelKey("") for all ERR replies indicating that a JOIN went wrong +// mostly, these are codes in the 47x range + +/* */ + +void IrcServerHandler::tryNextNick(const QString &errnick) { + QStringList desiredNicks = networkConnection()->coreSession()->identity(network()->identity())->nicks(); + int nextNick = desiredNicks.indexOf(errnick) + 1; + if(desiredNicks.size() > nextNick) { + putCmd("NICK", serverEncode(desiredNicks[nextNick])); + } else { + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); + } +} + + /***********************************************************************************/