X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fserver.cpp;h=3af2119d1013803e15abfa93158f07ed569582ac;hp=44d66ab59c9d708e291e2a9c76557b61c3100b6a;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=cfbd7e0ec3624307cfb612fe4804d58c34b7eec9

diff --git a/src/core/server.cpp b/src/core/server.cpp
index 44d66ab5..3af2119d 100644
--- a/src/core/server.cpp
+++ b/src/core/server.cpp
@@ -24,24 +24,31 @@
 #include <QDateTime>
 
 #include "util.h"
+#include "core.h"
+#include "coresession.h"
 
-Server::Server(UserId uid, QString net) : user(uid), network(net) {
-  QString MQUOTE = QString('\020');
-  ctcpMDequoteHash[MQUOTE + '0'] = QString('\000');
-  ctcpMDequoteHash[MQUOTE + 'n'] = QString('\n');
-  ctcpMDequoteHash[MQUOTE + 'r'] = QString('\r');
-  ctcpMDequoteHash[MQUOTE + MQUOTE] = MQUOTE;
+#include "networkinfo.h"
+#include "synchronizer.h"
 
-  XDELIM = QString('\001');
-  QString XQUOTE = QString('\134');
-  ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
-  ctcpXDelimDequoteHash[XQUOTE + QString('a')] = XDELIM;
-  
-  serverinfo = new ServerInfo();
+#include "ircserverhandler.h"
+#include "userinputhandler.h"
+#include "ctcphandler.h"
+
+Server::Server(UserId uid, uint networkId, QString net)
+  : _userId(uid),
+    _networkId(networkId),
+    _ircServerHandler(new IrcServerHandler(this)),
+    _userInputHandler(new UserInputHandler(this)),
+    _ctcpHandler(new CtcpHandler(this)),
+    _networkInfo(new NetworkInfo(networkId, coreSession()->signalProxy(), this))
+{
+  networkInfo()->setNetworkName(net);
 }
 
 Server::~Server() {
-  delete serverinfo;
+  delete _ircServerHandler;
+  delete _userInputHandler;
+  delete _ctcpHandler;
 }
 
 void Server::run() {
@@ -54,22 +61,15 @@ void Server::run() {
   exec();
 }
 
-void Server::sendState() {
-  VarMap s;
-  VarMap n, t;
-  foreach(QString key, nicks.keys())  { n[key] = nicks[key]; }
-  foreach(QString key, topics.keys()) { t[key] = topics[key];}
-  s["Nicks"] = n;
-  s["Topics"] = t;
-  s["OwnNick"] = ownNick;
-  s["ServerSupports"] = serverSupports;
-  emit serverState(network, s);
-}
-
 void Server::connectToIrc(QString net) {
-  if(net != network) return; // not me!
-  networkSettings = Global::data(user, "Networks").toMap()[net].toMap();
-  identity = Global::data(user, "Identities").toMap()[networkSettings["Identity"].toString()].toMap();
+  if(net != networkName())
+    return; // not me!
+  
+  CoreSession *sess = coreSession();
+  networkSettings = sess->retrieveSessionData("Networks").toMap()[net].toMap();
+  identity = sess->retrieveSessionData("Identities").toMap()[networkSettings["Identity"].toString()].toMap();
+
+  //FIXME this will result in a pretty fuckup if there are no servers in the list
   QList<QVariant> servers = networkSettings["Servers"].toList();
   QString host = servers[0].toMap()["Address"].toString();
   quint16 port = servers[0].toMap()["Port"].toUInt();
@@ -78,841 +78,81 @@ void Server::connectToIrc(QString net) {
 }
 
 void Server::disconnectFromIrc(QString net) {
-  if(net != network) return; // not me!
+  if(net != networkName())
+    return; // not me!
   socket.disconnectFromHost();
 }
 
 void Server::socketHasData() {
   while(socket.canReadLine()) {
     QByteArray s = socket.readLine().trimmed();
-    //qDebug() << "Read" << s;
-    //emit recvRawServerMsg(s); // signal not needed, and we should make sure we consider encodings where we need them
-    //Message *msg = Message::createFromServerString(this, s);
-    handleServerMsg(s);
+    ircServerHandler()->handleServerMsg(s);
   }
 }
 
 void Server::socketError( QAbstractSocket::SocketError err ) {
   //qDebug() << "Socket Error!";
-  //emit error(err);
 }
 
 void Server::socketConnected( ) {
-  emit connected(network);
+  emit connected(networkId());
   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()));
 }
 
 void Server::socketDisconnected( ) {
-  //qDebug() << "Socket disconnected!";
-  emit disconnected(network);
-  topics.clear();
-  nicks.clear();
+  emit disconnected(networkId());
+  // propagate to networkInfo, so we can clear up
 }
 
 void Server::socketStateChanged(QAbstractSocket::SocketState state) {
   //qDebug() << "Socket state changed: " << state;
 }
 
-QString Server::updateNickFromMask(QString mask) {
-  QString user = userFromMask(mask);
-  QString host = hostFromMask(mask);
-  QString nick = nickFromMask(mask);
-  if(nicks.contains(nick) && !user.isEmpty() && !host.isEmpty()) {
-    VarMap n = nicks[nick];
-    if(n["User"].toString() != user || n["Host"].toString() != host) {
-      if(!n["User"].toString().isEmpty() || !n["Host"].toString().isEmpty())
-        qWarning(QString("Strange: Hostmask for nick %1 has changed!").arg(nick).toAscii());
-      n["User"] = user; n["Host"] = host;
-      nicks[nick] = n;
-      emit nickUpdated(network, nick, n);
-    }
-  }
-  return nick;
-}
-
-void Server::userInput(QString net, QString buf, QString msg) {
-  if(net != network) return; // not me!
-  //msg = msg.trimmed(); // remove whitespace from start and end
-  if(msg.isEmpty()) return;
-  if(!msg.startsWith('/')) {
-    msg = QString("/SAY ") + msg;
-  }
-  handleUserInput(buf, msg);
+void Server::userInput(uint netid, QString buf, QString msg) {
+  if(netid != networkId())
+    return; // not me!
+  userInputHandler()->handleUserInput(buf, msg);
 }
 
 void Server::putRawLine(QString s) {
-//  qDebug() << "SentRaw: " << s;
   s += "\r\n";
   socket.write(s.toAscii());
 }
 
 void Server::putCmd(QString cmd, QStringList params, QString prefix) {
-  QString m;
-  if(!prefix.isEmpty()) m += ":" + prefix + " ";
-  m += cmd.toUpper();
-  for(int i = 0; i < params.size() - 1; i++) {
-    m += " " + params[i];
-  }
-  if(!params.isEmpty()) m += " :" + params.last();
-//  qDebug() << "Sent: " << m;
-  m += "\r\n";
-  socket.write(m.toAscii());
-}
-
-/*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */
-void Server::handleServerMsg(QByteArray rawmsg) {
-  try {
-    if(rawmsg.isEmpty()) {
-      qWarning() << "Received empty string from server!";
-      return;
-    }
-    // TODO Implement encoding conversion
-    /* At this point, we have a raw message as a byte array. This needs to be converted to a QString somewhere.
-     * Problem is, that at this point we don't know which encoding to use for the various parts of the message.
-     * This is something the command handler needs to take care of (e.g. PRIVMSG needs to first parse for CTCP,
-     * and then convert the raw strings into the correct encoding.
-     * We _can_ safely assume Server encoding for prefix and cmd, but not for the params. Therefore, we need to
-     * change from a QStringList to a QList<QByteArray> in all the handlers, and have the handlers call decodeString
-     * where needed...
-    */
-    QString msg = QString::fromLatin1(rawmsg);
-
-    // OK, first we split the raw message into its various parts...
-    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.mid(cmd.length());
-
-    // get the parameters
-    QString trailing = "";
-    if(msg.contains(" :")) {
-      trailing = msg.section(" :", 1);
-      msg = msg.section(" :", 0, 0);
-    }
-    if(!msg.isEmpty()) {
-      params << msg.split(' ', QString::SkipEmptyParts);
-    }
-    if(!trailing.isEmpty()) {
-      params << trailing;
-    }
-
-    // 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 > 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();
-    hname = "handleServer" + hname;
-    if(!QMetaObject::invokeMethod(this, hname.toAscii(), Q_ARG(QString, prefix), Q_ARG(QStringList, params))) {
-      // Ok. Default handler it is.
-      defaultServerHandler(cmd, prefix, params);
-    }
-  } catch(Exception e) {
-    emit displayMsg(Message::Error, "", e.msg());
-  }
-}
-
-void Server::defaultServerHandler(QString cmd, QString prefix, QStringList params) {
-  uint num = cmd.toUInt();
-  if(num) {
-    // A lot of server messages don't really need their own handler because they don't do much.
-    // Catch and handle these here.
-    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);
-        break;
-      // Server error messages without param, just display them
-      case 409: case 411: case 412: case 422: case 424: 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:
-      case 431: // ERR_NONICKNAMEGIVEN 
-        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 442:
-      { QString p = params.takeFirst();
-        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 441: case 444: case 461:
-      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();
-        emit displayMsg(Message::Error, "", p + ": " + params.join(" "));
-        break;
-      }
-      // Ignore these commands.
-      case 366: case 376:
-        break;
-
-      // Everything else will be marked in red, so we can add them somewhere.
-      default:
-        emit displayMsg(Message::Error, "", cmd + " " + params.join(" "), prefix);
-    }
-    //qDebug() << prefix <<":"<<cmd<<params;
-  } else {
-    emit displayMsg(Message::Error, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
-    //qDebug() << prefix <<":"<<cmd<<params;
-  }
-}
-
-void Server::handleUserInput(QString bufname, QString usrMsg) {
-  try {
-    /* Looks like we don't need core-side buffers...
-    Buffer *buffer = 0;
-    if(!bufname.isEmpty()) {
-      Q_ASSERT(buffers.contains(bufname));
-      buffer = buffers[bufname];
-    }
-    */
-    QString cmd = usrMsg.section(' ', 0, 0).remove(0, 1).toUpper();
-    QString msg = usrMsg.section(' ', 1);
-    QString hname = cmd.toLower();
-    hname[0] = hname[0].toUpper();
-    hname = "handleUser" + hname;
-    if(!QMetaObject::invokeMethod(this, hname.toAscii(), Q_ARG(QString, bufname), Q_ARG(QString, msg))) {
-        // Ok. Default handler it is.
-      defaultUserHandler(bufname, cmd, msg);
-    }
-  } catch(Exception e) {
-    emit displayMsg(Message::Error, "", e.msg());
-  }
-}
-
-void Server::defaultUserHandler(QString bufname, QString cmd, QString msg) {
-  emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
-
-}
-
-QStringList Server::providesUserHandlers() {
-  QStringList userHandlers;
-  for(int i=0; i < metaObject()->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;
-}
-
-QString Server::ctcpDequote(QString message) {
-  QString dequotedMessage;
-  QString messagepart;
-  QHash<QString, QString>::iterator ctcpquote;
-  
-  // copy dequote Message
-  for(int i = 0; i < message.size(); i++) {
-    messagepart = message[i];
-    if(i+1 < message.size()) {
-      for(ctcpquote = ctcpMDequoteHash.begin(); ctcpquote != ctcpMDequoteHash.end(); ++ctcpquote) {
-        if(message.mid(i,2) == ctcpquote.key()) {
-          dequotedMessage += ctcpquote.value();
-          i++;
-          break;
-        }
-      }
-    }
-    dequotedMessage += messagepart;
-  }
-  return dequotedMessage;
-}
-
-
-QString Server::ctcpXdelimDequote(QString message) {
-  QString dequotedMessage;
-  QString messagepart;
-  QHash<QString, QString>::iterator xdelimquote;
-
-  for(int i = 0; i < message.size(); i++) {
-    messagepart = message[i];
-    if(i+1 < message.size()) {
-      for(xdelimquote = ctcpXDelimDequoteHash.begin(); xdelimquote != ctcpXDelimDequoteHash.end(); ++xdelimquote) {
-        if(message.mid(i,2) == xdelimquote.key()) {
-          messagepart = xdelimquote.value();
-          i++;
-          break;
-        }
-      }
-    }
-    dequotedMessage += messagepart;
-  }
-  return dequotedMessage;
-}
-
-QStringList Server::parseCtcp(CtcpType ctcptype, QString prefix, QString target, QString message) {
-  QStringList messages;
-  QString ctcp;
-  
-  //lowlevel message dequote
-  QString dequotedMessage = ctcpDequote(message);
+  QString msg;
+  if(!prefix.isEmpty())
+    msg += ":" + prefix + " ";
+  msg += cmd.toUpper();
   
-  // extract tagged / extended data
-  while(dequotedMessage.contains(XDELIM)) {
-    messages << dequotedMessage.section(XDELIM,0,0);
-    ctcp = ctcpXdelimDequote(dequotedMessage.section(XDELIM,1,1));
-    dequotedMessage = dequotedMessage.section(XDELIM,2,2);
-    
-    //dispatch the ctcp command
-    QString ctcpcmd = ctcp.section(' ', 0, 0);
-    QString ctcpparam = ctcp.section(' ', 1);
-    
-    QString hname = ctcpcmd.toLower();
-    hname[0] = hname[0].toUpper();
-    hname = "handleCtcp" + hname;
-    if(!QMetaObject::invokeMethod(this, hname.toAscii(), Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam))) {
-      // Ok. Default handler it is.
-      defaultCtcpHandler(ctcptype, prefix, ctcpcmd, target, ctcpparam);
-    }
-  }
-  if(!dequotedMessage.isEmpty()) {
-    messages << dequotedMessage;
+  for(int i = 0; i < params.size() - 1; i++) {
+    msg += " " + params[i];
   }
-  return messages;
-}
-
-QString Server::ctcpPack(QString ctcpTag, QString message) {
-  return XDELIM + ctcpTag + ' ' + message + XDELIM;
-}
-
-void Server::ctcpQuery(QString bufname, QString ctcpTag, QString message) {
-  QStringList params;
-  params << bufname << ctcpPack(ctcpTag, message);
-  putCmd("PRIVMSG", params); 
-}
-
-void Server::ctcpReply(QString bufname, QString ctcpTag, QString message) {
-  QStringList params;
-  params << bufname << ctcpPack(ctcpTag, message);
-  putCmd("NOTICE", params);
-}
-
-/**********************************************************************************/
-
-/*
-void Server::handleUser(QString bufname, QString msg) {
-
-
-}
-*/
-
-void Server::handleUserAway(QString bufname, QString msg) {
-  putCmd("AWAY", QStringList(msg));
-}
-
-void Server::handleUserDeop(QString bufname, QString msg) {
-  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-  QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'o';
-  QStringList params;
-  params << bufname << m << nicks;
-  putCmd("MODE", params);
-}
-
-void Server::handleUserDevoice(QString bufname, QString msg) {
-  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-  QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v';
-  QStringList params;
-  params << bufname << m << nicks;
-  putCmd("MODE", params);
-}
-
-void Server::handleUserInvite(QString bufname, QString msg) {
-  QStringList params;
-  params << msg << bufname;
-  putCmd("INVITE", params);
-}
-
-void Server::handleUserJoin(QString bufname, QString msg) {
-  putCmd("JOIN", QStringList(msg));
-}
-
-void Server::handleUserKick(QString bufname, QString msg) {
-  QStringList params;
-  params << bufname << msg.split(' ', QString::SkipEmptyParts);
-  putCmd("KICK", params);
-}
-
-void Server::handleUserList(QString bufname, QString msg) {
-  putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
-}
-
-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);
-  if(nick.isEmpty() || msg.isEmpty()) return;
-  QStringList params;
-  params << nick << msg;
-  putCmd("PRIVMSG", params);
-}
-
-void Server::handleUserNick(QString bufname, QString msg) {
-  QString nick = msg.section(' ', 0, 0);
-  putCmd("NICK", QStringList(nick));
-}
-
-void Server::handleUserOp(QString bufname, QString msg) {
-  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-  QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o';
-  QStringList params;
-  params << bufname << m << nicks;
-  putCmd("MODE", params);
-}
-
-void Server::handleUserPart(QString bufname, QString msg) {
-  QStringList params;
-  params << bufname << msg;
-  putCmd("PART", params);
-}
+  if(!params.isEmpty())
+    msg += " :" + params.last();
 
