X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=445ca7c6f962662e7709f06e2926868a51307482;hp=90f496e38678eaddd770f1cb768219dc46d73106;hb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;hpb=a7b0b0bee42d05ce5af425ed1809e9288403914d

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 90f496e3..445ca7c6 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-10 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -21,86 +21,112 @@
 
 #include "util.h"
 
-#include "server.h"
-#include "networkinfo.h"
+#include "coresession.h"
+#include "coreirclisthelper.h"
+#include "coreidentity.h"
 #include "ctcphandler.h"
 
 #include "ircuser.h"
-#include "ircchannel.h"
+#include "coreircchannel.h"
+#include "logger.h"
 
 #include <QDebug>
 
-IrcServerHandler::IrcServerHandler(Server *parent)
-  : BasicHandler(parent) {
+IrcServerHandler::IrcServerHandler(CoreNetwork *parent)
+  : CoreBasicHandler(parent),
+    _whois(false)
+{
+  connect(parent, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetsplits()));
 }
 
 IrcServerHandler::~IrcServerHandler() {
+  destroyNetsplits();
 }
 
 /*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */
-void IrcServerHandler::handleServerMsg(QByteArray rawmsg) {
-  try {
-    if(rawmsg.isEmpty()) {
-      qWarning() << "Received empty string from server!";
+void IrcServerHandler::handleServerMsg(QByteArray msg) {
+  if(msg.isEmpty()) {
+    qWarning() << "Received empty string from server!";
+    return;
+  }
+
+  // Now we split the raw message into its various parts...
+  QString prefix = "";
+  QByteArray trailing;
+  QString cmd;
+
+  // First, check for a trailing parameter introduced by " :", since this might screw up splitting the msg
+  // NOTE: This assumes that this is true in raw encoding, but well, hopefully there are no servers running in japanese on protocol level...
+  int idx = msg.indexOf(" :");
+  if(idx >= 0) {
+    if(msg.length() > idx + 2)
+      trailing = msg.mid(idx + 2);
+    msg = msg.left(idx);
+  }
+  // OK, now it is safe to split...
+  QList<QByteArray> params = msg.split(' ');
+
+  // This could still contain empty elements due to (faulty?) ircds sending multiple spaces in a row
+  // Also, QByteArray is not nearly as convenient to work with as QString for such things :)
+  QList<QByteArray>::iterator iter = params.begin();
+  while(iter != params.end()) {
+    if(iter->isEmpty())
+      iter = params.erase(iter);
+    else
+      ++iter;
+  }
+
+  if(!trailing.isEmpty()) params << trailing;
+  if(params.count() < 1) {
+    qWarning() << "Received invalid string from server!";
+    return;
+  }
+
+  QString foo = serverDecode(params.takeFirst());
+
+  // with SASL, the command is 'AUTHENTICATE +' and we should check for this here.
+  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);
+    prefix = foo;
+    if(params.count() < 1) {
+      qWarning() << "Received invalid 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;
-
-    // a colon as the first chars indicates the existance of a prefix
-    if(msg[0] == ':') {
-      msg.remove(0,1);
-      prefix = msg.section(' ', 0, 0);
-      msg = msg.section(' ', 1);
-    }
+    foo = serverDecode(params.takeFirst());
+  }
 
-    // next string without a whitespace is the command
-    cmd = msg.section(' ', 0, 0).toUpper();
-    msg = msg.mid(cmd.length());
+  // next string without a whitespace is the command
+  cmd = foo.trimmed().toUpper();
 
-    // 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) {
+    if(params.count() == 0) {
+      qWarning() << "Message received from server violates RFC and is ignored!" << msg;
+      return;
     }
+    _target = serverDecode(params.takeFirst());
+  } else {
+    _target = QString();
+  }
 
-    // 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();
-    }
+  // note that the IRC server is still alive
+  network()->resetPingTimeout();
 
-    // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
-    handle(cmd, Q_ARG(QString, prefix), Q_ARG(QStringList, params));
-    //handle(cmd, Q_ARG(QString, prefix));
-  } catch(Exception e) {
-    emit displayMsg(Message::Error, "", e.msg());
-  }
+  // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
+  handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList<QByteArray>, params));
 }
 
 
