X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=3d7596dfb46dc97cb467f0f0dce73979096fe36e;hp=43c3126bfe7473e5ec6ceba59882a1ef5bcca3d9;hb=c8cb4218c158e9a4419520804e6972f2321684a1;hpb=723db5bff304ad3fdf5a0609198c65a66bfbaea7 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 43c3126b..3d7596df 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -32,8 +32,10 @@ #include -IrcServerHandler::IrcServerHandler(NetworkConnection *parent) : BasicHandler(parent) { - _whois = false; +IrcServerHandler::IrcServerHandler(NetworkConnection *parent) + : BasicHandler(parent), + _whois(false) +{ } IrcServerHandler::~IrcServerHandler() { @@ -103,7 +105,7 @@ void IrcServerHandler::handleServerMsg(QByteArray 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); @@ -123,24 +125,18 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QListisChannelName(target) - ? BufferInfo::ChannelBuffer - : BufferInfo::QueryBuffer; - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + target, prefix); - emit displayMsg(Message::Error, bufferType, target, params.join(" ") + " " + target, prefix); - break; + displayMsg(Message::Error, target, params.join(" ") + " " + target, prefix, Message::Redirected); + break; } - case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442: - { QString channelName = params.takeFirst(); + case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442: { + QString channelName = params.takeFirst(); emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" ") + " " + channelName, prefix); break; } // Server error messages which will be displayed with a colon between the first param and the rest - case 413: case 414: case 423: case 441: case 444: case 461: + case 413: case 414: case 423: case 441: case 444: case 461: // FIXME see below for the 47x codes case 467: case 471: case 473: case 474: case 475: case 476: case 477: case 478: case 482: case 436: // ERR_NICKCOLLISION { QString p = params.takeFirst(); @@ -165,21 +161,31 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList params) { - Q_ASSERT(params.count() == 1); +void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleJoin()", params, 1)) + return; + QString channel = serverDecode(params[0]); 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)) { + networkConnection()->setChannelJoined(channel); + putCmd("MODE", params[0]); // we want to know the modes of the channel we just joined, so we ask politely + } } -void IrcServerHandler::handleKick(QString prefix, QList params) { +void IrcServerHandler::handleKick(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleKick()", params, 2)) + return; + network()->updateNickFromMask(prefix); IrcUser *victim = network()->ircUser(params[1]); + if(!victim) + return; + QString channel = serverDecode(params[0]); - Q_ASSERT(victim); - victim->partChannel(channel); QString msg; @@ -189,24 +195,21 @@ void IrcServerHandler::handleKick(QString prefix, QList params) { msg = victim->nick(); emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); + //if(network()->isMe(victim)) networkConnection()->setKickedFromChannel(channel); } -void IrcServerHandler::handleMode(QString prefix, QList params) { - if(params.count() < 2) { - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); +void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleMode()", params, 2)) return; - } if(network()->isChannelName(serverDecode(params[0]))) { // Channel Modes emit displayMsg(Message::Mode, BufferInfo::ChannelBuffer, serverDecode(params[0]), serverDecode(params).join(" "), prefix); - 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(); + IrcChannel *channel = network()->ircChannel(params[0]); + QString modes = params[1]; bool add = true; - int modeIndex = 0; + int paramOffset = 2; for(int c = 0; c < modes.length(); c++) { if(modes[c] == '+') { add = true; @@ -217,27 +220,78 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { continue; } - // this is the part where we restrict the mode changes to PREFIXES: - if(network()->prefixModes().contains(modes[c]) && modeIndex < params.count()) { - IrcUser *ircUser = network()->ircUser(params[modeIndex]); + if(network()->prefixModes().contains(modes[c])) { + // user channel modes (op, voice, etc...) + if(paramOffset < params.count()) { + IrcUser *ircUser = network()->ircUser(params[paramOffset]); + if(add) + channel->addUserMode(ircUser, QString(modes[c])); + else + channel->removeUserMode(ircUser, QString(modes[c])); + } else { + qWarning() << "Received MODE with too few parameters:" << serverDecode(params); + } + paramOffset++; + } else { + // regular channel modes + QString value; + Network::ChannelModeType modeType = network()->channelModeType(modes[c]); + if(modeType == Network::A_CHANMODE || modeType == Network::B_CHANMODE || (modeType == Network::C_CHANMODE && add)) { + if(paramOffset < params.count()) { + value = params[paramOffset]; + } else { + qWarning() << "Received MODE with too few parameters:" << serverDecode(params); + } + paramOffset++; + } + if(add) - channel->addUserMode(ircUser, QString(modes[c])); + channel->addChannelMode(modes[c], value); else - channel->removeUserMode(ircUser, QString(modes[c])); + channel->removeChannelMode(modes[c], value); } - modeIndex++; } } else { // pure User Modes + IrcUser *ircUser = network()->newIrcUser(params[0]); + QString modeString(serverDecode(params[1])); + QString addModes; + QString removeModes; + bool add = false; + for(int c = 0; c < modeString.count(); c++) { + if(modeString[c] == '+') { + add = true; + continue; + } + if(modeString[c] == '-') { + add = false; + continue; + } + if(add) + addModes += modeString[c]; + else + removeModes += modeString[c]; + } + if(!addModes.isEmpty()) + ircUser->addUserModes(addModes); + if(!removeModes.isEmpty()) + ircUser->removeUserModes(removeModes); + // FIXME: redirect emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix); } } -void IrcServerHandler::handleNick(QString prefix, QList params) { +void IrcServerHandler::handleNick(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleNick()", params, 1)) + return; + IrcUser *ircuser = network()->updateNickFromMask(prefix); - Q_ASSERT(ircuser); + if(!ircuser) { + qWarning() << "IrcServerHandler::handleNick(): Unknown IrcUser!"; + return; + } QString newnick = serverDecode(params[0]); QString oldnick = ircuser->nick(); @@ -245,41 +299,36 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { ? 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(params.count() < 2) { - qWarning() << "IrcServerHandler::handleNotice(): not enough 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, BufferInfo::StatusBuffer, "", serverDecode(params[1]), prefix); +void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleNotice()", params, 2)) return; - } QString target = serverDecode(params[0]); + if(prefix.isEmpty() || target == "AUTH") + target = ""; + else if(!network()->isChannelName(target)) + target = nickFromMask(prefix); - // kick notices to the server buffer if they are directly addressed to us - if(network()->isMyNick(target)) - target = QString(""); - - QString sender = prefix.contains('!') - ? nickFromMask(prefix) - : prefix; - - networkConnection()->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(sender, params[1])); + networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]); } -void IrcServerHandler::handlePart(QString prefix, QList params) { +void IrcServerHandler::handlePart(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handlePart()", params, 1)) + return; + IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); - Q_ASSERT(ircuser); + if(!ircuser) { + qWarning() << "IrcServerHandler::handlePart(): Unknown IrcUser!"; + return; + } ircuser->partChannel(channel); @@ -288,36 +337,50 @@ void IrcServerHandler::handlePart(QString prefix, QList params) { msg = userDecode(ircuser->nick(), params[1]); emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); + if(network()->isMe(ircuser)) networkConnection()->setChannelParted(channel); } -void IrcServerHandler::handlePing(QString prefix, QList params) { +void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); putCmd("PONG", params); } -void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { +void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handlePrivmsg()", params, 1)) + return; + IrcUser *ircuser = network()->updateNickFromMask(prefix); - Q_ASSERT(ircuser); - if(params.count() < 2) - params << QByteArray(""); + if(!ircuser) { + qWarning() << "IrcServerHandler::handlePrivmsg(): Unknown IrcUser!"; + return; + } + if(params.isEmpty()) { + qWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix; + return; + } + QString target = serverDecode(params[0]); + 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, userDecode(ircuser->nick(), params[1])); + networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); } -void IrcServerHandler::handleQuit(QString prefix, QList params) { +void IrcServerHandler::handleQuit(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); - Q_ASSERT(ircuser); + if(!ircuser) return; QString msg; - if(params.count()) + if(params.count() > 0) msg = userDecode(ircuser->nick(), params[0]); foreach(QString channel, ircuser->channels()) @@ -326,23 +389,38 @@ void IrcServerHandler::handleQuit(QString prefix, QList params) { network()->removeIrcUser(nickFromMask(prefix)); } -void IrcServerHandler::handleTopic(QString prefix, QList params) { +void IrcServerHandler::handleTopic(const QString &prefix, const QList ¶ms) { + if(!checkParamCount("IrcServerHandler::handleTopic()", params, 1)) + return; + IrcUser *ircuser = network()->updateNickFromMask(prefix); - QString channel = serverDecode(params[0]); - QString topic = channelDecode(channel, params[1]); - Q_ASSERT(ircuser); + if(!ircuser) + return; - network()->ircChannel(channel)->setTopic(topic); + IrcChannel *channel = network()->ircChannel(serverDecode(params[0])); + if(!channel) + return; + + QString topic; + if(params.count() > 1) + topic = channelDecode(channel->name(), params[1]); + + channel->setTopic(topic); - emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic)); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic)); } /* RPL_WELCOME */ -void IrcServerHandler::handle001(QString prefix, QList params) { +void IrcServerHandler::handle001(const QString &prefix, const QList ¶ms) { + network()->setCurrentServer(prefix); + + if(params.isEmpty()) { + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("%1 didn't supply a valid welcome message... expect some serious issues...")); + } // there should be only one param: "Welcome to the Internet Relay Network !@" QString param = serverDecode(params[0]); QString myhostmask = param.section(' ', -1, -1); - network()->setCurrentServer(prefix); + network()->setMyNick(nickFromMask(myhostmask)); emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix); @@ -350,21 +428,56 @@ void IrcServerHandler::handle001(QString prefix, QList params) { /* 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); + } + + 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); + + 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); } } +/* RPL_UMODEIS - " []" */ +void IrcServerHandler::handle221(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + //TODO: save information in network object + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("%1").arg(serverDecode(params).join(" "))); +} + +/* RPL_STATSCONN - "Highest connection cout: 8000 (7999 clients)" */ +void IrcServerHandler::handle250(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + //TODO: save information in network object + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("%1").arg(serverDecode(params).join(" "))); +} + +/* RPL_LOCALUSERS - "Current local user: 5024 Max: 7999 */ +void IrcServerHandler::handle265(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + //TODO: save information in network object + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("%1").arg(serverDecode(params).join(" "))); +} + +/* RPL_GLOBALUSERS - "Current global users: 46093 Max: 47650" */ +void IrcServerHandler::handle266(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + //TODO: save information in network object + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("%1").arg(serverDecode(params).join(" "))); +} /* WHOIS-Message: @@ -381,10 +494,14 @@ WHOWAS-Message: /* RPL_AWAY - " :" */ -void IrcServerHandler::handle301(QString prefix, QList params) { +void IrcServerHandler::handle301(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle301()", params, 2)) + return; + + QString nickName = serverDecode(params[0]); - QString awayMessage = userDecode(nickName, params.last()); + QString awayMessage = userDecode(nickName, params[1]); IrcUser *ircuser = network()->ircUser(nickName); if(ircuser) { @@ -410,36 +527,101 @@ void IrcServerHandler::handle301(QString prefix, QList params) { } } +// 305 RPL_UNAWAY +// ":You are no longer marked as being away" +void IrcServerHandler::handle305(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + IrcUser *me = network()->me(); + if(me) + me->setAway(false); + + if(!params.isEmpty()) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[0])); +} + +// 306 RPL_NOWAWAY +// ":You have been marked as being away" +void IrcServerHandler::handle306(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + IrcUser *me = network()->me(); + if(me) + me->setAway(true); + + if(!params.isEmpty()) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[0])); +} + +/* RPL_WHOISSERVICE - " is registered nick" */ +void IrcServerHandler::handle307(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle307()", params, 1)) + return; + + QString whoisServiceReply = serverDecode(params).join(" "); + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setWhoisServiceReply(whoisServiceReply); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(whoisServiceReply)); +} + +/* RPL_SUSERHOST - " is available for help." */ +void IrcServerHandler::handle310(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle310()", params, 1)) + return; + + QString suserHost = serverDecode(params).join(" "); + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setSuserHost(suserHost); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(suserHost)); +} + /* RPL_WHOISUSER - " * :" */ -void IrcServerHandler::handle311(QString prefix, QList params) { +void IrcServerHandler::handle311(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle311()", params, 3)) + return; + _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 is %2 (%3)") .arg(ircuser->nick()).arg(ircuser->hostmask()).arg(ircuser->realName())); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(serverDecode(params[1])).arg(serverDecode(params[2])).arg(serverDecode(params.last()))); } - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1") .arg(serverDecode(params).join(" "))); } /* RPL_WHOISSERVER - " :" */ -void IrcServerHandler::handle312(QString prefix, QList params) { +void IrcServerHandler::handle312(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle312()", params, 2)) + return; + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); if(ircuser) { ircuser->setServer(serverDecode(params[1])); } + + QString returnString = tr("%1 is online via %2 (%3)").arg(serverDecode(params[0])).arg(serverDecode(params[1])).arg(serverDecode(params.last())); if(_whois) { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(returnString)); } else { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(returnString)); } } /* RPL_WHOISOPERATOR - " :is an IRC operator" */ -void IrcServerHandler::handle313(QString prefix, QList params) { +void IrcServerHandler::handle313(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle313()", params, 1)) + return; + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); if(ircuser) { ircuser->setIrcOperator(params.last()); @@ -448,22 +630,38 @@ void IrcServerHandler::handle313(QString prefix, QList params) { } /* RPL_WHOWASUSER - " * :" */ -void IrcServerHandler::handle314(QString prefix, QList params) { +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(" "))); + if(!checkParamCount("IrcServerHandler::handle314()", params, 3)) + return; + + QString nick = serverDecode(params[0]); + QString hostmask = QString("%1@%2").arg(serverDecode(params[1])).arg(serverDecode(params[2])); + QString realName = serverDecode(params.last()); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1 was %2 (%3)").arg(nick).arg(hostmask).arg(realName)); } /* RPL_ENDOFWHO: " :End of WHO list" */ -void IrcServerHandler::handle315(QString prefix, QList params) { - Q_UNUSED(prefix) - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); +void IrcServerHandler::handle315(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle315()", params, 1)) + return; + + QStringList p = serverDecode(params); + if(networkConnection()->setAutoWhoDone(p[0])) { + return; // stay silent + } + p.takeLast(); // should be "End of WHO list" + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] End of /WHO list for %1").arg(p.join(" "))); } /* RPL_WHOISIDLE - " :seconds idle" (real life: " :seconds idle, signon time) */ - //TODO: parse real life message -void IrcServerHandler::handle317(QString prefix, QList params) { +void IrcServerHandler::handle317(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle317()", params, 2)) + return; + QString nick = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(nick); if(ircuser) { @@ -471,36 +669,88 @@ void IrcServerHandler::handle317(QString prefix, QList params) { 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))); + if(params.size() > 3) { // if we have more then 3 params we have the obove mentioned "real life" situation + int loginTime = serverDecode(params[2]).toInt(); + ircuser->setLoginTime(QDateTime::fromTime_t(loginTime)); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(ircuser->nick()).arg(ircuser->loginTime().toString())); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(ircuser->nick()).arg(secondsToString(ircuser->idleTime().secsTo(now))).arg(ircuser->idleTime().toString())); + } 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(QString prefix, QList params) { +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(" "))); + QStringList parameter = serverDecode(params); + parameter.removeFirst(); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(parameter.join(" "))); } /* RPL_WHOISCHANNELS - " :*( ( "@" / "+" ) " " )" */ -void IrcServerHandler::handle319(QString prefix, QList params) { +void IrcServerHandler::handle319(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle319()", params, 2)) + return; + + QString nick = serverDecode(params.first()); + QStringList op; + QStringList voice; + QStringList user; + foreach (QString channel, serverDecode(params.last()).split(" ")) { + if(channel.startsWith("@")) + op.append(channel.remove(0,1)); + else if(channel.startsWith("+")) + voice.append(channel.remove(0,1)); + else + user.append(channel); + } + if(!user.isEmpty()) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is a user on channels: %2").arg(nick).arg(user.join(" "))); + if(!voice.isEmpty()) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 has voice on channels: %2").arg(nick).arg(voice.join(" "))); + if(!op.isEmpty()) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is an operator on channels: %2").arg(nick).arg(op.join(" "))); +} + +/* RPL_WHOISVIRT - " is identified to services" */ +void IrcServerHandler::handle320(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); } +/* RPL_CHANNELMODEIS - " " */ +void IrcServerHandler::handle324(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + handleMode(prefix, params); +} + +/* RPL_??? - " " */ +void IrcServerHandler::handle329(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + // FIXME implement this... +} + /* RPL_NOTOPIC */ -void IrcServerHandler::handle331(QString prefix, QList params) { +void IrcServerHandler::handle331(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle331()", params, 1)) + return; + QString channel = serverDecode(params[0]); 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); + if(!checkParamCount("IrcServerHandler::handle332()", params, 2)) + return; + QString channel = serverDecode(params[0]); QString topic = channelDecode(channel, params[1]); network()->ircChannel(channel)->setTopic(topic); @@ -508,8 +758,11 @@ void IrcServerHandler::handle332(QString prefix, QList params) { } /* Topic set by... */ -void IrcServerHandler::handle333(QString prefix, QList params) { +void IrcServerHandler::handle333(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle333()", params, 3)) + return; + QString channel = serverDecode(params[0]); 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())); @@ -517,8 +770,11 @@ void IrcServerHandler::handle333(QString prefix, QList params) { /* RPL_WHOREPLY: " ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ -void IrcServerHandler::handle352(QString prefix, QList params) { +void IrcServerHandler::handle352(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + if(!checkParamCount("IrcServerHandler::handle352()", params, 6)) + return; + QString channel = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(serverDecode(params[4])); if(ircuser) { @@ -531,16 +787,31 @@ void IrcServerHandler::handle352(QString prefix, QList params) { ircuser->setRealName(serverDecode(params.last()).section(" ", 1)); } - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); + if(!networkConnection()->isAutoWhoInProgress(channel)) { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); + } } /* RPL_NAMREPLY */ -void IrcServerHandler::handle353(QString prefix, QList params) { - Q_UNUSED(prefix) - params.removeFirst(); // either "=", "*" or "@" indicating a public, private or secret channel - QString channelname = serverDecode(params.takeFirst()); +void IrcServerHandler::handle353(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle353()", params, 2)) + 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]); + + IrcChannel *channel = network()->ircChannel(channelname); + if(!channel) { + qWarning() << "IrcServerHandler::handle353(): received unknown target channel:" << channelname; + return; + } - foreach(QString nick, serverDecode(params.takeFirst()).split(' ')) { + QStringList nicks; + QStringList modes; + + foreach(QString nick, serverDecode(params[2]).split(' ')) { QString mode = QString(); if(network()->prefixes().contains(nick[0])) { @@ -548,22 +819,21 @@ void IrcServerHandler::handle353(QString prefix, QList params) { nick = nick.mid(1); } - IrcUser *ircuser = network()->newIrcUser(nick); - ircuser->joinChannel(channelname); - - if(!mode.isNull()) - network()->ircChannel(channelname)->addUserMode(ircuser, mode); + nicks << nick; + modes << mode; } + + channel->joinIrcUsers(nicks, modes); } /* RPL_ENDOFWHOWAS - " :End of WHOWAS" */ -void IrcServerHandler::handle369(QString prefix, QList params) { +void IrcServerHandler::handle369(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); } /* ERR_ERRONEUSNICKNAME */ -void IrcServerHandler::handle432(QString prefix, QList params) { +void IrcServerHandler::handle432(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); if(params.size() < 2) { @@ -583,9 +853,11 @@ void IrcServerHandler::handle432(QString prefix, QList params) { } /* ERR_NICKNAMEINUSE */ -void IrcServerHandler::handle433(QString prefix, QList params) { +void IrcServerHandler::handle433(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); - + if(!checkParamCount("IrcServerHandler::handle433()", params, 1)) + return; + QString errnick = serverDecode(params[0]); emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick already in use: %1").arg(errnick)); @@ -597,6 +869,13 @@ void IrcServerHandler::handle433(QString prefix, QList params) { 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; @@ -607,6 +886,15 @@ void IrcServerHandler::tryNextNick(const QString &errnick) { } } +bool IrcServerHandler::checkParamCount(const QString &methodName, const QList ¶ms, int minParams) { + if(params.count() < minParams) { + qWarning() << qPrintable(methodName) << "requieres" << minParams << "parameters but received only" << params.count() << serverDecode(params); + return false; + } else { + return true; + } +} + /***********************************************************************************/