X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=2f9c013d7946a6c2c0b58e743599d20eb7f16ff4;hp=53f6846bb7a2d00e02a1a807032c67ca0f1ccd97;hb=f6b8a17e16ab970860c6957745718ed9ce102274;hpb=c6df551bf5d6b2f33daa5235d320239fcca37688 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 53f6846b..2f9c013d 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,8 +32,9 @@ #include -IrcServerHandler::IrcServerHandler(Server *parent) - : BasicHandler(parent), server(parent) { +IrcServerHandler::IrcServerHandler(NetworkConnection *parent) + : BasicHandler(parent), + networkConnection(parent) { } IrcServerHandler::~IrcServerHandler() { @@ -39,32 +42,32 @@ IrcServerHandler::~IrcServerHandler() { } QString IrcServerHandler::serverDecode(const QByteArray &string) { - return server->serverDecode(string); + return networkConnection->serverDecode(string); } QStringList IrcServerHandler::serverDecode(const QList &stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << server->serverDecode(s); + foreach(QByteArray s, stringlist) list << networkConnection->serverDecode(s); return list; } QString IrcServerHandler::bufferDecode(const QString &bufferName, const QByteArray &string) { - return server->bufferDecode(bufferName, string); + return networkConnection->bufferDecode(bufferName, string); } QStringList IrcServerHandler::bufferDecode(const QString &bufferName, const QList &stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << server->bufferDecode(bufferName, s); + foreach(QByteArray s, stringlist) list << networkConnection->bufferDecode(bufferName, s); return list; } QString IrcServerHandler::userDecode(const QString &userNick, const QByteArray &string) { - return server->userDecode(userNick, string); + return networkConnection->userDecode(userNick, string); } QStringList IrcServerHandler::userDecode(const QString &userNick, const QList &stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << server->userDecode(userNick, s); + foreach(QByteArray s, stringlist) list << networkConnection->userDecode(userNick, s); return list; } @@ -185,15 +188,15 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList params) { Q_ASSERT(params.count() == 1); QString channel = serverDecode(params[0]); - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); emit displayMsg(Message::Join, channel, channel, prefix); //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); } void IrcServerHandler::handleKick(QString prefix, QList params) { - networkInfo()->updateNickFromMask(prefix); - IrcUser *victim = networkInfo()->ircUser(serverDecode(params[1])); + network()->updateNickFromMask(prefix); + IrcUser *victim = network()->ircUser(serverDecode(params[1])); QString channel = serverDecode(params[0]); Q_ASSERT(victim); @@ -214,11 +217,11 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { return; } - if(networkInfo()->isChannelName(params[0])) { + if(network()->isChannelName(params[0])) { // Channel Modes emit displayMsg(Message::Mode, serverDecode(params[0]), serverDecode(params).join(" "), prefix); - IrcChannel *channel = networkInfo()->ircChannel(params.takeFirst()); + IrcChannel *channel = network()->ircChannel(params.takeFirst()); // 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(); @@ -235,8 +238,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 @@ -252,13 +255,13 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { } void IrcServerHandler::handleNick(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + 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)) { + if(network()->isMyNick(oldnick)) { emit displayMsg(Message::Nick, channel, newnick, newnick); } else { emit displayMsg(Message::Nick, channel, newnick, prefix); @@ -268,14 +271,14 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { } void IrcServerHandler::handleNotice(QString prefix, QList params) { - if(networkInfo()->currentServer().isEmpty() || networkInfo()->currentServer() == prefix) + if(network()->currentServer().isEmpty() || network()->currentServer() == prefix) emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix); else emit displayMsg(Message::Notice, "", userDecode(prefix, params[1]), prefix); } void IrcServerHandler::handlePart(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); Q_ASSERT(ircuser); @@ -294,7 +297,7 @@ void IrcServerHandler::handlePing(QString prefix, QList params) { } void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); if(params.count() < 2) params << QByteArray(""); @@ -302,28 +305,37 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { QString target = serverDecode(params[0]); // are we the target or is it a channel? - if(networkInfo()->isMyNick(target)) { + if(network()->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])); + QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1])); + quint8 flags; foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg); - } + flags = Message::PrivMsg; + if(message.contains(network()->myNick())) + flags |= Message::Highlight; + emit displayMsg(Message::Plain, "", message, prefix, flags); } } else { - Q_ASSERT(isChannelName(target)); // should be channel! - QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); + // so it's probably a channel.. + if(!isChannelName(target)) { + qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!"; + return; + } + + QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); + quint8 flags; foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, target, message, prefix); - } + flags = Message::None; + if(message.contains(network()->myNick())) + flags |= Message::Highlight; + emit displayMsg(Message::Plain, target, message, prefix, flags); } } } void IrcServerHandler::handleQuit(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); QString msg; @@ -333,16 +345,16 @@ void IrcServerHandler::handleQuit(QString prefix, QList params) { foreach(QString channel, ircuser->channels()) emit displayMsg(Message::Quit, channel, msg, prefix); - networkInfo()->removeIrcUser(nickFromMask(prefix)); + network()->removeIrcUser(nickFromMask(prefix)); } void IrcServerHandler::handleTopic(QString prefix, QList params) { - IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); + IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); QString topic = bufferDecode(channel, params[1]); Q_ASSERT(ircuser); - 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)); } @@ -352,8 +364,8 @@ void IrcServerHandler::handle001(QString prefix, QList params) { // 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); } @@ -371,7 +383,7 @@ void IrcServerHandler::handle005(QString prefix, QList params) { foreach(QString param, serverDecode(params)) { QString key = param.section("=", 0, 0); QString value = param.section("=", 1); - networkInfo()->addSupport(key, value); + network()->addSupport(key, value); } } @@ -380,7 +392,7 @@ void IrcServerHandler::handle005(QString prefix, QList params) { void IrcServerHandler::handle331(QString prefix, QList params) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); - networkInfo()->ircChannel(channel)->setTopic(QString()); + network()->ircChannel(channel)->setTopic(QString()); emit displayMsg(Message::Server, channel, tr("No topic is set for %1.").arg(channel)); } @@ -389,7 +401,7 @@ void IrcServerHandler::handle332(QString prefix, QList params) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); QString topic = bufferDecode(channel, params[1]); - networkInfo()->ircChannel(channel)->setTopic(topic); + network()->ircChannel(channel)->setTopic(topic); emit displayMsg(Message::Server, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic)); } @@ -410,74 +422,65 @@ void IrcServerHandler::handle353(QString prefix, QList params) { foreach(QString nick, serverDecode(params.takeFirst()).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) { - 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")); -// } -// } -// } + 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, "", 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)); + tryNextNick(errnick); + } } /* ERR_NICKNAMEINUSE */ void IrcServerHandler::handle433(QString prefix, QList params) { - Q_UNUSED(prefix) + 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, "", 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(!networkConnection->network()->currentServer().isEmpty()) + return; + + tryNextNick(errnick); } +void IrcServerHandler::tryNextNick(const QString &errnick) { + QStringList desiredNicks = networkConnection->coreSession()->identity(networkConnection->network()->identity())->nicks(); + 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")); + } +} + + /***********************************************************************************/