-void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QStringList params) {
+void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList<QByteArray> &rawparams) {
+  // we assume that all this happens in server encoding
+  QStringList params = serverDecode(rawparams);
   uint num = cmd.toUInt();
   if(num) {
     // A lot of server messages don't really need their own handler because they don't do much.
@@ -108,39 +134,58 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QStringList p
     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, BufferInfo::StatusBuffer, "", 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);
+      case 431: // ERR_NONICKNAMEGIVEN
+        emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", 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);
+      case 401: {
+        QString target = params.takeFirst();
+        emit displayMsg(Message::Error, target, params.join(" ") + " " + target, prefix, Message::Redirected);
+        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
-      case 413: case 414: case 423: case 441: case 444: case 461:
+      case 413: case 414: case 423: case 441: case 444: case 461:  // FIXME see below for the 47x codes
       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(" "));
+      {
+        QString p = params.takeFirst();
+        emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", p + ": " + params.join(" "));
         break;
       }
       // Ignore these commands.
-      case 366: case 376:
+      case 321: case 366: case 376:
         break;
 
+      case 903: case 904: case 905: case 906: case 907:
+      {
+        network()->putRawLine("CAP END");
+        emit displayMsg(Message::Info, BufferInfo::StatusBuffer, "", "CAP: " + params.join(""));
+      }
       // Everything else will be marked in red, so we can add them somewhere.
       default:
-        emit displayMsg(Message::Error, "", cmd + " " + params.join(" "), prefix);
+        if(_whois) {
+          // many nets define their own WHOIS fields. we fetch those not in need of special attention here:
+          emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix);
+        } else {
+          if(coreSession()->ircListHelper()->requestInProgress(network()->networkId()))
+            coreSession()->ircListHelper()->reportError(params.join(" "));
+          else
+            emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix);
+        }
     }
     //qDebug() << prefix <<":"<<cmd<<params;
   } else {
-    emit displayMsg(Message::Error, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
     //qDebug() << prefix <<":"<<cmd<<params;
   }
 }
@@ -148,293 +193,1019 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QStringList p
 //******************************/
 // IRC SERVER HANDLER
 //******************************/
-void IrcServerHandler::handleJoin(QString prefix, QStringList params) {
-  Q_ASSERT(params.count() == 1);
-  QString channel = params[0];
-  IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
-  emit displayMsg(Message::Join, channel, channel, prefix);
+void IrcServerHandler::handleJoin(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleJoin()", params, 1))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+
+  bool handledByNetsplit = false;
+  if(!_netsplits.empty()) {
+    foreach(Netsplit* n, _netsplits) {
+      handledByNetsplit = n->userJoined(prefix, channel);
+      if(handledByNetsplit)
+        break;
+    }
+  }
+
+  // normal join
+  if(!handledByNetsplit) {
+    emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix);
+    ircuser->joinChannel(channel);
+  }
+  //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params;
 
-  ircuser->joinChannel(channel);
+  if(network()->isMe(ircuser)) {
+    network()->setChannelJoined(channel);
+    putCmd("MODE", params[0]); // we want to know the modes of the channel we just joined, so we ask politely
+  }
 }
 
-void IrcServerHandler::handleKick(QString prefix, QStringList params) {
-  networkInfo()->updateNickFromMask(prefix);
-  IrcUser *victim = networkInfo()->ircUser(params[1]);
-  QString channel = params[0];
-  Q_ASSERT(victim);
+void IrcServerHandler::handleKick(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleKick()", params, 2))
+    return;
 
+  network()->updateNickFromMask(prefix);
+  IrcUser *victim = network()->ircUser(params[1]);
+  if(!victim)
+    return;
+
+  QString channel = serverDecode(params[0]);
   victim->partChannel(channel);
 
   QString msg;
   if(params.count() > 2) // someone got a reason!
-    msg = QString("%1 %2").arg(victim->nick()).arg(params[2]);
+    msg = QString("%1 %2").arg(victim->nick()).arg(channelDecode(channel, params[2]));
   else
     msg = victim->nick();
-  
-  emit displayMsg(Message::Kick, params[0], msg, prefix);
+
+  emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix);
+  //if(network()->isMe(victim)) network()->setKickedFromChannel(channel);
 }
 
