X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fserver.cpp;h=494cb970ff0ebd9490d66bc1b13003af03358cfa;hp=541816b217f48855b88e2e243bf6ea2b0e5179ae;hb=f8e388d65b8a1745c54035f1e871f195fdaca6f6;hpb=4eb5246b8b5ab9ff0e25c3f5c43fce357a9e9526 diff --git a/core/server.cpp b/core/server.cpp index 541816b2..494cb970 100644 --- a/core/server.cpp +++ b/core/server.cpp @@ -28,6 +28,7 @@ Server::Server(QString net) : network(net) { + } Server::~Server() { @@ -75,7 +76,7 @@ void Server::disconnectFromIrc(QString net) { void Server::socketHasData() { while(socket.canReadLine()) { QString s = socket.readLine().trimmed(); - qDebug() << "Read" << s; + //qDebug() << "Read" << s; emit recvRawServerMsg(s); //Message *msg = Message::createFromServerString(this, s); handleServerMsg(s); @@ -89,7 +90,7 @@ void Server::socketError( QAbstractSocket::SocketError err ) { void Server::socketConnected( ) { emit connected(network); - putRawLine(QString("NICK :%1").arg(identity["NickList"].toStringList()[0])); + putRawLine(QString("NICK :%1").arg(identity["NickList"].toStringList()[0])); // FIXME: try more nicks if error occurs putRawLine(QString("USER %1 8 * :%2").arg(identity["Ident"].toString()).arg(identity["RealName"].toString())); } @@ -132,7 +133,7 @@ void Server::userInput(QString net, QString buf, QString msg) { } void Server::putRawLine(QString s) { - qDebug() << "SentRaw: " << s; +// qDebug() << "SentRaw: " << s; s += "\r\n"; socket.write(s.toAscii()); } @@ -145,7 +146,7 @@ void Server::putCmd(QString cmd, QStringList params, QString prefix) { m += " " + params[i]; } if(!params.isEmpty()) m += " :" + params.last(); - qDebug() << "Sent: " << m; +// qDebug() << "Sent: " << m; m += "\r\n"; socket.write(m.toAscii()); } @@ -161,34 +162,38 @@ void Server::handleServerMsg(QString msg) { QString prefix; QString cmd; QStringList params; + + // check for prefix by checking for a colon as the first char if(msg[0] == ':') { msg.remove(0,1); prefix = msg.section(' ', 0, 0); msg = msg.section(' ', 1); } + + // next string without a whitespace is the command cmd = msg.section(' ', 0, 0).toUpper(); - msg = msg.section(' ', 1); - QString left, trailing; - // RPL_ISUPPORT (005) can contain colons, so don't treat it like the rest of the commands - if(cmd.toUInt() == 5) { - left = msg.remove(QString(":are supported by this server")); - } else { - left = msg.section(':', 0, 0); - trailing = msg.section(':', 1); + msg = msg.mid(cmd.length()); + + // get the parameters + QString trailing = ""; + if(msg.contains(" :")) { + trailing = msg.section(" :", 1); + msg = msg.section(" :", 0, 0); } - if(!left.isEmpty()) { - params << left.split(' ', QString::SkipEmptyParts); + if(!msg.isEmpty()) { + params << msg.split(' ', QString::SkipEmptyParts); } if(!trailing.isEmpty()) { params << trailing; } - // numeric replies usually have our own nick as first param. Remove this! - // BTW, this behavior is not in the RFC. + + // numeric replies have the target as first param (RFC 2812 - 2.4). this is usually our own nick. Remove this! uint num = cmd.toUInt(); - if(num > 1 && params.count() > 0) { // 001 sets our nick, so we shouldn't remove anything - if(params[0] == ownNick) params.removeFirst(); - else qWarning((QString("First param NOT nick: %1:%2 %3").arg(prefix).arg(cmd).arg(params.join(" "))).toAscii()); + if(num > 0) { + Q_ASSERT(params.count() > 0); // Violation to RFC + params.removeFirst(); } + // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-) QString hname = cmd.toLower(); hname[0] = hname[0].toUpper(); @@ -198,7 +203,7 @@ void Server::handleServerMsg(QString msg) { defaultServerHandler(cmd, prefix, params); } } catch(Exception e) { - emit displayMsg(Message::error("", e.msg())); + emit displayMsg(Message::Error, "", e.msg()); } } @@ -210,24 +215,24 @@ void Server::defaultServerHandler(QString cmd, QString prefix, QStringList param switch(num) { // Welcome, status, info messages. Just display these. case 2: case 3: case 4: case 5: case 251: case 252: case 253: case 254: case 255: case 372: case 375: - emit displayMsg(Message::server("", params.join(" "), prefix)); + emit displayMsg(Message::Server, "", params.join(" "), prefix); break; // Server error messages without param, just display them case 409: case 411: case 412: case 422: case 424: case 431: case 445: case 446: case 451: case 462: case 463: case 464: case 465: case 466: case 472: case 481: case 483: case 485: case 491: case 501: case 502: - emit displayMsg(Message::error("", params.join(" "), prefix)); + emit displayMsg(Message::Error, "", params.join(" "), prefix); break; // Server error messages, display them in red. First param will be appended. case 401: case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 432: case 442: { QString p = params.takeFirst(); - emit displayMsg(Message::error("", params.join(" ") + " " + p, prefix)); + emit displayMsg(Message::Error, "", params.join(" ") + " " + p, 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 433: case 436: case 441: case 444: case 461: + case 413: case 414: case 423: case 436: case 441: case 444: case 461: case 467: case 471: case 473: case 474: case 475: case 476: case 477: case 478: case 482: { QString p = params.takeFirst(); - emit displayMsg(Message::error("", p + ": " + params.join(" "))); + emit displayMsg(Message::Error, "", p + ": " + params.join(" ")); break; } // Ignore these commands. @@ -236,11 +241,11 @@ void Server::defaultServerHandler(QString cmd, QString prefix, QStringList param // Everything else will be marked in red, so we can add them somewhere. default: - emit displayMsg(Message::error("", cmd + " " + params.join(" "), prefix)); + emit displayMsg(Message::Error, "", cmd + " " + params.join(" "), prefix); } //qDebug() << prefix <<":"<methodCount(); i++) { + QString methodSignature(metaObject()->method(i).signature()); + if (methodSignature.startsWith("handleUser")) { + methodSignature = methodSignature.section('(',0,0); // chop the attribute list + methodSignature = methodSignature.mid(10); // strip "handleUser" + userHandlers << methodSignature; + } + } + return userHandlers; +} + + /**********************************************************************************/ /* @@ -326,6 +345,7 @@ void Server::handleUserMode(QString bufname, QString msg) { putCmd("MODE", msg.split(' ', QString::SkipEmptyParts)); } +// TODO: show privmsgs void Server::handleUserMsg(QString bufname, QString msg) { QString nick = msg.section(" ", 0, 0); msg = msg.section(" ", 1); @@ -354,6 +374,12 @@ void Server::handleUserPart(QString bufname, QString msg) { putCmd("PART", params); } +// TODO: implement queries +void Server::handleUserQuery(QString bufname, QString msg) { + QString nick = msg.section(' ', 0, 0); + if(!nick.isEmpty()) emit queryRequested(network, nick); +} + void Server::handleUserQuit(QString bufname, QString msg) { putCmd("QUIT", QStringList(msg)); } @@ -367,7 +393,11 @@ void Server::handleUserSay(QString bufname, QString msg) { QStringList params; params << bufname << msg; putCmd("PRIVMSG", params); - emit displayMsg(Message::plain(params[0], msg, ownNick, Message::Self)); + if(isChannelName(bufname)) { + emit displayMsg(Message::Plain, params[0], msg, ownNick, Message::Self); + } else { + emit displayMsg(Message::Plain, params[0], msg, ownNick, Message::Self|Message::PrivMsg); + } } void Server::handleUserTopic(QString bufname, QString msg) { @@ -415,7 +445,7 @@ void Server::handleServerJoin(QString prefix, QStringList params) { nicks[nick] = n; emit nickAdded(network, nick, n); } - emit displayMsg(Message::join(params[0], params[0], prefix)); + emit displayMsg(Message::Join, params[0], params[0], prefix); //} } @@ -429,7 +459,7 @@ void Server::handleServerKick(QString prefix, QStringList params) { chans.remove(params[0]); QString msg = nick; if(params.count() > 2) msg = QString("%1 %2").arg(msg).arg(params[2]); - emit displayMsg(Message::kick(params[0], msg, prefix)); + emit displayMsg(Message::Kick, params[0], msg, prefix); if(chans.count() > 0) { n["Channels"] = chans; nicks[nick] = n; @@ -470,12 +500,12 @@ void Server::handleServerMode(QString prefix, QStringList params) { m++; } } - emit displayMsg(Message::mode(params[0], params.join(" "), prefix)); + emit displayMsg(Message::Mode, params[0], params.join(" "), prefix); } else { //Q_ASSERT(nicks.contains(params[0])); //VarMap n = nicks[params[0]].toMap(); //QString mode = n["Mode"].toString(); - emit displayMsg(Message::mode("", params.join(" "))); + emit displayMsg(Message::Mode, "", params.join(" ")); } } @@ -486,8 +516,8 @@ void Server::handleServerNick(QString prefix, QStringList params) { nicks[newnick] = v; VarMap chans = v["Channels"].toMap(); foreach(QString c, chans.keys()) { - if(oldnick != ownNick) { emit displayMsg(Message::nick(c, newnick, prefix)); } - else { emit displayMsg(Message::nick(c, newnick, newnick)); } + if(oldnick != ownNick) { emit displayMsg(Message::Nick, c, newnick, prefix); } + else { emit displayMsg(Message::Nick, c, newnick, newnick); } } emit nickRenamed(network, oldnick, newnick); if(oldnick == ownNick) { @@ -498,8 +528,8 @@ void Server::handleServerNick(QString prefix, QStringList params) { void Server::handleServerNotice(QString prefix, QStringList params) { //Message msg(Message::Notice, params[1], prefix); - if(prefix == currentServer) emit displayMsg(Message::server("", params[1], prefix)); - else emit displayMsg(Message::notice("", params[1], prefix)); + if(currentServer.isEmpty() || prefix == currentServer) emit displayMsg(Message::Server, "", params[1], prefix); + else emit displayMsg(Message::Notice, "", params[1], prefix); } void Server::handleServerPart(QString prefix, QStringList params) { @@ -511,7 +541,7 @@ void Server::handleServerPart(QString prefix, QStringList params) { chans.remove(params[0]); QString msg; if(params.count() > 1) msg = params[1]; - emit displayMsg(Message::part(params[0], msg, prefix)); + emit displayMsg(Message::Part, params[0], msg, prefix); if(chans.count() > 0) { n["Channels"] = chans; nicks[nick] = n; @@ -532,8 +562,16 @@ void Server::handleServerPing(QString prefix, QStringList params) { void Server::handleServerPrivmsg(QString prefix, QStringList params) { updateNickFromMask(prefix); - if(params.count()<2) emit displayMsg(Message::plain(params[0], "", prefix)); - else emit displayMsg(Message::plain(params[0], params[1], prefix)); + Q_ASSERT(params.count() >= 2); + if(params.count()<2) emit displayMsg(Message::Plain, params[0], "", prefix); + else { + if(params[0] == ownNick) { + emit displayMsg(Message::Plain, "", params[1], prefix, Message::PrivMsg); + } else { + Q_ASSERT(isChannelName(params[0])); // should be channel! + emit displayMsg(Message::Plain, params[0], params[1], prefix); + } + } } void Server::handleServerQuit(QString prefix, QStringList params) { @@ -541,7 +579,7 @@ void Server::handleServerQuit(QString prefix, QStringList params) { Q_ASSERT(nicks.contains(nick)); VarMap chans = nicks[nick]["Channels"].toMap(); foreach(QString c, chans.keys()) { - emit displayMsg(Message::quit(c, params[0], prefix)); + emit displayMsg(Message::Quit, c, params[0], prefix); } nicks.remove(nick); emit nickRemoved(network, nick); @@ -552,31 +590,34 @@ void Server::handleServerTopic(QString prefix, QStringList params) { Q_ASSERT(nicks.contains(nick)); topics[params[0]] = params[1]; emit topicSet(network, params[0], params[1]); - emit displayMsg(Message::server(params[0], tr("%1 has changed topic for %2 to: \"%3\"").arg(nick).arg(params[0]).arg(params[1]))); + emit displayMsg(Message::Server, params[0], tr("%1 has changed topic for %2 to: \"%3\"").arg(nick).arg(params[0]).arg(params[1])); } /* RPL_WELCOME */ void Server::handleServer001(QString prefix, QStringList params) { + // there should be only one param: "Welcome to the Internet Relay Network !@" currentServer = prefix; - ownNick = params[0]; + ownNick = params[0].section(' ', -1, -1).section('!', 0, 0); VarMap n; n["Channels"] = VarMap(); nicks[ownNick] = n; emit ownNickSet(network, ownNick); emit nickAdded(network, ownNick, VarMap()); - emit displayMsg(Message::server("", params[1], prefix)); + emit displayMsg(Message::Server, "", params[0], prefix); // send performlist QStringList performList = networkSettings["Perform"].toString().split( "\n" ); int count = performList.count(); - for ( int a = 0; a < count; a++ ) { - if ( !performList[a].isEmpty() ) { - userInput( network, "", performList[a] ); - } + for(int a = 0; a < count; a++) { + if(!performList[a].isEmpty() ) { + userInput(network, "", performList[a]); + } } } /* RPL_ISUPPORT */ +// TODO Complete 005 handling, also use sensible defaults for non-sent stuff void Server::handleServer005(QString prefix, QStringList params) { + params.removeLast(); foreach(QString p, params) { QString key = p.section("=", 0, 0); QString val = p.section("=", 1); @@ -604,20 +645,20 @@ void Server::handleServer005(QString prefix, QStringList params) { void Server::handleServer331(QString prefix, QStringList params) { topics[params[0]] = ""; emit topicSet(network, params[0], ""); - emit displayMsg(Message::server(params[0], tr("No topic is set for %1.").arg(params[0]))); + emit displayMsg(Message::Server, params[0], tr("No topic is set for %1.").arg(params[0])); } /* RPL_TOPIC */ void Server::handleServer332(QString prefix, QStringList params) { topics[params[0]] = params[1]; emit topicSet(network, params[0], params[1]); - emit displayMsg(Message::server(params[0], tr("Topic for %1 is \"%2\"").arg(params[0]).arg(params[1]))); + emit displayMsg(Message::Server, params[0], tr("Topic for %1 is \"%2\"").arg(params[0]).arg(params[1])); } /* Topic set by... */ void Server::handleServer333(QString prefix, QStringList params) { - emit displayMsg(Message::server(params[0], - tr("Topic set by %1 on %2").arg(params[1]).arg(QDateTime::fromTime_t(params[2].toUInt()).toString()))); + emit displayMsg(Message::Server, params[0], + tr("Topic set by %1 on %2").arg(params[1]).arg(QDateTime::fromTime_t(params[2].toUInt()).toString())); } /* RPL_NAMREPLY */ @@ -651,6 +692,24 @@ void Server::handleServer353(QString prefix, QStringList params) { } } } + +/* RPL_NICKNAMEINUSER */ +void Server::handleServer433(QString prefix, QStringList params) { + QString errnick = params[0]; + emit displayMsg(Message::Error, "", tr("Nick %1 is already taken").arg(errnick)); + // if there is a problem while connecting to the server -> we handle it + // TODO rely on another source... + if(currentServer.isEmpty()) { + QStringList desiredNicks = identity["NickList"].toStringList(); + int nextNick = desiredNicks.indexOf(errnick) + 1; + if (desiredNicks.size() > nextNick) { + putCmd("NICK", QStringList(desiredNicks[nextNick])); + } else { + emit displayMsg(Message::Error, "", "All nicks in nicklist taken... use: /nick to continue"); + } + } +} + /***********************************************************************************/ /* Exception classes for message handling */