X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=fe9f2500e9a421c83f1216caa93c5c1dc6e62034;hp=32a40f0d99183569df50c21c4bcb005dfbb974a2;hb=d60c5028b49a95d3c27c35b2ea1d74cdd7bb0e46;hpb=f0013829ab979864e1cbf23c0195485c5d7ccb72 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 32a40f0d..fe9f2500 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -129,88 +129,15 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList &rawparams) { - // we assume that all this happens in server encoding - QStringList params = serverDecode(rawparams); - uint num = cmd.toUInt(); - if(num) { - // A lot of server messages don't really need their own handler because they don't do much. - // Catch and handle these here. - switch(num) { - // Welcome, status, info messages. Just display these. - case 2: case 3: case 4: case 5: case 251: case 252: case 253: case 254: case 255: case 372: case 375: - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", params.join(" "), prefix); - break; - // Server error messages without param, just display them - case 409: case 411: case 412: case 422: case 424: case 445: case 446: case 451: case 462: - case 463: case 464: case 465: case 466: case 472: case 481: case 483: case 485: case 491: case 501: case 502: - case 431: // ERR_NONICKNAMEGIVEN - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix); - break; - // Server error messages, display them in red. First param will be appended. - case 401: { - QString target = params.takeFirst(); - emit 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(); - 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: // 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(); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", p + ": " + params.join(" ")); - break; - } - // Ignore these commands. - case 321: case 366: case 376: - break; - - case 903: case 904: case 905: case 906: case 907: - { - network()->putRawLine("CAP END"); - emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", "CAP: " + params.join("")); - } - // Everything else will be marked in red, so we can add them somewhere. - default: - if(_whois) { - // many nets define their own WHOIS fields. we fetch those not in need of special attention here: - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix); - } else { - if(coreSession()->ircListHelper()->requestInProgress(network()->networkId())) - coreSession()->ircListHelper()->reportError(params.join(" ")); - else - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix); - } - } - //qDebug() << prefix <<":"< ¶ms) { - if(!checkParamCount("IrcServerHandler::handleInvite()", params, 2)) - return; -// qDebug() << "IrcServerHandler::handleInvite()" << prefix << params; - - IrcUser *ircuser = network()->updateNickFromMask(prefix); - if(!ircuser) { - return; - } - - QString channel = serverDecode(params[1]); - - emit displayMsg(Message::Invite, BufferInfo::StatusBuffer, "", tr("%1 invited you to channel %2").arg(ircuser->nick()).arg(channel)); -} void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { if(!checkParamCount("IrcServerHandler::handleJoin()", params, 1)) @@ -241,28 +168,6 @@ void IrcServerHandler::handleJoin(const QString &prefix, const QList } } -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]); - victim->partChannel(channel); - - QString msg; - if(params.count() > 2) // someone got a reason! - msg = QString("%1 %2").arg(victim->nick()).arg(channelDecode(channel, params[2])); - else - msg = victim->nick(); - - emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); - //if(network()->isMe(victim)) network()->setKickedFromChannel(channel); -} - void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { if(!checkParamCount("IrcServerHandler::handleMode()", params, 2)) return; @@ -374,33 +279,6 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList } } -void IrcServerHandler::handleNick(const QString &prefix, const QList ¶ms) { - if(!checkParamCount("IrcServerHandler::handleNick()", params, 1)) - return; - - IrcUser *ircuser = network()->updateNickFromMask(prefix); - if(!ircuser) { - qWarning() << "IrcServerHandler::handleNick(): Unknown IrcUser!"; - return; - } - QString newnick = serverDecode(params[0]); - QString oldnick = ircuser->nick(); - - QString sender = network()->isMyNick(oldnick) - ? newnick - : prefix; - - - // the order is cruicial - // otherwise the client would rename the buffer, see that the assigned ircuser doesn't match anymore - // and remove the ircuser from the querybuffer leading to a wrong on/offline state - ircuser->setNick(newnick); - coreSession()->renameBuffer(network()->networkId(), newnick, oldnick); - - foreach(QString channel, ircuser->channels()) - emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender); -} - void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { if(!checkParamCount("IrcServerHandler::handleNotice()", params, 2)) return; @@ -442,27 +320,6 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { - if(!checkParamCount("IrcServerHandler::handlePart()", params, 1)) - return; - - IrcUser *ircuser = network()->updateNickFromMask(prefix); - QString channel = serverDecode(params[0]); - if(!ircuser) { - qWarning() << "IrcServerHandler::handlePart(): Unknown IrcUser!"; - return; - } - - ircuser->partChannel(channel); - - QString msg; - if(params.count() > 1) - msg = userDecode(ircuser->nick(), params[1]); - - emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); - if(network()->isMe(ircuser)) network()->setChannelParted(channel); -} - void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); putCmd("PONG", params); @@ -873,10 +730,12 @@ void IrcServerHandler::handle317(const QString &prefix, const QList QString nick = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(nick); + + QDateTime now = QDateTime::currentDateTime(); + int idleSecs = serverDecode(params[1]).toInt(); + idleSecs *= -1; + if(ircuser) { - QDateTime now = QDateTime::currentDateTime(); - int idleSecs = serverDecode(params[1]).toInt(); - idleSecs *= -1; ircuser->setIdleTime(now.addSecs(idleSecs)); if(params.size() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation int loginTime = serverDecode(params[2]).toInt(); @@ -884,9 +743,14 @@ void IrcServerHandler::handle317(const QString &prefix, const QList 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(" "))); + QDateTime idleSince = now.addSecs(idleSecs); + if (params.size() > 3) { // we have a signon time + int loginTime = serverDecode(params[2]).toInt(); + QDateTime datetime = QDateTime::fromTime_t(loginTime); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(nick).arg(datetime.toString())); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(nick).arg(secondsToString(idleSince.secsTo(now))).arg(idleSince.toString())); } } @@ -998,6 +862,18 @@ void IrcServerHandler::handle329(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Channel %1 created on %2").arg(channel, time.toString())); } +/* RPL_WHOISACCOUNT: " :is authed as */ +void IrcServerHandler::handle330(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + if(!checkParamCount("IrcServerHandler::handle330()", params, 3)) + return; + + QString nick = serverDecode(params[0]); + QString account = serverDecode(params[1]); + + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is authed as %2").arg(nick).arg(account)); +} + /* RPL_NOTOPIC */ void IrcServerHandler::handle331(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); @@ -1056,7 +932,7 @@ void IrcServerHandler::handle341(const QString &prefix, const QList qWarning() << "IrcServerHandler::handle341(): unknown channel:" << params[1]; return; } - + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has been invited to %2").arg(nick).arg(channel->name())); }