-void IrcServerHandler::handleMode(QString prefix, QStringList params) {
-  Q_UNUSED(prefix)
-  Q_UNUSED(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
-//           QVariantMap n = nicks[nick]; QVariantMap clist = n["Channels"].toMap(); QVariantMap 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]));
-//     //QVariantMap n = nicks[params[0]].toMap();
-//     //QString mode = n["Mode"].toString();
-//     emit displayMsg(Message::Mode, "", params.join(" "));
-//   }
-}
-
-void IrcServerHandler::handleNick(QString prefix, QStringList params) {
-  IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
-  Q_ASSERT(ircuser);
-  QString newnick = params[0];
-  QString oldnick = ircuser->nick();
+void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleMode()", params, 2))
+    return;
 
-  foreach(QString channel, ircuser->channels()) {
-    if(networkInfo()->isMyNick(oldnick)) {
-      emit displayMsg(Message::Nick, channel, newnick, newnick);
-    } else {
-      emit displayMsg(Message::Nick, channel, newnick, prefix);
+  if(network()->isChannelName(serverDecode(params[0]))) {
+    // Channel Modes
+    emit displayMsg(Message::Mode, BufferInfo::ChannelBuffer, serverDecode(params[0]), serverDecode(params).join(" "), prefix);
+
+    IrcChannel *channel = network()->ircChannel(params[0]);
+    if(!channel) {
+      // we received mode information for a channel we're not in. that means probably we've just been kicked out or something like that
+      // anyways: we don't have a place to store the data --> discard the info.
+      return;
+    }
+
+    QString modes = params[1];
+    bool add = true;
+    int paramOffset = 2;
+    for(int c = 0; c < modes.length(); c++) {
+      if(modes[c] == '+') {
+        add = true;
+        continue;
+      }
+      if(modes[c] == '-') {
+        add = false;
+        continue;
+      }
+
+      if(network()->prefixModes().contains(modes[c])) {
+        // user channel modes (op, voice, etc...)
+        if(paramOffset < params.count()) {
+          IrcUser *ircUser = network()->ircUser(params[paramOffset]);
+          if(!ircUser) {
+            qWarning() << Q_FUNC_INFO << "Unknown IrcUser:" << params[paramOffset];
+          } else {
+            if(add) {
+              bool handledByNetsplit = false;
+              if(!_netsplits.empty()) {
+                foreach(Netsplit* n, _netsplits) {
+                  handledByNetsplit = n->userAlreadyJoined(ircUser->hostmask(), channel->name());
+                  if(handledByNetsplit) {
+                    n->addMode(ircUser->hostmask(), channel->name(), QString(modes[c]));
+                    break;
+                  }
+                }
+              }
+              if(!handledByNetsplit)
+                channel->addUserMode(ircUser, QString(modes[c]));
+            }
+            else
+              channel->removeUserMode(ircUser, QString(modes[c]));
+          }
+        } else {
+          qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
+        }
+        paramOffset++;
+      } else {
+        // regular channel modes
+        QString value;
+        Network::ChannelModeType modeType = network()->channelModeType(modes[c]);
+        if(modeType == Network::A_CHANMODE || modeType == Network::B_CHANMODE || (modeType == Network::C_CHANMODE && add)) {
+          if(paramOffset < params.count()) {
+            value = params[paramOffset];
+          } else {
+            qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
+          }
+          paramOffset++;
+        }
+
+        if(add)
+          channel->addChannelMode(modes[c], value);
+        else
+          channel->removeChannelMode(modes[c], value);
+      }
     }
+
+  } else {
+    // pure User Modes
+    IrcUser *ircUser = network()->newIrcUser(params[0]);
+    QString modeString(serverDecode(params[1]));
+    QString addModes;
+    QString removeModes;
+    bool add = false;
+    for(int c = 0; c < modeString.count(); c++) {
+      if(modeString[c] == '+') {
+        add = true;
+        continue;
+      }
+      if(modeString[c] == '-') {
+        add = false;
+        continue;
+      }
+      if(add)
+        addModes += modeString[c];
+      else
+        removeModes += modeString[c];
+    }
+    if(!addModes.isEmpty())
+      ircUser->addUserModes(addModes);
+    if(!removeModes.isEmpty())
+      ircUser->removeUserModes(removeModes);
+
+    // FIXME: redirect
+    emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix);
+  }
+}
+
+void IrcServerHandler::handleNick(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleNick()", params, 1))
+    return;
+
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+  if(!ircuser) {
+    qWarning() << "IrcServerHandler::handleNick(): Unknown IrcUser!";
+    return;
   }
+  QString newnick = serverDecode(params[0]);
+  QString oldnick = ircuser->nick();
+
+  QString sender = network()->isMyNick(oldnick)
+    ? newnick
+    : prefix;
+
+
+  // the order is cruicial
+  // otherwise the client would rename the buffer, see that the assigned ircuser doesn't match anymore
+  // and remove the ircuser from the querybuffer leading to a wrong on/offline state
   ircuser->setNick(newnick);
+  coreSession()->renameBuffer(network()->networkId(), newnick, oldnick);
+
+  foreach(QString channel, ircuser->channels())
+    emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender);
 }
 
-void IrcServerHandler::handleNotice(QString prefix, QStringList params) {
-  if(networkInfo()->currentServer().isEmpty() || networkInfo()->currentServer() == prefix)
-    emit displayMsg(Message::Server, "", params[1], prefix);
-  else
-    emit displayMsg(Message::Notice, "", params[1], prefix);
+void IrcServerHandler::handleNotice(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleNotice()", params, 2))
+    return;
+
+
+  QStringList targets = serverDecode(params[0]).split(',', QString::SkipEmptyParts);
+  QStringList::const_iterator targetIter;
+  for(targetIter = targets.constBegin(); targetIter != targets.constEnd(); targetIter++) {
+    QString target = *targetIter;
+
+    // special treatment for welcome messages like:
+    // :ChanServ!ChanServ@services. NOTICE egst :[#apache] Welcome, this is #apache. Please read the in-channel topic message. This channel is being logged by IRSeekBot. If you have any question please see http://blog.freenode.net/?p=68
+    if(!network()->isChannelName(target)) {
+      QString msg = serverDecode(params[1]);
+      QRegExp welcomeRegExp("^\\[([^\\]]+)\\] ");
+      if(welcomeRegExp.indexIn(msg) != -1) {
+        QString channelname = welcomeRegExp.cap(1);
+        msg = msg.mid(welcomeRegExp.matchedLength());
+        CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(network()->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
+        if(chan && !chan->receivedWelcomeMsg()) {
+          chan->setReceivedWelcomeMsg();
+          emit displayMsg(Message::Notice, BufferInfo::ChannelBuffer, channelname, msg, prefix);
+          continue;
+        }
+      }
+    }
+
+    if(prefix.isEmpty() || target == "AUTH") {
+      target = "";
+    } else {
+      if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+        target = target.mid(1);
+      if(!network()->isChannelName(target))
+        target = nickFromMask(prefix);
+    }
+
+    network()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
+  }
+
 }
 
-void IrcServerHandler::handlePart(QString prefix, QStringList params) {
-  IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
-  QString channel = params[0];
-  Q_ASSERT(ircuser);
-  
+void IrcServerHandler::handlePart(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handlePart()", params, 1))
+    return;
+
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+  QString channel = serverDecode(params[0]);
+  if(!ircuser) {
+    qWarning() << "IrcServerHandler::handlePart(): Unknown IrcUser!";
+    return;
+  }
+
   ircuser->partChannel(channel);
-  
+
   QString msg;
   if(params.count() > 1)
-    msg = params[1];
-  
-  emit displayMsg(Message::Part, params[0], msg, prefix);
+    msg = userDecode(ircuser->nick(), params[1]);
+
+  emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix);
+  if(network()->isMe(ircuser)) network()->setChannelParted(channel);
 }
 
-void IrcServerHandler::handlePing(QString prefix, QStringList params) {
-  Q_UNUSED(prefix)
-  emit putCmd("PONG", params);
+void IrcServerHandler::handlePing(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  putCmd("PONG", params);
 }
 
-void IrcServerHandler::handlePrivmsg(QString prefix, QStringList params) {
-  networkInfo()->updateNickFromMask(prefix);
-  Q_ASSERT(params.count() >= 2);
-  if(params.count()<2)
-    emit displayMsg(Message::Plain, params[0], "", prefix);
-  else {
+void IrcServerHandler::handlePong(const QString &prefix, const QList<QByteArray> &params) {
+  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<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handlePrivmsg()", params, 1))
+    return;
+
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+  if(!ircuser) {
+    qWarning() << "IrcServerHandler::handlePrivmsg(): Unknown IrcUser!";
+    return;
+  }
+
+  if(params.isEmpty()) {
+    qWarning() << "IrcServerHandler::handlePrivmsg(): received PRIVMSG without target or message from:" << prefix;
+    return;
+  }
+
+  QString senderNick = nickFromMask(prefix);
+
+  QByteArray msg = params.count() < 2
+    ? QByteArray("")
+    : params[1];
+
+  QStringList targets = serverDecode(params[0]).split(',', QString::SkipEmptyParts);
+  QStringList::const_iterator targetIter;
+  for(targetIter = targets.constBegin(); targetIter != targets.constEnd(); targetIter++) {
+    const QString &target = network()->isChannelName(*targetIter)
+      ? *targetIter
+      : senderNick;
+
     // it's possible to pack multiple privmsgs into one param using ctcp
-    QStringList messages = server->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, params[0], params[1]);
+    // - > we let the ctcpHandler do the work
+    network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
+  }
+}
 
-    // are we the target or is it a channel?
-    if(networkInfo()->isMyNick(params[0])) {
-      foreach(QString message, messages) {
-        if(!message.isEmpty()) {
-          emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg);
-        }
-      }
-   
-    } else {
-      Q_ASSERT(isChannelName(params[0]));  // should be channel!
-      foreach(QString message, messages) {
-        if(!message.isEmpty()) {
-          emit displayMsg(Message::Plain, params[0], message, prefix);
-        }
-      }
+void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray> &params) {
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+  if(!ircuser) return;
+
+  QString msg;
+  if(params.count() > 0)
+    msg = userDecode(ircuser->nick(), params[0]);
+
+  // check if netsplit
+  if(Netsplit::isNetsplit(msg)) {
+    Netsplit *n;
+    if(!_netsplits.contains(msg)) {
+      n = new Netsplit();
+      connect(n, SIGNAL(finished()), this, SLOT(handleNetsplitFinished()));
+      connect(n, SIGNAL(netsplitJoin(const QString&, const QStringList&, const QStringList&, const QString&)),
+              this, SLOT(handleNetsplitJoin(const QString&, const QStringList&, const QStringList&, const QString&)));
+      connect(n, SIGNAL(netsplitQuit(const QString&, const QStringList&, const QString&)),
+              this, SLOT(handleNetsplitQuit(const QString&, const QStringList&, const QString&)));
+      connect(n, SIGNAL(earlyJoin(const QString&, const QStringList&, const QStringList&)),
+              this, SLOT(handleEarlyNetsplitJoin(const QString&, const QStringList&, const QStringList&)));
+      _netsplits.insert(msg, n);
     }
+    else {
+      n = _netsplits[msg];
+    }
+    // add this user to the netsplit
+    n->userQuit(prefix, ircuser->channels(),msg);
+  }
+  // normal quit
+  else {
+    foreach(QString channel, ircuser->channels())
+      emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
+    ircuser->quit();
   }
 }
 
-void IrcServerHandler::handleQuit(QString prefix, QStringList params) {
-  IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
-  Q_ASSERT(ircuser);
+void IrcServerHandler::handleTopic(const QString &prefix, const QList<QByteArray> &params) {
+  if(!checkParamCount("IrcServerHandler::handleTopic()", params, 1))
+    return;
 
-  QString msg;
-  if(params.count())
-    msg = params[0];
-  
-  foreach(QString channel, ircuser->channels())
-    emit displayMsg(Message::Quit, channel, msg, prefix);
+  IrcUser *ircuser = network()->updateNickFromMask(prefix);
+  if(!ircuser)
+    return;
+
+  IrcChannel *channel = network()->ircChannel(serverDecode(params[0]));
+  if(!channel)
+    return;
+
+  QString topic;
+  if(params.count() > 1)
+    topic = channelDecode(channel->name(), params[1]);
 
-  ircuser->deleteLater();
+  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::handleTopic(QString prefix, QStringList params) {
-  IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix);
-  QString channel = params[0];
-  QString topic = params[1];
-  Q_ASSERT(ircuser);
+void IrcServerHandler::handleCap(const QString &prefix, const QList<QByteArray> &params) {
+    // 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);
 
-  networkInfo()->ircChannel(channel)->setTopic(topic);
+    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
+        }
+    }
+}
 
-  emit displayMsg(Message::Server, params[0], tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel).arg(topic));
+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(QString prefix, QStringList params) {
+void IrcServerHandler::handle001(const QString &prefix, const QList<QByteArray> &params) {
+  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 <nick>!<user>@<host>"
-  QString myhostmask = params[0].section(' ', -1, -1);
-  networkInfo()->setCurrentServer(prefix);
-  networkInfo()->setMyNick(nickFromMask(myhostmask));
+  QString param = serverDecode(params[0]);
+  QString myhostmask = param.section(' ', -1, -1);
 
-  emit displayMsg(Message::Server, "", params[0], prefix);
+  network()->setMyNick(nickFromMask(myhostmask));
 
-  // TODO: reimplement perform List!
-  //// 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]);
-  //  }
-  //}
+  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(QString prefix, QStringList params) {
+void IrcServerHandler::handle005(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  const int numParams = params.size();
+  if(numParams == 0) {
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received RPL_ISUPPORT (005) without parameters!"), prefix);
+    return;
+  }
+
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix);
+
+  QString rpl_isupport_suffix = serverDecode(params.last());
+  if(!rpl_isupport_suffix.toLower().contains("are supported by this server")) {
+    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"), prefix);
+  }
+
+  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);
+  }
+}
+
+/* RPL_UMODEIS - "<user_modes> [<user_mode_params>]" */
+void IrcServerHandler::handle221(const QString &prefix, const QList<QByteArray> &params) {
+  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<QByteArray> &params) {
+  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<QByteArray> &params) {
+  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<QByteArray> &params) {
+  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.
+  and 301 (RPL_AWAY)
+              "<nick> :<away message>"
+WHO-Message:
+   Replies 352 and 315 paired are used to answer a WHO message.
+
+WHOWAS-Message:
+   Replies 314 and 369 are responses to a WHOWAS message.
+
+*/
+
+
+/*   RPL_AWAY - "<nick> :<away message>" */
+void IrcServerHandler::handle301(const QString &prefix, const QList<QByteArray> &params) {
+  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<QByteArray> &params) {
+  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<QByteArray> &params) {
+  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 - "<user> is registered nick" */
+void IrcServerHandler::handle307(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  if(!checkParamCount("IrcServerHandler::handle307()", params, 1))
+    return;
+
+  QString whoisServiceReply = serverDecode(params).join(" ");
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    ircuser->setWhoisServiceReply(whoisServiceReply);
+  }
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(whoisServiceReply));
+}
+
+/* RPL_SUSERHOST - "<user> is available for help." */
+void IrcServerHandler::handle310(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix)
-  QString rpl_isupport_suffix = params.takeLast();
-  if(rpl_isupport_suffix.toLower() != QString("are supported by this server")) {
-    qWarning() << "Received invalid RPL_ISUPPORT! Suffix is:" << rpl_isupport_suffix << "Excpected: are supported by this server";
+  if(!checkParamCount("IrcServerHandler::handle310()", params, 1))
     return;
+
+  QString suserHost = serverDecode(params).join(" ");
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    ircuser->setSuserHost(suserHost);
   }
-  
-  foreach(QString param, params) {
-    QString key = param.section("=", 0, 0);
-    QString value = param.section("=", 1);
-    networkInfo()->addSupport(key, value);
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(suserHost));
+}
+
+/*  RPL_WHOISUSER - "<nick> <user> <host> * :<real name>" */
+void IrcServerHandler::handle311(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  if(!checkParamCount("IrcServerHandler::handle311()", params, 3))
+    return;
+
+  _whois = true;
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  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 is %2 (%3)") .arg(ircuser->nick()).arg(ircuser->hostmask()).arg(ircuser->realName()));
+  } else {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(serverDecode(params[1])).arg(serverDecode(params[2])).arg(serverDecode(params.last())));
   }
 }
 
