X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=138b75342d3efdc7688b9be7349ebf41e1998692;hb=c6b3980fe063e5022882a31a132dec6952f8c6a7;hp=9318f825273805ca2fa1e2c276d8ff85a14e27cb;hpb=6b4a88135c3af2822a88e2dea51e6a1194a45171;p=quassel.git diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 9318f825..138b7534 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() { @@ -123,24 +125,18 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix); break; // Server error messages, display them in red. First param will be appended. - case 401: - { - // FIXME needs proper redirection + case 401: { QString target = params.takeFirst(); - BufferInfo::Type bufferType = network()->isChannelName(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(); @@ -166,19 +162,20 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const // IRC SERVER HANDLER //******************************/ void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { - Q_ASSERT(params.count() == 1); + if(params.count() < 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); } void IrcServerHandler::handleKick(const QString &prefix, const QList ¶ms) { network()->updateNickFromMask(prefix); IrcUser *victim = network()->ircUser(params[1]); + if(!victim) return; QString channel = serverDecode(params[0]); - Q_ASSERT(victim); victim->partChannel(channel); @@ -189,6 +186,7 @@ void IrcServerHandler::handleKick(const QString &prefix, const QList msg = victim->nick(); emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); + //if(network()->isMe(victim)) networkConnection()->setKickedFromChannel(channel); } void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { @@ -206,7 +204,7 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList // This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore 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; @@ -230,6 +228,30 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList } 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); } @@ -237,7 +259,10 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList void IrcServerHandler::handleNick(const QString &prefix, const QList ¶ms) { 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,6 +270,8 @@ void IrcServerHandler::handleNick(const QString &prefix, const QList ? newnick : prefix; + + emit nickChanged(newnick, oldnick); foreach(QString channel, ircuser->channels()) emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender); @@ -257,29 +284,22 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QListcurrentServer().isEmpty() || network()->currentServer() == prefix) { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[1]), prefix); - 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(const QString &prefix, const QList ¶ms) { 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,6 +308,7 @@ void IrcServerHandler::handlePart(const QString &prefix, const QList 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(const QString &prefix, const QList ¶ms) { @@ -297,7 +318,10 @@ void IrcServerHandler::handlePing(const QString &prefix, const QList void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); - Q_ASSERT(ircuser); + if(!ircuser) { + qWarning() << "IrcServerHandler::handlePrivmsg(): Unknown IrcUser!"; + return; + } if(params.isEmpty()) { qWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix; @@ -316,12 +340,12 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList we let the ctcpHandler do the work - networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), msg)); + networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); } 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()) @@ -335,9 +359,10 @@ void IrcServerHandler::handleQuit(const QString &prefix, const QList void IrcServerHandler::handleTopic(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); + if(!ircuser) return; QString channel = serverDecode(params[0]); - QString topic = channelDecode(channel, params[1]); - Q_ASSERT(ircuser); + QString topic; + if(params.count() >= 2) topic = channelDecode(channel, params[1]); network()->ircChannel(channel)->setTopic(topic); @@ -364,7 +389,7 @@ void IrcServerHandler::handle005(const QString &prefix, const QList 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"; @@ -381,6 +406,33 @@ void IrcServerHandler::handle005(const QString &prefix, const QList } } +/* 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: @@ -426,6 +478,28 @@ void IrcServerHandler::handle301(const QString &prefix, const QList } } +/* RPL_WHOISSERVICE - " is registered nick" */ +void IrcServerHandler::handle307(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix) + 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) + 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(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) @@ -435,8 +509,10 @@ void IrcServerHandler::handle311(const QString &prefix, const QList 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 - " :" */ @@ -446,10 +522,12 @@ void IrcServerHandler::handle312(const QString &prefix, const QList 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)); } } @@ -466,18 +544,27 @@ void IrcServerHandler::handle313(const QString &prefix, const QList /* 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(" "))); + 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(const QString &prefix, const QList ¶ms) { - Q_UNUSED(prefix) - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix); + QStringList p = serverDecode(params); + if(p.count()) { + 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(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString nick = serverDecode(params[0]); @@ -487,7 +574,13 @@ void IrcServerHandler::handle317(const QString &prefix, const QList 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) { + 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(" "))); } @@ -497,12 +590,37 @@ void IrcServerHandler::handle317(const QString &prefix, const QList 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(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) + 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(" "))); } @@ -547,7 +665,9 @@ void IrcServerHandler::handle352(const QString &prefix, const QList 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 */ @@ -563,6 +683,15 @@ void IrcServerHandler::handle353(const QString &prefix, const QList // 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; + } + + QStringList nicks; + QStringList modes; + foreach(QString nick, serverDecode(params[2]).split(' ')) { QString mode = QString(); @@ -571,12 +700,11 @@ void IrcServerHandler::handle353(const QString &prefix, const QList 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" */ @@ -620,6 +748,13 @@ void IrcServerHandler::handle433(const QString &prefix, const QList 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;