-// 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));
-}
-
-void Server::handleUserQuote(QString bufname, QString msg) {
   putRawLine(msg);
 }
 
-void Server::handleUserSay(QString bufname, QString msg) {
-  if(bufname.isEmpty()) return;  // server buffer
-  QStringList params;
-  params << bufname << msg;
-  putCmd("PRIVMSG", params);
-  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::handleUserMe(QString bufname, QString msg) {
-  if(bufname.isEmpty()) return; // server buffer
-  ctcpQuery(bufname, "ACTION", msg);
-  emit displayMsg(Message::Action, bufname, msg, ownNick);
-}
-
-void Server::handleUserTopic(QString bufname, QString msg) {
-  if(bufname.isEmpty()) return;
-  QStringList params;
-  params << bufname << msg;
-  putCmd("TOPIC", params);
-}
-
-void Server::handleUserVoice(QString bufname, QString msg) {
-  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
-  QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'v';
-  QStringList params;
-  params << bufname << m << nicks;
-  putCmd("MODE", params);
-}
-
-/**********************************************************************************/
-
-void Server::handleServerJoin(QString prefix, QStringList params) {
-  Q_ASSERT(params.count() == 1);
-  QString nick = updateNickFromMask(prefix);
-  emit displayMsg(Message::Join, params[0], params[0], prefix);
-  if(nick == ownNick) {
-  //  Q_ASSERT(!buffers.contains(params[0]));  // cannot join a buffer twice!
-  //  Buffer *buf = new Buffer(params[0]);
-  //  buffers[params[0]] = buf;
-    topics[params[0]] = "";
-    emit topicSet(network, params[0], "");
-  } //else {
-    VarMap n;
-    if(nicks.contains(nick)) {
-      n = nicks[nick];
-      VarMap chans = n["Channels"].toMap();
-      // Q_ASSERT(!chans.keys().contains(params[0])); TODO uncomment
-      chans[params[0]] = VarMap();
-      n["Channels"] = chans;
-      nicks[nick] = n;
-      emit nickUpdated(network, nick, n);
-    } else {
-      VarMap chans;
-      chans[params[0]] = VarMap();
-      n["Channels"] = chans;
-      n["User"] = userFromMask(prefix);
-      n["Host"] = hostFromMask(prefix);
-      nicks[nick] = n;
-      emit nickAdded(network, nick, n);
-    }
-    //emit displayMsg(Message::Join, params[0], params[0], prefix);
-  //}
-}
-
-void Server::handleServerKick(QString prefix, QStringList params) {
-  QString kicker = updateNickFromMask(prefix);
-  QString nick = params[1];
-  Q_ASSERT(nicks.contains(nick));
-  VarMap n = nicks[nick];
-  VarMap chans = n["Channels"].toMap();
-  Q_ASSERT(chans.contains(params[0]));
-  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);
-  if(chans.count() > 0) {
-    n["Channels"] = chans;
-    nicks[nick] = n;
-    emit nickUpdated(network, nick, n);
-  } else {
-    nicks.remove(nick);
-    emit nickRemoved(network, nick);
-  }
-  if(nick == ownNick) {
-    topics.remove(params[0]);
-  }
-}
-
-void Server::handleServerMode(QString prefix, QStringList params) {
-  if(isChannelName(params[0])) {
-    // TODO only channel-user modes supported by now
-    QString prefixes = serverSupports["PrefixModes"].toString();
-    QString modes = params[1];
-    int p = 2;
-    int m = 0;
-    bool add = true;
-    while(m < modes.length()) {
-      if(modes[m] == '+') { add = true; m++; continue; }
-      if(modes[m] == '-') { add = false; m++; continue; }
-      if(prefixes.contains(modes[m])) {  // it's a user channel mode
-        Q_ASSERT(params.count() > m);
-        QString nick = params[p++];
-        if(nicks.contains(nick)) {  // sometimes, a server might try to set a MODE on a nick that is no longer there
-          VarMap n = nicks[nick]; VarMap clist = n["Channels"].toMap(); VarMap chan = clist[params[0]].toMap();
-          QString mstr = chan["Mode"].toString();
-          add ? mstr += modes[m] : mstr.remove(modes[m]);
-          chan["Mode"] = mstr; clist[params[0]] = chan; n["Channels"] = clist; nicks[nick] = n;
-          emit nickUpdated(network, nick, n);
-        }
-        m++;
-      } else {
-        // TODO add more modes
-        m++;
-      }
-    }
-    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(" "));
-  }
-}
-
-void Server::handleServerNick(QString prefix, QStringList params) {
-  QString oldnick = updateNickFromMask(prefix);
-  QString newnick = params[0];
-  VarMap v = nicks.take(oldnick);
-  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); }
-  }
-  emit nickRenamed(network, oldnick, newnick);
-  if(oldnick == ownNick) {
-    ownNick = newnick;
-    emit ownNickSet(network, newnick);
-  }
-}
-
-void Server::handleServerNotice(QString prefix, QStringList params) {
-  //Message msg(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) {
-  QString nick = updateNickFromMask(prefix);
-  Q_ASSERT(nicks.contains(nick));
-  VarMap n = nicks[nick];
-  VarMap chans = n["Channels"].toMap();
-  Q_ASSERT(chans.contains(params[0]));
-  chans.remove(params[0]);
-  QString msg;
-  if(params.count() > 1) msg = params[1];
-  emit displayMsg(Message::Part, params[0], msg, prefix);
-  if(chans.count() > 0) {
-    n["Channels"] = chans;
-    nicks[nick] = n;
-    emit nickUpdated(network, nick, n);
-  } else {
-    nicks.remove(nick);
-    emit nickRemoved(network, nick);
-  }
-  if(nick == ownNick) {
-    Q_ASSERT(topics.contains(params[0]));
-    topics.remove(params[0]);
-  }
-}
-
-void Server::handleServerPing(QString prefix, QStringList params) {
-  putCmd("PONG", params);
-}
-
-void Server::handleServerPrivmsg(QString prefix, QStringList params) {
-  updateNickFromMask(prefix);
-  Q_ASSERT(params.count() >= 2);
-  if(params.count()<2) emit displayMsg(Message::Plain, params[0], "", prefix);
-  else {
-    // it's possible to pack multiple privmsgs into one param using ctcp
-    QStringList messages = parseCtcp(Server::CtcpQuery, prefix, params[0], params[1]);
-    if(params[0].toLower() == ownNick.toLower()) {  // Freenode sends nickname in lower case!
-      foreach(QString message, messages) {
-        if(!message.isEmpty()) {
-          emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg);
-        }
-      }
-      
-    } else {
-      //qDebug() << prefix << params;
-      Q_ASSERT(isChannelName(params[0]));  // should be channel!
-      foreach(QString message, messages) {
-        if(!message.isEmpty()) {
-          emit displayMsg(Message::Plain, params[0], message, prefix);
-        }
-      }
-    }
-  }
-}
-
-void Server::handleServerQuit(QString prefix, QStringList params) {
-  QString nick = updateNickFromMask(prefix);
-  Q_ASSERT(nicks.contains(nick));
-  VarMap chans = nicks[nick]["Channels"].toMap();
-  QString msg;
-  if(params.count()) msg = params[0];
-  foreach(QString c, chans.keys()) {
-    emit displayMsg(Message::Quit, c, msg, prefix);
-  }
-  nicks.remove(nick);
-  emit nickRemoved(network, nick);
-}
-
-void Server::handleServerTopic(QString prefix, QStringList params) {
-  QString nick = updateNickFromMask(prefix);
-  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]));
-}
-
-/* RPL_WELCOME */
-void Server::handleServer001(QString prefix, QStringList params) {
-  // there should be only one param: "Welcome to the Internet Relay Network <nick>!<user>@<host>"
-  currentServer = prefix;
-  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[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]);
-    }
-  }
-}
-
-/* RPL_ISUPPORT */
-// TODO Complete 005 handling, also use sensible defaults for non-sent stuff
-void Server::handleServer005(QString prefix, QStringList params) {
-  //qDebug() << prefix << params;
-  params.removeLast();
-  foreach(QString p, params) {
-    QString key = p.section("=", 0, 0);
-    QString val = p.section("=", 1);
-    serverSupports[key] = val;
-    // handle some special cases
-    if(key == "PREFIX") {
-      VarMap foo; QString modes, prefixes;
-      Q_ASSERT(val.contains(')') && val.startsWith('('));
-      int m = 1, p;
-      for(p = 2; p < val.length(); p++) if(val[p] == ')') break;
-      p++;
-      for(; val[m] != ')'; m++, p++) {
-        Q_ASSERT(p < val.length());
-        foo[QString(val[m])] = QString(val[p]);
-        modes += val[m]; prefixes += val[p];
-      }
-      serverSupports["PrefixModes"] = modes; serverSupports["Prefixes"] = prefixes;
-      serverSupports["ModePrefixMap"] = foo;
-    }
-  }
-}
-
-
-/* RPL_NOTOPIC */
-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]));
-}
-
-/* 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]));
-}
-
-/* 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()));
-}
-
-/* RPL_NAMREPLY */
-void Server::handleServer353(QString prefix, QStringList params) {
-  params.removeFirst(); // = or *
-  QString buf = params.takeFirst();
-  QString prefixes = serverSupports["Prefixes"].toString();
-  foreach(QString nick, params[0].split(' ')) {
-    QString mode = "", pfx = "";
-    if(prefixes.contains(nick[0])) {
-      pfx = nick[0];
-      for(int i = 0;; i++)
-        if(prefixes[i] == nick[0]) { mode = serverSupports["PrefixModes"].toString()[i]; break; }
-      nick.remove(0,1);
-    }
-    VarMap c; c["Mode"] = mode; c["Prefix"] = pfx;
-    if(nicks.contains(nick)) {
-      VarMap n = nicks[nick];
-      VarMap chans = n["Channels"].toMap();
-      chans[buf] = c;
-      n["Channels"] = chans;
-      nicks[nick] = n;
-      emit nickUpdated(network, nick, n);
-    } else {
-      VarMap n; VarMap c; VarMap chans;
-      c["Mode"] = mode;
-      chans[buf] = c;
-      n["Channels"] = chans;
-      nicks[nick] = n;
-      emit nickAdded(network, nick, n);
-    }
-  }
-}
-
-/* ERR_ERRONEUSNICKNAME */
-void Server::handleServer432(QString prefix, QStringList params) {
-  if(params.size() < 2) {
-    // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase:
-    // nick @@@
-    // :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 <othernick> to continue or clean up your nicklist"));
-  } else {
-    QString errnick = params[0];
-    emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").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, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
-      }
-    }
-  }
-}
-
-/* ERR_NICKNAMEINUSE */
-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, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
-    }
-  }
-}
-
-/***********************************************************************************/
-// CTCP HANDLER
 