+/*  RPL_WHOISSERVER -  "<nick> <server> :<server info>" */
+void IrcServerHandler::handle312(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  if(!checkParamCount("IrcServerHandler::handle312()", params, 2))
+    return;
 
-/* RPL_NOTOPIC */
-void IrcServerHandler::handle331(QString prefix, QStringList params) {
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
+  if(ircuser) {
+    ircuser->setServer(serverDecode(params[1]));
+  }
+
+  QString returnString = tr("%1 is online via %2 (%3)").arg(serverDecode(params[0])).arg(serverDecode(params[1])).arg(serverDecode(params.last()));
+  if(_whois) {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(returnString));
+  } else {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(returnString));
+  }
+}
+
+/*  RPL_WHOISOPERATOR - "<nick> :is an IRC operator" */
+void IrcServerHandler::handle313(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix)
-  networkInfo()->ircChannel(params[0])->setTopic(QString());
-  emit displayMsg(Message::Server, params[0], tr("No topic is set for %1.").arg(params[0]));
+  if(!checkParamCount("IrcServerHandler::handle313()", params, 1))
+    return;
+
+  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_TOPIC */
-void IrcServerHandler::handle332(QString prefix, QStringList params) {
+/*  RPL_WHOWASUSER - "<nick> <user> <host> * :<real name>" */
+void IrcServerHandler::handle314(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  if(!checkParamCount("IrcServerHandler::handle314()", params, 3))
+    return;
+
+  QString nick = serverDecode(params[0]);
+  QString hostmask = QString("%1@%2").arg(serverDecode(params[1])).arg(serverDecode(params[2]));
+  QString realName = serverDecode(params.last());
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1 was %2 (%3)").arg(nick).arg(hostmask).arg(realName));
+}
+
+/*  RPL_ENDOFWHO: "<name> :End of WHO list" */
+void IrcServerHandler::handle315(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle315()", params, 1))
+    return;
+
+  QStringList p = serverDecode(params);
+  if(network()->setAutoWhoDone(p[0])) {
+    return; // stay silent
+  }
+  p.takeLast(); // should be "End of WHO list"
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] End of /WHO list for %1").arg(p.join(" ")));
+}
+
+/*  RPL_WHOISIDLE - "<nick> <integer> :seconds idle"
+   (real life: "<nick> <integer> <integer> :seconds idle, signon time) */
+void IrcServerHandler::handle317(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle317()", params, 2))
+    return;
+
+  QString nick = serverDecode(params[0]);
+  IrcUser *ircuser = network()->ircUser(nick);
+  if(ircuser) {
+    QDateTime now = QDateTime::currentDateTime();
+    int idleSecs = serverDecode(params[1]).toInt();
+    idleSecs *= -1;
+    ircuser->setIdleTime(now.addSecs(idleSecs));
+    if(params.size() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
+      int loginTime = serverDecode(params[2]).toInt();
+      ircuser->setLoginTime(QDateTime::fromTime_t(loginTime));
+      emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(ircuser->nick()).arg(ircuser->loginTime().toString()));
+    }
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(ircuser->nick()).arg(secondsToString(ircuser->idleTime().secsTo(now))).arg(ircuser->idleTime().toString()));
+
+  } else {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(userDecode(nick, params).join(" ")));
+  }
+}
+
+/*  RPL_ENDOFWHOIS - "<nick> :End of WHOIS list" */
+void IrcServerHandler::handle318(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  _whois = false;
+  QStringList parameter = serverDecode(params);
+  parameter.removeFirst();
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(parameter.join(" ")));
+}
+
+/*  RPL_WHOISCHANNELS - "<nick> :*( ( "@" / "+" ) <channel> " " )" */
+void IrcServerHandler::handle319(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  if(!checkParamCount("IrcServerHandler::handle319()", params, 2))
+    return;
+
+  QString nick = serverDecode(params.first());
+  QStringList op;
+  QStringList voice;
+  QStringList user;
+  foreach (QString channel, serverDecode(params.last()).split(" ")) {
+    if(channel.startsWith("@"))
+       op.append(channel.remove(0,1));
+    else if(channel.startsWith("+"))
+      voice.append(channel.remove(0,1));
+    else
+      user.append(channel);
+  }
+  if(!user.isEmpty())
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is a user on channels: %2").arg(nick).arg(user.join(" ")));
+  if(!voice.isEmpty())
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 has voice on channels: %2").arg(nick).arg(voice.join(" ")));
+  if(!op.isEmpty())
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is an operator on channels: %2").arg(nick).arg(op.join(" ")));
+}
+
+/*  RPL_WHOISVIRT - "<nick> is identified to services" */
+void IrcServerHandler::handle320(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1").arg(serverDecode(params).join(" ")));
+}
+
+/* RPL_LIST -  "<channel> <# visible> :<topic>" */
+void IrcServerHandler::handle322(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix)
-  networkInfo()->ircChannel(params[0])->setTopic(params[1]);
-  emit displayMsg(Message::Server, params[0], tr("Topic for %1 is \"%2\"").arg(params[0]).arg(params[1]));
+  QString channelName;
+  quint32 userCount = 0;
+  QString topic;
+
+  int paramCount = params.count();
+  switch(paramCount) {
+  case 3:
+    topic = serverDecode(params[2]);
+  case 2:
+    userCount = serverDecode(params[1]).toUInt();
+  case 1:
+    channelName = serverDecode(params[0]);
+  default:
+    break;
+  }
+  if(!coreSession()->ircListHelper()->addChannel(network()->networkId(), channelName, userCount, topic))
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Channel %1 has %2 users. Topic is: %3").arg(channelName).arg(userCount).arg(topic));
+}
+
+/* RPL_LISTEND ":End of LIST" */
+void IrcServerHandler::handle323(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix)
+  Q_UNUSED(params)
+
+  if(!coreSession()->ircListHelper()->endOfChannelList(network()->networkId()))
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("End of channel list"));
+}
+
+/* RPL_CHANNELMODEIS - "<channel> <mode> <mode params>" */
+void IrcServerHandler::handle324(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  handleMode(prefix, params);
+}
+
+/* RPL_??? - "<channel> <homepage> */
+void IrcServerHandler::handle328(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle328()", params, 2))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  QString homepage = serverDecode(params[1]);
+
+  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Homepage for %1 is %2").arg(channel, homepage));
+}
+
+
+/* RPL_??? - "<channel> <creation time (unix)>" */
+void IrcServerHandler::handle329(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle329()", params, 2))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  uint unixtime = params[1].toUInt();
+  if(!unixtime) {
+    qWarning() << Q_FUNC_INFO << "received invalid timestamp:" << params[1];
+    return;
+  }
+  QDateTime time = QDateTime::fromTime_t(unixtime);
+
+  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Channel %1 created on %2").arg(channel, time.toString()));
+}
+
+/* RPL_NOTOPIC */
+void IrcServerHandler::handle331(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle331()", params, 1))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  IrcChannel *chan = network()->ircChannel(channel);
+  if(chan)
+    chan->setTopic(QString());
+
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
+}
+
+/* RPL_TOPIC */
+void IrcServerHandler::handle332(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle332()", params, 2))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  QString topic = channelDecode(channel, params[1]);
+  IrcChannel *chan = network()->ircChannel(channel);
+  if(chan)
+    chan->setTopic(topic);
+
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
 }
 
 /* Topic set by... */
