From 6b4a88135c3af2822a88e2dea51e6a1194a45171 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 18 Feb 2008 14:23:21 +0000 Subject: [PATCH] minor code cleanup --- src/core/ircserverhandler.cpp | 115 ++++++++++++++++++++-------------- src/core/ircserverhandler.h | 60 +++++++++--------- version.inc | 2 +- 3 files changed, 100 insertions(+), 77 deletions(-) diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 43c3126b..9318f825 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -103,7 +103,7 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { } -void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList rawparams) { +void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList &rawparams) { // we assume that all this happens in server encoding QStringList params; foreach(QByteArray r, rawparams) params << serverDecode(r); @@ -165,7 +165,7 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList params) { +void IrcServerHandler::handleJoin(const QString &prefix, const QList ¶ms) { Q_ASSERT(params.count() == 1); QString channel = serverDecode(params[0]); IrcUser *ircuser = network()->updateNickFromMask(prefix); @@ -174,7 +174,7 @@ void IrcServerHandler::handleJoin(QString prefix, QList params) { ircuser->joinChannel(channel); } -void IrcServerHandler::handleKick(QString prefix, QList params) { +void IrcServerHandler::handleKick(const QString &prefix, const QList ¶ms) { network()->updateNickFromMask(prefix); IrcUser *victim = network()->ircUser(params[1]); QString channel = serverDecode(params[0]); @@ -191,7 +191,7 @@ void IrcServerHandler::handleKick(QString prefix, QList params) { emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); } -void IrcServerHandler::handleMode(QString prefix, QList params) { +void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { if(params.count() < 2) { emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received invalid MODE from %s: %s").arg(prefix).arg(serverDecode(params).join(" "))); return; @@ -201,10 +201,10 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { // Channel Modes emit displayMsg(Message::Mode, BufferInfo::ChannelBuffer, serverDecode(params[0]), serverDecode(params).join(" "), prefix); - IrcChannel *channel = network()->ircChannel(params.takeFirst()); + IrcChannel *channel = network()->ircChannel(params[0]); // FIXME: currently the IrcChannels only support PREFIX-Modes for users // This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore - QString modes = params.takeFirst(); + QString modes = params[1]; bool add = true; int modeIndex = 0; for(int c = 0; c < modes.length(); c++) { @@ -235,7 +235,7 @@ void IrcServerHandler::handleMode(QString prefix, QList params) { } } -void IrcServerHandler::handleNick(QString prefix, QList params) { +void IrcServerHandler::handleNick(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); QString newnick = serverDecode(params[0]); @@ -251,7 +251,7 @@ void IrcServerHandler::handleNick(QString prefix, QList params) { ircuser->setNick(newnick); } -void IrcServerHandler::handleNotice(QString prefix, QList params) { +void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { if(params.count() < 2) { qWarning() << "IrcServerHandler::handleNotice(): not enough Parameters:" << prefix << serverDecode(params); return; @@ -276,7 +276,7 @@ void IrcServerHandler::handleNotice(QString prefix, QList params) { networkConnection()->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(sender, params[1])); } -void IrcServerHandler::handlePart(QString prefix, QList params) { +void IrcServerHandler::handlePart(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); Q_ASSERT(ircuser); @@ -290,29 +290,36 @@ void IrcServerHandler::handlePart(QString prefix, QList params) { emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); } -void IrcServerHandler::handlePing(QString prefix, QList params) { +void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); putCmd("PONG", params); } -void IrcServerHandler::handlePrivmsg(QString prefix, QList params) { +void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); - if(params.count() < 2) - params << QByteArray(""); + if(params.isEmpty()) { + qWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix; + return; + } + QString target = serverDecode(params[0]); + QByteArray msg = params.count() < 2 + ? QByteArray("") + : params[1]; + // 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])); + networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), msg)); } -void IrcServerHandler::handleQuit(QString prefix, QList params) { +void IrcServerHandler::handleQuit(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); Q_ASSERT(ircuser); @@ -326,7 +333,7 @@ void IrcServerHandler::handleQuit(QString prefix, QList params) { network()->removeIrcUser(nickFromMask(prefix)); } -void IrcServerHandler::handleTopic(QString prefix, QList params) { +void IrcServerHandler::handleTopic(const QString &prefix, const QList ¶ms) { IrcUser *ircuser = network()->updateNickFromMask(prefix); QString channel = serverDecode(params[0]); QString topic = channelDecode(channel, params[1]); @@ -338,7 +345,7 @@ void IrcServerHandler::handleTopic(QString prefix, QList params) { } /* RPL_WELCOME */ -void IrcServerHandler::handle001(QString prefix, QList params) { +void IrcServerHandler::handle001(const QString &prefix, const QList ¶ms) { // there should be only one param: "Welcome to the Internet Relay Network !@" QString param = serverDecode(params[0]); QString myhostmask = param.section(' ', -1, -1); @@ -350,17 +357,26 @@ void IrcServerHandler::handle001(QString prefix, QList params) { /* RPL_ISUPPORT */ // TODO Complete 005 handling, also use sensible defaults for non-sent stuff -void IrcServerHandler::handle005(QString prefix, QList params) { - Q_UNUSED(prefix) - QString rpl_isupport_suffix = serverDecode(params.takeLast()); - if(rpl_isupport_suffix.toLower() != QString("are supported by this server")) { +void IrcServerHandler::handle005(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + const int numParams = params.size(); + if(numParams < 1) { + 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"; return; } - - foreach(QString param, serverDecode(params)) { - QString key = param.section("=", 0, 0); - QString value = param.section("=", 1); + + QString rawSupport; + QString key, value; + for(int i = 0; i < numParams - 1; i++) { + QString rawSupport = serverDecode(params[i]); + QString key = rawSupport.section("=", 0, 0); + QString value = rawSupport.section("=", 1); network()->addSupport(key, value); } } @@ -381,7 +397,7 @@ WHOWAS-Message: /* RPL_AWAY - " :" */ -void IrcServerHandler::handle301(QString prefix, QList params) { +void IrcServerHandler::handle301(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString nickName = serverDecode(params[0]); QString awayMessage = userDecode(nickName, params.last()); @@ -411,7 +427,7 @@ void IrcServerHandler::handle301(QString prefix, QList params) { } /* RPL_WHOISUSER - " * :" */ -void IrcServerHandler::handle311(QString prefix, QList params) { +void IrcServerHandler::handle311(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) _whois = true; IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); @@ -424,7 +440,7 @@ void IrcServerHandler::handle311(QString prefix, QList params) { } /* RPL_WHOISSERVER - " :" */ -void IrcServerHandler::handle312(QString prefix, QList params) { +void IrcServerHandler::handle312(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); if(ircuser) { @@ -438,7 +454,7 @@ void IrcServerHandler::handle312(QString prefix, QList params) { } /* RPL_WHOISOPERATOR - " :is an IRC operator" */ -void IrcServerHandler::handle313(QString prefix, QList params) { +void IrcServerHandler::handle313(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) IrcUser *ircuser = network()->ircUser(serverDecode(params[0])); if(ircuser) { @@ -448,13 +464,13 @@ void IrcServerHandler::handle313(QString prefix, QList params) { } /* RPL_WHOWASUSER - " * :" */ -void IrcServerHandler::handle314(QString prefix, QList params) { +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(" "))); } /* RPL_ENDOFWHO: " :End of WHO list" */ -void IrcServerHandler::handle315(QString prefix, QList params) { +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(" "))); } @@ -462,7 +478,7 @@ void IrcServerHandler::handle315(QString prefix, QList params) { /* RPL_WHOISIDLE - " :seconds idle" (real life: " :seconds idle, signon time) */ //TODO: parse real life message -void IrcServerHandler::handle317(QString prefix, QList params) { +void IrcServerHandler::handle317(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString nick = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(nick); @@ -478,20 +494,20 @@ void IrcServerHandler::handle317(QString prefix, QList params) { } /* RPL_ENDOFWHOIS - " :End of WHOIS list" */ -void IrcServerHandler::handle318(QString prefix, QList params) { +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(" "))); } /* RPL_WHOISCHANNELS - " :*( ( "@" / "+" ) " " )" */ -void IrcServerHandler::handle319(QString prefix, QList params) { +void IrcServerHandler::handle319(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" "))); } /* RPL_NOTOPIC */ -void IrcServerHandler::handle331(QString prefix, QList params) { +void IrcServerHandler::handle331(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); network()->ircChannel(channel)->setTopic(QString()); @@ -499,7 +515,7 @@ void IrcServerHandler::handle331(QString prefix, QList params) { } /* RPL_TOPIC */ -void IrcServerHandler::handle332(QString prefix, QList params) { +void IrcServerHandler::handle332(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); QString topic = channelDecode(channel, params[1]); @@ -508,7 +524,7 @@ void IrcServerHandler::handle332(QString prefix, QList params) { } /* Topic set by... */ -void IrcServerHandler::handle333(QString prefix, QList params) { +void IrcServerHandler::handle333(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString channel = serverDecode(params[0]); emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, @@ -517,7 +533,7 @@ void IrcServerHandler::handle333(QString prefix, QList params) { /* RPL_WHOREPLY: " ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ -void IrcServerHandler::handle352(QString prefix, QList params) { +void IrcServerHandler::handle352(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) QString channel = serverDecode(params[0]); IrcUser *ircuser = network()->ircUser(serverDecode(params[4])); @@ -535,12 +551,19 @@ void IrcServerHandler::handle352(QString prefix, QList params) { } /* RPL_NAMREPLY */ -void IrcServerHandler::handle353(QString prefix, QList params) { - Q_UNUSED(prefix) - params.removeFirst(); // either "=", "*" or "@" indicating a public, private or secret channel - QString channelname = serverDecode(params.takeFirst()); +void IrcServerHandler::handle353(const QString &prefix, const QList ¶ms) { + Q_UNUSED(prefix); + const int numParams = params.count(); + if(numParams < 2) { + qWarning() << "IrcServerHandler::handler353() received not enough params:" << serverDecode(params); + return; + } + + // param[0] is either "=", "*" or "@" indicating a public, private or secret channel + // we don't use this information at the time beeing + QString channelname = serverDecode(params[1]); - foreach(QString nick, serverDecode(params.takeFirst()).split(' ')) { + foreach(QString nick, serverDecode(params[2]).split(' ')) { QString mode = QString(); if(network()->prefixes().contains(nick[0])) { @@ -557,13 +580,13 @@ void IrcServerHandler::handle353(QString prefix, QList params) { } /* RPL_ENDOFWHOWAS - " :End of WHOWAS" */ -void IrcServerHandler::handle369(QString prefix, QList params) { +void IrcServerHandler::handle369(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" "))); } /* ERR_ERRONEUSNICKNAME */ -void IrcServerHandler::handle432(QString prefix, QList params) { +void IrcServerHandler::handle432(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); if(params.size() < 2) { @@ -583,7 +606,7 @@ void IrcServerHandler::handle432(QString prefix, QList params) { } /* ERR_NICKNAMEINUSE */ -void IrcServerHandler::handle433(QString prefix, QList params) { +void IrcServerHandler::handle433(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); QString errnick = serverDecode(params[0]); diff --git a/src/core/ircserverhandler.h b/src/core/ircserverhandler.h index ace85f62..94e62b15 100644 --- a/src/core/ircserverhandler.h +++ b/src/core/ircserverhandler.h @@ -33,38 +33,38 @@ public: void handleServerMsg(QByteArray rawMsg); public slots: - void handleJoin(QString, QList); - void handleKick(QString, QList); - void handleMode(QString, QList); - void handleNick(QString, QList); - void handleNotice(QString, QList); - void handlePart(QString, QList); - void handlePing(QString, QList); - void handlePrivmsg(QString, QList); - void handleQuit(QString, QList); - void handleTopic(QString, QList); + void handleJoin(const QString &prefix, const QList ¶ms); + void handleKick(const QString &prefix, const QList ¶ms); + void handleMode(const QString &prefix, const QList ¶ms); + void handleNick(const QString &prefix, const QList ¶ms); + void handleNotice(const QString &prefix, const QList ¶ms); + void handlePart(const QString &prefix, const QList ¶ms); + void handlePing(const QString &prefix, const QList ¶ms); + void handlePrivmsg(const QString &prefix, const QList ¶ms); + void handleQuit(const QString &prefix, const QList ¶ms); + void handleTopic(const QString &prefix, const QList ¶ms); - void handle001(QString, QList); // RPL_WELCOME - void handle005(QString, QList); // RPL_ISUPPORT - void handle301(QString, QList); // RPL_AWAY - void handle311(QString, QList); // RPL_WHOISUSER - void handle312(QString, QList); // RPL_WHOISSERVER - void handle313(QString, QList); // RPL_WHOISOPERATOR - void handle314(QString, QList); // RPL_WHOWASUSER - void handle315(QString, QList); // RPL_ENDOFWHO - void handle317(QString, QList); // RPL_WHOISIDLE - void handle318(QString, QList); // RPL_ENDOFWHOIS - void handle319(QString, QList); // RPL_WHOISCHANNELS - void handle331(QString, QList); // RPL_NOTOPIC - void handle332(QString, QList); // RPL_TOPIC - void handle333(QString, QList); // Topic set by... - void handle352(QString, QList); // RPL_WHOREPLY - void handle353(QString, QList); // RPL_NAMREPLY - void handle369(QString, QList); // RPL_ENDOFWHOWAS - void handle432(QString, QList); // ERR_ERRONEUSNICKNAME - void handle433(QString, QList); // ERR_NICKNAMEINUSE + void handle001(const QString &prefix, const QList ¶ms); // RPL_WELCOME + void handle005(const QString &prefix, const QList ¶ms); // RPL_ISUPPORT + void handle301(const QString &prefix, const QList ¶ms); // RPL_AWAY + void handle311(const QString &prefix, const QList ¶ms); // RPL_WHOISUSER + void handle312(const QString &prefix, const QList ¶ms); // RPL_WHOISSERVER + void handle313(const QString &prefix, const QList ¶ms); // RPL_WHOISOPERATOR + void handle314(const QString &prefix, const QList ¶ms); // RPL_WHOWASUSER + void handle315(const QString &prefix, const QList ¶ms); // RPL_ENDOFWHO + void handle317(const QString &prefix, const QList ¶ms); // RPL_WHOISIDLE + void handle318(const QString &prefix, const QList ¶ms); // RPL_ENDOFWHOIS + void handle319(const QString &prefix, const QList ¶ms); // RPL_WHOISCHANNELS + void handle331(const QString &prefix, const QList ¶ms); // RPL_NOTOPIC + void handle332(const QString &prefix, const QList ¶ms); // RPL_TOPIC + void handle333(const QString &prefix, const QList ¶ms); // Topic set by... + void handle352(const QString &prefix, const QList ¶ms); // RPL_WHOREPLY + void handle353(const QString &prefix, const QList ¶ms); // RPL_NAMREPLY + void handle369(const QString &prefix, const QList ¶ms); // RPL_ENDOFWHOWAS + void handle432(const QString &prefix, const QList ¶ms); // ERR_ERRONEUSNICKNAME + void handle433(const QString &prefix, const QList ¶ms); // ERR_NICKNAMEINUSE - void defaultHandler(QString cmd, QString prefix, QList params); + void defaultHandler(QString cmd, const QString &prefix, const QList ¶ms); private: void tryNextNick(const QString &errnick); diff --git a/version.inc b/version.inc index 329e0ff3..f104bf96 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-pre"; quasselDate = "2008-02-18"; - quasselBuild = 531; + quasselBuild = 532; //! Minimum client build number the core needs clientBuildNeeded = 526; -- 2.20.1