X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=0499c85901e76e8e152bc04fb35ea9e62d2dc22d;hp=9318f825273805ca2fa1e2c276d8ff85a14e27cb;hb=dcba0652ac1275877b98b06d6482924ee6df0cd1;hpb=6b4a88135c3af2822a88e2dea51e6a1194a45171 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 9318f825..0499c859 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(); @@ -172,6 +168,7 @@ void IrcServerHandler::handleJoin(const QString &prefix, const QList emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix); //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); + if(network()->isMe(ircuser)) network()->addPersistentChannel(channel, networkConnection()->channelKey(channel)); } void IrcServerHandler::handleKick(const QString &prefix, const QList ¶ms) { @@ -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; @@ -245,6 +243,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,23 +257,13 @@ 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) { @@ -288,6 +278,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)) network()->removePersistentChannel(channel); } void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { @@ -316,12 +307,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 +326,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); @@ -472,7 +464,9 @@ void IrcServerHandler::handle314(const QString &prefix, const QList /* 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(" "))); + // FIXME temporarily made silent + Q_UNUSED(params) + // emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); } /* RPL_WHOISIDLE - " :seconds idle" @@ -547,7 +541,8 @@ 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(" "))); + // FIXME temporarily made silent + //emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); } /* RPL_NAMREPLY */ @@ -620,6 +615,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;