-void IrcServerHandler::handle333(QString prefix, QStringList params) {
+void IrcServerHandler::handle333(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle333()", params, 3))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel,
+                  tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString()));
+}
+
+/*  RPL_WHOREPLY: "<channel> <user> <host> <server> <nick>
+              ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] :<hopcount> <real name>" */
+void IrcServerHandler::handle352(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix)
-  emit displayMsg(Message::Server, params[0], tr("Topic set by %1 on %2").arg(params[1]).arg(QDateTime::fromTime_t(params[2].toUInt()).toString()));
+  if(!checkParamCount("IrcServerHandler::handle352()", params, 6))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
+  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));
+  }
+
+  if(!network()->isAutoWhoInProgress(channel)) {
+    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
+  }
 }
 
 /* RPL_NAMREPLY */
-void IrcServerHandler::handle353(QString prefix, QStringList params) {
-  Q_UNUSED(prefix)
-  params.removeFirst(); // either "=", "*" or "@" indicating a public, private or secret channel
-  QString channelname = params.takeFirst();
+void IrcServerHandler::handle353(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle353()", params, 3))
+    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]);
+
+  IrcChannel *channel = network()->ircChannel(channelname);
+  if(!channel) {
+    qWarning() << "IrcServerHandler::handle353(): received unknown target channel:" << channelname;
+    return;
+  }
 
