X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=87bc7e5364f31d2de238b54d38f100d0c0bcbef0;hp=0841c7a2d9490971d4c98f8549c4fb505206491b;hb=dd24b914045d1b38d8ae5347158aa2266166703b;hpb=99a590ef8b00aadfb3d6f77bc84df015158fc70b diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 0841c7a2..87bc7e53 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -35,6 +35,7 @@ IrcServerHandler::IrcServerHandler(NetworkConnection *parent) : BasicHandler(parent), networkConnection(parent) { + _whois = false; } IrcServerHandler::~IrcServerHandler() { @@ -129,7 +130,7 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList, params)); //handle(cmd, Q_ARG(QString, prefix)); } catch(Exception e) { - emit displayMsg(Message::Error, "", e.msg()); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", e.msg()); } } @@ -145,18 +146,29 @@ 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; + } + 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 @@ -164,7 +176,7 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList params) { Q_ASSERT(params.count() == 1); QString channel = serverDecode(params[0]); IrcUser *ircuser = network()->updateNickFromMask(prefix); - emit displayMsg(Message::Join, channel, channel, prefix); + emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix); //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); } @@ -208,18 +220,18 @@ void IrcServerHandler::handleKick(QString prefix, QList params) { else msg = victim->nick(); - emit displayMsg(Message::Kick, channel, msg, prefix); + emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); } void IrcServerHandler::handleMode(QString prefix, QList params) { if(params.count() < 2) { - emit displayMsg(Message::Error, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); return; } if(network()->isChannelName(params[0])) { // Channel Modes - emit displayMsg(Message::Mode, serverDecode(params[0]), serverDecode(params).join(" "), prefix); + 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 @@ -250,7 +262,8 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { } else { // pure User Modes - emit displayMsg(Message::Mode, "", serverDecode(params).join(" "), prefix); + // FIXME: redirect + emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix); } } @@ -260,21 +273,39 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { QString newnick = serverDecode(params[0]); QString oldnick = ircuser->nick(); - foreach(QString channel, ircuser->channels()) { - if(network()->isMyNick(oldnick)) { - emit displayMsg(Message::Nick, channel, newnick, newnick); - } else { - emit displayMsg(Message::Nick, channel, newnick, prefix); - } - } + QString sender = network()->isMyNick(oldnick) + ? newnick + : prefix; + + 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(network()->currentServer().isEmpty() || network()->currentServer() == prefix) - emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix); - else - emit displayMsg(Message::Notice, "", userDecode(prefix, params[1]), 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, BufferInfo::StatusBuffer, "", serverDecode(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(""); + + QString sender = prefix.contains('!') + ? nickFromMask(prefix) + : prefix; + + networkConnection->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(prefix, params[1])); } void IrcServerHandler::handlePart(QString prefix, QList params) { @@ -288,7 +319,7 @@ void IrcServerHandler::handlePart(QString prefix, QList params) { if(params.count() > 1) msg = userDecode(ircuser->nick(), params[1]); - emit displayMsg(Message::Part, channel, msg, prefix); + emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); } void IrcServerHandler::handlePing(QString prefix, QList params) { @@ -304,34 +335,13 @@ 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 = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1])); - quint8 flags; - foreach(QString message, messages) { - flags = Message::PrivMsg; - if(message.contains(network()->myNick())) - flags |= Message::Highlight; - emit displayMsg(Message::Plain, "", message, prefix, flags); - } - } else { - // so it's probably a channel.. - if(!isChannelName(target)) { - qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!"; - return; - } - - QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1])); - quint8 flags; - foreach(QString message, messages) { - flags = Message::None; - if(message.contains(network()->myNick())) - flags |= Message::Highlight; - emit displayMsg(Message::Plain, target, message, prefix, flags); - } - } + // 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])); } void IrcServerHandler::handleQuit(QString prefix, QList params) { @@ -343,7 +353,7 @@ void IrcServerHandler::handleQuit(QString prefix, QList params) { msg = userDecode(ircuser->nick(), params[0]); foreach(QString channel, ircuser->channels()) - emit displayMsg(Message::Quit, channel, msg, prefix); + emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix); network()->removeIrcUser(nickFromMask(prefix)); } @@ -356,7 +366,7 @@ void IrcServerHandler::handleTopic(QString prefix, QList params) { network()->ircChannel(channel)->setTopic(topic); - emit displayMsg(Message::Server, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic)); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic)); } /* RPL_WELCOME */ @@ -367,7 +377,7 @@ void IrcServerHandler::handle001(QString prefix, QList params) { network()->setCurrentServer(prefix); network()->setMyNick(nickFromMask(myhostmask)); - emit displayMsg(Message::Server, "", param, prefix); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix); } /* RPL_ISUPPORT */ @@ -398,60 +408,117 @@ WHO-Message: WHOWAS-Message: Replies 314 and 369 are responses to a WHOWAS message. + */ /* RPL_AWAY - " :" */ void IrcServerHandler::handle301(QString prefix, QList params) { - IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); - ircuser->setAwayMessage(serverDecode(params.last())); - ircuser->setAway(true); - emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + 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); + } + + // FIXME: proper redirection needed + if(_whois) { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } else { + if(ircuser) { + int now = QDateTime::currentDateTime().toTime_t(); + int silenceTime = 60; + if(ircuser->lastAwayMessage() + silenceTime < now) { + emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } + ircuser->setLastAwayMessage(now); + } else { + // probably should not happen + emit displayMsg(Message::Server, BufferInfo::QueryBuffer, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage)); + } + } } /* RPL_WHOISUSER - " * :" */ void IrcServerHandler::handle311(QString prefix, QList params) { + Q_UNUSED(prefix) + _whois = true; IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); - ircuser->setUser(serverDecode(params[1])); - ircuser->setHost(serverDecode(params[2])); - ircuser->setRealName(serverDecode(params.last())); - emit displayMsg(Message::Server, "", tr("[Whois] %1 %2 %3 (%4)") - .arg(ircuser->nick(), ircuser->user(), ircuser->host(), ircuser->realName())); + 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") .arg(serverDecode(params).join(" "))); } /* RPL_WHOISSERVER - " :" */ void IrcServerHandler::handle312(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whois/Whowas] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setServer(serverDecode(params[1])); + } + if(_whois) { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + } } /* RPL_WHOISOPERATOR - " :is an IRC operator" */ void IrcServerHandler::handle313(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); + if(ircuser) { + ircuser->setIrcOperator(params.last()); + } + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); } /* RPL_WHOWASUSER - " * :" */ void IrcServerHandler::handle314(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); } /* RPL_ENDOFWHO: " :End of WHO list" */ void IrcServerHandler::handle315(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); } -/* RPL_WHOISIDLE - " :seconds idle" */ +/* RPL_WHOISIDLE - " :seconds idle" + (real life: " :seconds idle, signon time) */ + //TODO: parse real life message void IrcServerHandler::handle317(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + 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, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 seconds").arg(ircuser->nick()).arg(ircuser->idleTime().secsTo(now))); + } else { + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(serverDecode(params).join(" "))); + } } /* RPL_ENDOFWHOIS - " :End of WHOIS list" */ void IrcServerHandler::handle318(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + _whois = false; + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); } /* RPL_WHOISCHANNELS - " :*( ( "@" / "+" ) " " )" */ void IrcServerHandler::handle319(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); } /* RPL_NOTOPIC */ @@ -459,7 +526,7 @@ void IrcServerHandler::handle331(QString prefix, QList params) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); network()->ircChannel(channel)->setTopic(QString()); - emit displayMsg(Message::Server, channel, tr("No topic is set for %1.").arg(channel)); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel)); } /* RPL_TOPIC */ @@ -468,34 +535,33 @@ void IrcServerHandler::handle332(QString prefix, QList params) { QString channel = serverDecode(params[0]); QString topic = bufferDecode(channel, params[1]); network()->ircChannel(channel)->setTopic(topic); - emit displayMsg(Message::Server, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic)); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic)); } /* Topic set by... */ void IrcServerHandler::handle333(QString prefix, QList params) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); - emit displayMsg(Message::Server, channel, tr("Topic set by %1 on %2") - .arg(bufferDecode(channel, params[1]), QDateTime::fromTime_t(bufferDecode(channel, params[2]).toUInt()).toString())); + emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic set by %1 on %2") .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); - - // TODO: !! - QString server = serverDecode(params[3]); - int hopCount = serverDecode(params.last()).section(" ", 0, 0).toInt(); - ircuser->setRealName(serverDecode(params.last()).section(" ", 1)); + if(ircuser) { + 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(" "))); + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); } /* RPL_NAMREPLY */ @@ -522,7 +588,8 @@ void IrcServerHandler::handle353(QString prefix, QList params) { /* RPL_ENDOFWHOWAS - " :End of WHOWAS" */ void IrcServerHandler::handle369(QString prefix, QList params) { - emit displayMsg(Message::Server, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); + Q_UNUSED(prefix) + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); } /* ERR_ERRONEUSNICKNAME */ @@ -535,12 +602,12 @@ void IrcServerHandler::handle432(QString prefix, QList params) { // :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")); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("There is a nickname in your identity's nicklist which contains illegal characters")); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", 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, BufferInfo::StatusBuffer, "", 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)); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick)); tryNextNick(errnick); } } @@ -550,7 +617,7 @@ void IrcServerHandler::handle433(QString prefix, QList params) { Q_UNUSED(prefix); QString errnick = serverDecode(params[0]); - emit displayMsg(Message::Error, "", tr("Nick already in use: %1").arg(errnick)); + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", 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... @@ -566,7 +633,7 @@ void IrcServerHandler::tryNextNick(const QString &errnick) { 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, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); } }