X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=09b53d30a8304b0b26c99136736c9a4fe8055350;hp=a5e09d5dcdf7d1be2a37215f73117bc1dae14cbe;hb=a643fb463875bb3e516bcf6d61948f764bcb48f3;hpb=7b645ac74dc0d272dcf70f16b4dfd5a294f95ba7 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index a5e09d5d..09b53d30 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -21,8 +21,10 @@ #include "util.h" +#include "coresession.h" #include "networkconnection.h" #include "network.h" +#include "identity.h" #include "ctcphandler.h" #include "ircuser.h" @@ -31,7 +33,9 @@ #include IrcServerHandler::IrcServerHandler(NetworkConnection *parent) - : BasicHandler(parent), server(parent) { + : BasicHandler(parent), + networkConnection(parent) { + _whois = false; } IrcServerHandler::~IrcServerHandler() { @@ -39,32 +43,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; } @@ -268,10 +272,24 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { } void IrcServerHandler::handleNotice(QString prefix, QList params) { - if(network()->currentServer().isEmpty() || network()->currentServer() == prefix) + if(params.count() < 2) { + qWarning() << "IrcServerHandler::handleNotice(): not enoug Parameters:" << prefix << serverDecode(params); + return; + } + + // check if it's only a Server Message or if it's a regular Notice + 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); + return; + } + + QString target = serverDecode(params[0]); + + // kick notices to the server buffer if they are directly addressed to us + if(network()->isMyNick(target)) + target = QString(""); + + networkConnection->ctcpHandler()->parse(Message::Notice, prefix, target, userDecode(prefix, params[1])); } void IrcServerHandler::handlePart(QString prefix, QList params) { @@ -301,27 +319,19 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { QString target = serverDecode(params[0]); - // are we the target or is it a channel? - 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])); - foreach(QString message, messages) { - if(!message.isEmpty()) { - emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg); - } - } - } else { - // so it's probably a channel.. - if(!isChannelName(target)) { - qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!"; - return; - } + // are we the target? + if(network()->isMyNick(target)) + target = nickFromMask(ircuser->nick()); - QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); - foreach(QString message, messages) - emit displayMsg(Message::Plain, target, message, prefix); - } + // 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, userDecode(ircuser->nick(), params[1])); +// QStringList messages = +// foreach(QString message, messages) { +// emit displayMsg(Message::Plain, target, message, prefix); +// } + } void IrcServerHandler::handleQuit(QString prefix, QList params) { @@ -378,6 +388,124 @@ void IrcServerHandler::handle005(QString prefix, QList params) { } +/* +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(QString prefix, QList params) { + Q_UNUSED(prefix); + QString nickName = serverDecode(params[0]); + QString awayMessage = serverDecode(params.last()); + + IrcUser *ircuser = network()->ircUser(nickName); + if(ircuser) { + ircuser->setAwayMessage(awayMessage); + ircuser->setAway(true); + } + + if(_whois) { + emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } else { + int now = QDateTime::currentDateTime().toTime_t(); + int silenceTime = 60; + if(ircuser && ircuser->lastAwayMessage() + silenceTime < now) { + emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } + ircuser->setLastAwayMessage(now); + } +} + +/* RPL_WHOISUSER - " * :" */ +void IrcServerHandler::handle311(QString prefix, QList params) { + 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, "", tr("[Whois] %1") + .arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOISSERVER - " :" */ +void IrcServerHandler::handle312(QString prefix, QList params) { + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setServer(serverDecode(params[1])); + } + if(_whois) { + emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + } else { + emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + } +} + +/* RPL_WHOISOPERATOR - " :is an IRC operator" */ +void IrcServerHandler::handle313(QString prefix, QList params) { + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setIrcOperator(params.last()); + } + emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOWASUSER - " * :" */ +void IrcServerHandler::handle314(QString prefix, QList params) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_ENDOFWHO: " :End of WHO list" */ +void IrcServerHandler::handle315(QString prefix, QList params) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, "", 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(QString prefix, QList params) { + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + QDateTime now = QDateTime::currentDateTime(); + int idleSecs = serverDecode(params[1]).toInt(); + idleSecs *= -1; + ircuser->setIdleTime(now.addSecs(idleSecs)); + emit displayMsg(Message::Server, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now))); + } else { + emit displayMsg(Message::Server, "", tr("[Whois] idle message: %1").arg(serverDecode(params).join(" "))); + } +} + +/* RPL_ENDOFWHOIS - " :End of WHOIS list" */ +void IrcServerHandler::handle318(QString prefix, QList params) { + Q_UNUSED(prefix) + _whois = false; + emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + +/* RPL_WHOISCHANNELS - " :*( ( "@" / "+" ) " " )" */ +void IrcServerHandler::handle319(QString prefix, QList params) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); +} + /* RPL_NOTOPIC */ void IrcServerHandler::handle331(QString prefix, QList params) { Q_UNUSED(prefix); @@ -403,6 +531,23 @@ void IrcServerHandler::handle333(QString prefix, QList params) { .arg(bufferDecode(channel, params[1]), QDateTime::fromTime_t(bufferDecode(channel, params[2]).toUInt()).toString())); } +/* RPL_WHOREPLY: " + ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ +void IrcServerHandler::handle352(QString prefix, QList params) { + Q_UNUSED(prefix) + QString channel = serverDecode(params[0]); + IrcUser *ircuser = network()->ircUser(serverDecode(params[4])); + 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)); + + emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); +} + /* RPL_NAMREPLY */ void IrcServerHandler::handle353(QString prefix, QList params) { Q_UNUSED(prefix) @@ -425,61 +570,58 @@ void IrcServerHandler::handle353(QString prefix, QList params) { } } +/* RPL_ENDOFWHOWAS - " :End of WHOWAS" */ +void IrcServerHandler::handle369(QString prefix, QList params) { + Q_UNUSED(prefix) + emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); +} + /* 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")); + } +} + + /***********************************************************************************/