-  foreach(QString nick, params.takeFirst().split(' ')) {
+  QStringList nicks;
+  QStringList modes;
+
+  foreach(QString nick, serverDecode(params[2]).split(' ')) {
     QString mode = QString();
 
-    if(networkInfo()->prefixes().contains(nick[0])) {
-      mode = networkInfo()->prefixToMode(nick[0]);
+    if(network()->prefixes().contains(nick[0])) {
+      mode = network()->prefixToMode(nick[0]);
       nick = nick.mid(1);
     }
-    
-    IrcUser *ircuser = networkInfo()->newIrcUser(nick);
-    ircuser->joinChannel(channelname);
 
-    if(!mode.isNull())
-      networkInfo()->ircChannel(channelname)->addUserMode(ircuser, mode);
+    nicks << nick;
+    modes << mode;
   }
+
+  channel->joinIrcUsers(nicks, modes);
 }
 
-/* ERR_ERRONEUSNICKNAME */
-void IrcServerHandler::handle432(QString prefix, QStringList params) {
+/*  RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
+void IrcServerHandler::handle369(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix)
-  Q_UNUSED(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"));
-//       }
-//     }
-//   }
+  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whowas] %1").arg(serverDecode(params).join(" ")));
+}
+
+/* ERR_ERRONEUSNICKNAME */
+void IrcServerHandler::handle432(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+
+  QString errnick;
+  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
+    errnick = target();
+  } else {
+    errnick = params[0];
+  }
+  emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick));
+  tryNextNick(errnick, true /* erroneus */);
 }
 
 /* ERR_NICKNAMEINUSE */
