X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=debe2efb355f21b9ea2cd4f8f8cafdec35900af3;hp=fe9f2500e9a421c83f1216caa93c5c1dc6e62034;hb=56b69808aa71b882aa792fadfda2733d765c2ba8;hpb=d60c5028b49a95d3c27c35b2ea1d74cdd7bb0e46 diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index fe9f2500..debe2efb 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -89,11 +89,12 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { QString foo = serverDecode(params.takeFirst()); // with SASL, the command is 'AUTHENTICATE +' and we should check for this here. + /* obsolete because of events if(foo == QString("AUTHENTICATE +")) { handleAuthenticate(); return; } - + */ // a colon as the first chars indicates the existence of a prefix if(foo[0] == ':') { foo.remove(0, 1); @@ -325,23 +326,6 @@ void IrcServerHandler::handlePing(const QString &prefix, const QList putCmd("PONG", params); } -void IrcServerHandler::handlePong(const QString &prefix, const QList ¶ms) { - Q_UNUSED(prefix); - // the server is supposed to send back what we passed as param. and we send a timestamp - // but using quote and whatnought one can send arbitrary pings, so we have to do some sanity checks - if(params.count() < 2) - return; - - QString timestamp = serverDecode(params[1]); - QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz"); - if(!sendTime.isValid()) { - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "PONG " + serverDecode(params).join(" "), prefix); - return; - } - - network()->setLatency(sendTime.msecsTo(QTime::currentTime()) / 2); -} - void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList ¶ms) { if(!checkParamCount("IrcServerHandler::handlePrivmsg()", params, 1)) return; @@ -415,73 +399,6 @@ void IrcServerHandler::handleQuit(const QString &prefix, const QList } } -void IrcServerHandler::handleTopic(const QString &prefix, const QList ¶ms) { - if(!checkParamCount("IrcServerHandler::handleTopic()", params, 1)) - return; - - IrcUser *ircuser = network()->updateNickFromMask(prefix); - if(!ircuser) - return; - - IrcChannel *channel = network()->ircChannel(serverDecode(params[0])); - if(!channel) - return; - - QString topic; - if(params.count() > 1) { - QByteArray rawTopic = params[1]; -#ifdef HAVE_QCA2 - rawTopic = decrypt(channel->name(), rawTopic, true); -#endif - topic = channelDecode(channel->name(), rawTopic); - } - - channel->setTopic(topic); - - emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic)); -} - -void IrcServerHandler::handleCap(const QString &prefix, const QList ¶ms) { - // for SASL, there will only be a single param of 'sasl', however you can check here for - // additional CAP messages (ls, multi-prefix, et cetera). - - Q_UNUSED(prefix); - - if(params.size() == 3) { - QString param = serverDecode(params[2]); - if(param == QString("sasl")) { // SASL Ready - network()->putRawLine(serverEncode("AUTHENTICATE PLAIN")); // Only working with PLAIN atm, blowfish later - } - } -} - -void IrcServerHandler::handleAuthenticate() { - QString construct = network()->saslAccount(); - construct.append(QChar(QChar::Null)); - construct.append(network()->saslAccount()); - construct.append(QChar(QChar::Null)); - construct.append(network()->saslPassword()); - QByteArray saslData = QByteArray(construct.toAscii().toBase64()); - saslData.prepend(QString("AUTHENTICATE ").toAscii()); - network()->putRawLine(saslData); -} - -/* RPL_WELCOME */ -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()->setMyNick(nickFromMask(myhostmask)); - - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix); -} - /* RPL_ISUPPORT */ // TODO Complete 005 handling, also use sensible defaults for non-sent stuff void IrcServerHandler::handle005(const QString &prefix, const QList ¶ms) { @@ -512,34 +429,6 @@ void IrcServerHandler::handle005(const QString &prefix, const QList network()->determinePrefixes(); } -/* 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: Replies 311 - 313, 317 - 319 are all replies generated in response to a WHOIS message. @@ -553,69 +442,6 @@ WHOWAS-Message: */ - -/* RPL_AWAY - " :" */ -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[1]); - - 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)); - } - } -} - -// 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(!network()->autoAwayActive()) { - if(!params.isEmpty()) - emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[0])); - } else { - network()->setAutoAwayActive(false); - } -} - -// 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() && !network()->autoAwayActive()) - 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)