-void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target, QString param) {
-  emit displayMsg(Message::Action, target, param, prefix);
-}
-
-void Server::handleCtcpPing(CtcpType ctcptype, QString prefix, QString target, QString param) {
-  if(ctcptype == CtcpQuery) {
-    ctcpReply(nickFromMask(prefix), "PING", param);
-    emit displayMsg(Message::Server, "", tr("Received CTCP PING request by %1").arg(prefix));
-  } else {
-    // display ping answer
-  }
+uint Server::networkId() const {
+  return _networkId;
 }
 
-void Server::handleCtcpVersion(CtcpType ctcptype, QString prefix, QString target, QString param) {
-  if(ctcptype == CtcpQuery) {
-    // FIXME use real Info about quassel :)
-    //ctcpReply(nickFromMask(prefix), "VERSION", QString("Quassel:pre Release:*nix"));
-    ctcpReply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (Pre-Release) - http://www.quassel-irc.org"));
-    emit displayMsg(Message::Server, "", tr("Received CTCP VERSION request by %1").arg(prefix));
-  } else {
-    // TODO display Version answer
-  }
+QString Server::networkName() {
+  return networkInfo()->networkName();
 }
 
-void Server::defaultCtcpHandler(CtcpType ctcptype, QString prefix, QString cmd, QString target, QString param) {
-  emit displayMsg(Message::Error, "", tr("Received unknown CTCP %1 by %2").arg(cmd).arg(prefix));
+CoreSession *Server::coreSession() const {
+  return Core::session(userId());
 }
 
-
-/***********************************************************************************/
-
 /* Exception classes for message handling */
 Server::ParseError::ParseError(QString cmd, QString prefix, QStringList params) {
   _msg = QString("Command Parse Error: ") + cmd + params.join(" ");
-
 }
 
 Server::UnknownCmdError::UnknownCmdError(QString cmd, QString prefix, QStringList params) {
   _msg = QString("Unknown Command: ") + cmd;
-
 }