-void IrcServerHandler::handle433(QString prefix, QStringList params) {
-  Q_UNUSED(prefix)
-  Q_UNUSED(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"));
-//     }
-//   }
+void IrcServerHandler::handle433(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle433()", params, 1))
+    return;
+
+  QString errnick = serverDecode(params[0]);
+  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...
+  if(!network()->currentServer().isEmpty())
+    return;
+
+  tryNextNick(errnick);
+}
+
+/* Handle signals from Netsplit objects  */
+
+void IrcServerHandler::handleNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes, const QString& quitMessage)
+{
+  IrcChannel *ircChannel = network()->ircChannel(channel);
+  if(!ircChannel) {
+    return;
+  }
+  QList<IrcUser *> ircUsers;
+  QStringList newModes = modes;
+  QStringList newUsers = users;
+
+  foreach(QString user, users) {
+    IrcUser *iu = network()->ircUser(nickFromMask(user));
+    if(iu)
+      ircUsers.append(iu);
+    else { // the user already quit
+      int idx = users.indexOf(user);
+      newUsers.removeAt(idx);
+      newModes.removeAt(idx);
+    }
+  }
+
+  QString msg = newUsers.join("#:#").append("#:#").append(quitMessage);
+  emit displayMsg(Message::NetsplitJoin, BufferInfo::ChannelBuffer, channel, msg);
+  ircChannel->joinIrcUsers(ircUsers, newModes);
+}
+
+void IrcServerHandler::handleNetsplitQuit(const QString &channel, const QStringList &users, const QString& quitMessage)
+{
+  QString msg = users.join("#:#").append("#:#").append(quitMessage);
+  emit displayMsg(Message::NetsplitQuit, BufferInfo::ChannelBuffer, channel, msg);
+  foreach(QString user, users) {
+    IrcUser *iu = network()->ircUser(nickFromMask(user));
+    if(iu)
+      iu->quit();
+  }
+}
+
+void IrcServerHandler::handleEarlyNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes) {
+  IrcChannel *ircChannel = network()->ircChannel(channel);
+  if(!ircChannel) {
+    qDebug() << "handleEarlyNetsplitJoin(): channel " << channel << " invalid";
+    return;
+  }
+  QList<IrcUser *> ircUsers;
+  QStringList newModes = modes;
+
+  foreach(QString user, users) {
+    IrcUser *iu = network()->updateNickFromMask(user);
+    if(iu) {
+      ircUsers.append(iu);
+      emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, user);
+    }
+    else {
+      newModes.removeAt(users.indexOf(user));
+    }
+  }
+  ircChannel->joinIrcUsers(ircUsers, newModes);
+}
+void IrcServerHandler::handleNetsplitFinished()
+{
+  Netsplit* n = qobject_cast<Netsplit*>(sender());
+  _netsplits.remove(_netsplits.key(n));
+  n->deleteLater();
+}
+
+/* */
+
+// FIXME networkConnection()->setChannelKey("") for all ERR replies indicating that a JOIN went wrong
+//       mostly, these are codes in the 47x range
+
+/* */
+
+void IrcServerHandler::tryNextNick(const QString &errnick, bool erroneus) {
+  QStringList desiredNicks = coreSession()->identity(network()->identity())->nicks();
+  int nextNickIdx = desiredNicks.indexOf(errnick) + 1;
+  QString nextNick;
+  if(nextNickIdx > 0 && desiredNicks.size() > nextNickIdx) {
+    nextNick = desiredNicks[nextNickIdx];
+  } else {
+    if(erroneus) {
+      emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+      return;
+    } else {
+      nextNick = errnick + "_";
+    }
+  }
+  putCmd("NICK", serverEncode(nextNick));
+}
+
+bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QByteArray> &params, int minParams) {
+  if(params.count() < minParams) {
+    qWarning() << qPrintable(methodName) << "requires" << minParams << "parameters but received only" << params.count() << serverDecode(params);
+    return false;
+  } else {
+    return true;
+  }
+}
+
+void IrcServerHandler::destroyNetsplits() {
+  qDeleteAll(_netsplits);
+  _netsplits.clear();
 }
 
 /***********************************************************************************/