X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=ae7c42b4c70177019a9edb658466163958d069a3;hp=5c60b3b8a169054b6141f8978e74dc6b5dde367a;hb=3ec6f311bb4fff1540a01c26069300ad17f6d134;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 5c60b3b8..ae7c42b4 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-10 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,13 +32,19 @@
 
 #include <QDebug>
 
+#ifdef HAVE_QCA2
+#  include "cipher.h"
+#endif
+
 IrcServerHandler::IrcServerHandler(CoreNetwork *parent)
-  : BasicHandler(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. */
@@ -57,11 +63,23 @@ void IrcServerHandler::handleServerMsg(QByteArray 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);
+    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!";
@@ -70,6 +88,13 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
 
   QString foo = serverDecode(params.takeFirst());
 
+  // with SASL, the command is 'AUTHENTICATE +' and we should check for this here.
+  /* obsolete because of events
+  if(foo == QString("AUTHENTICATE +")) {
+    handleAuthenticate();
+    return;
+  }
+  */
   // a colon as the first chars indicates the existence of a prefix
   if(foo[0] == ':') {
     foo.remove(0, 1);
@@ -88,117 +113,62 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
   uint num = cmd.toUInt();
   if(num > 0) {
     if(params.count() == 0) {
-      qWarning() << "Message received from server violates RFC and is ignored!";
+      qWarning() << "Message received from server violates RFC and is ignored!" << msg;
       return;
     }
-    params.removeFirst();
+    _target = serverDecode(params.takeFirst());
+  } else {
+    _target = QString();
   }
 
+  // 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(QList<QByteArray>, 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.
-    // 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, 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, BufferInfo::StatusBuffer, "", params.join(" "), prefix);
-        break;
-      // Server error messages, display them in red. First param will be appended.
-      case 401: {
-	QString target = params.takeFirst();
-	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:  // 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, BufferInfo::StatusBuffer, "", p + ": " + params.join(" "));
-        break;
-      }
-      // Ignore these commands.
-      case 321: case 366: case 376:
-        break;
-
-      // Everything else will be marked in red, so we can add them somewhere.
-      default:
-	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, BufferInfo::StatusBuffer, "", QString("Unknown: ") + cmd + " " + params.join(" "), prefix);
-    //qDebug() << prefix <<":"<<cmd<<params;
-  }
+  // many commands are handled by the event system now
+  Q_UNUSED(cmd)
+  Q_UNUSED(prefix)
+  Q_UNUSED(rawparams)
 }
 
 //******************************/
 // IRC SERVER HANDLER
 //******************************/
+
 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);
-  emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, 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(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(channelDecode(channel, params[2]));
-  else
-    msg = victim->nick();
-
-  emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix);
-  //if(network()->isMe(victim)) network()->setKickedFromChannel(channel);
-}
-
 void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray> &params) {
   if(!checkParamCount("IrcServerHandler::handleMode()", params, 2))
     return;
@@ -219,43 +189,59 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray>
     int paramOffset = 2;
     for(int c = 0; c < modes.length(); c++) {
       if(modes[c] == '+') {
-	add = true;
-	continue;
+        add = true;
+        continue;
       }
       if(modes[c] == '-') {
-	add = false;
-	continue;
+        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(add)
-	    channel->addUserMode(ircUser, QString(modes[c]));
-	  else
-	    channel->removeUserMode(ircUser, QString(modes[c]));
-	} else {
-	  qWarning() << "Received MODE with too few parameters:" << serverDecode(params);
-	}
-	paramOffset++;
+        // 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);
+        // 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);
       }
     }
 
@@ -268,109 +254,71 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray>
     bool add = false;
     for(int c = 0; c < modeString.count(); c++) {
       if(modeString[c] == '+') {
-	add = true;
-	continue;
+        add = true;
+        continue;
       }
       if(modeString[c] == '-') {
-	add = false;
-	continue;
+        add = false;
+        continue;
       }
       if(add)
-	addModes += modeString[c];
+        addModes += modeString[c];
       else
-	removeModes += modeString[c];
+        removeModes += modeString[c];
     }
     if(!addModes.isEmpty())
       ircUser->addUserModes(addModes);
     if(!removeModes.isEmpty())
       ircUser->removeUserModes(removeModes);
 
+    if(network()->isMe(ircUser)) {
+      network()->updatePersistentModes(addModes, 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(const QString &prefix, const QList<QByteArray> &params) {
   if(!checkParamCount("IrcServerHandler::handleNotice()", params, 2))
     return;
 
-  QString target = serverDecode(params[0]);
-
-  // 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);
-	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(const QString &prefix, const QList<QByteArray> &params) {
-  if(!checkParamCount("IrcServerHandler::handlePart()", params, 1))
-    return;
+    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);
+    }
 
-  IrcUser *ircuser = network()->updateNickFromMask(prefix);
-  QString channel = serverDecode(params[0]);
-  if(!ircuser) {
-    qWarning() << "IrcServerHandler::handlePart(): Unknown IrcUser!";
-    return;
+    network()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
   }
 
-  ircuser->partChannel(channel);
-
-  QString msg;
-  if(params.count() > 1)
-    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(const QString &prefix, const QList<QByteArray> &params) {
@@ -378,23 +326,6 @@ void IrcServerHandler::handlePing(const QString &prefix, const QList<QByteArray>
   putCmd("PONG", params);
 }
 
-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;
@@ -410,18 +341,26 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList<QByteArr
     return;
   }
 
-  QString target = serverDecode(params[0]);
+  QString senderNick = nickFromMask(prefix);
 
   QByteArray msg = params.count() < 2
     ? QByteArray("")
     : params[1];
 
-  if(!network()->isChannelName(target))
-    target = nickFromMask(prefix);
+  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
-  // - > we let the ctcpHandler do the work
-  network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
+#ifdef HAVE_QCA2
+    msg = decrypt(target, msg);
+#endif
+    // it's possible to pack multiple privmsgs into one param using ctcp
+    // - > we let the ctcpHandler do the work
+    network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
+  }
 }
 
 void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray> &params) {
@@ -432,380 +371,32 @@ void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray>
   if(params.count() > 0)
     msg = userDecode(ircuser->nick(), params[0]);
 
-  foreach(QString channel, ircuser->channels())
-    emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
-
-  ircuser->quit();
-}
-
-void IrcServerHandler::handleTopic(const QString &prefix, const QList<QByteArray> &params) {
-  if(!checkParamCount("IrcServerHandler::handleTopic()", params, 1))
-    return;
-
-  IrcUser *ircuser = network()->updateNickFromMask(prefix);
-  if(!ircuser)
-    return;
-
-  IrcChannel *channel = network()->ircChannel(serverDecode(params[0]));
-  if(!channel)
-    return;
-
-  QString topic;
-  if(params.count() > 1)
-    topic = channelDecode(channel->name(), params[1]);
-
-  channel->setTopic(topic);
-
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic));
-}
-
-/* RPL_WELCOME */
-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 param = serverDecode(params[0]);
-  QString myhostmask = param.section(' ', -1, -1);
-
-  network()->setMyNick(nickFromMask(myhostmask));
-
-  emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", param, prefix);
-}
-
-/* RPL_ISUPPORT */
-// TODO Complete 005 handling, also use sensible defaults for non-sent stuff
-void IrcServerHandler::handle005(const QString &prefix, const QList<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));
+  // 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);
     }
-  }
-}
-
-// 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)
-  if(!checkParamCount("IrcServerHandler::handle310()", params, 1))
-    return;
-
-  QString suserHost = serverDecode(params).join(" ");
-  IrcUser *ircuser = network()->ircUser(serverDecode(params[0]));
-  if(ircuser) {
-    ircuser->setSuserHost(suserHost);
-  }
-  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;
-
-  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)
-  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_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 obove 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()));
+    else {
+      n = _netsplits[msg];
     }
-    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(" ")));
+    // add this user to the netsplit
+    n->userQuit(prefix, ircuser->channels(),msg);
   }
-}
-
-/*  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)
-  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;
+  // normal quit
+  else {
+    foreach(QString channel, ircuser->channels())
+      emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
+    ircuser->quit();
   }
-  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>" */
@@ -814,155 +405,71 @@ void IrcServerHandler::handle324(const QString &prefix, const QList<QByteArray>
   handleMode(prefix, params);
 }
 
-/* RPL_??? - "<channel> <creation time (unix)>" */
-void IrcServerHandler::handle329(const QString &prefix, const QList<QByteArray> &params) {
-  Q_UNUSED(prefix);
-  Q_UNUSED(params)
-#ifdef __GNUC__
-#  warning "Implement handle329 (Channel creation time)"
-#endif
-  // FIXME implement this...
-}
-
-/* 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::Server, 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;
+/* Handle signals from Netsplit objects  */
 
-  QString channel = serverDecode(params[0]);
-  QString topic = channelDecode(channel, params[1]);
-  IrcChannel *chan = network()->ircChannel(channel);
-  if(chan)
-    chan->setTopic(topic);
-
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
-}
-
-/* Topic set by... */
-void IrcServerHandler::handle333(const QString &prefix, const QList<QByteArray> &params) {
-  Q_UNUSED(prefix);
-  if(!checkParamCount("IrcServerHandler::handle333()", params, 3))
-    return;
+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 channel = serverDecode(params[0]);
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel,
-                  tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString()));
+  QString msg = newUsers.join("#:#").append("#:#").append(quitMessage);
+  emit displayMsg(Message::NetsplitJoin, BufferInfo::ChannelBuffer, channel, msg);
+  ircChannel->joinIrcUsers(ircUsers, newModes);
 }
 
-/*  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)
-  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(" ")));
+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();
   }
 }
 
-/* RPL_NAMREPLY */
-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;
+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;
 
-  QStringList nicks;
-  QStringList modes;
-
-  foreach(QString nick, serverDecode(params[2]).split(' ')) {
-    QString mode = QString();
-
-    if(network()->prefixes().contains(nick[0])) {
-      mode = network()->prefixToMode(nick[0]);
-      nick = nick.mid(1);
+  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));
     }
-
-    nicks << nick;
-    modes << mode;
-  }
-
-  channel->joinIrcUsers(nicks, modes);
-}
-
-/*  RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
-void IrcServerHandler::handle369(const QString &prefix, const QList<QByteArray> &params) {
-  Q_UNUSED(prefix)
-  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);
-
-  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, BufferInfo::StatusBuffer, "", tr("There is a nickname in your identity's nicklist which contains illegal characters"));
-    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", 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, BufferInfo::StatusBuffer, "", tr("Please use: /nick <othernick> to continue or clean up your nicklist"));
-  } else {
-    QString errnick = params[0];
-    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick));
-    tryNextNick(errnick);
   }
+  ircChannel->joinIrcUsers(ircUsers, newModes);
 }
-
-/* ERR_NICKNAMEINUSE */
-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);
+void IrcServerHandler::handleNetsplitFinished()
+{
+  Netsplit* n = qobject_cast<Netsplit*>(sender());
+  _netsplits.remove(_netsplits.key(n));
+  n->deleteLater();
 }
 
 /* */
@@ -972,14 +479,21 @@ void IrcServerHandler::handle433(const QString &prefix, const QList<QByteArray>
 
 /* */
 
-void IrcServerHandler::tryNextNick(const QString &errnick) {
+void IrcServerHandler::tryNextNick(const QString &errnick, bool erroneus) {
   QStringList desiredNicks = coreSession()->identity(network()->identity())->nicks();
-  int nextNick = desiredNicks.indexOf(errnick) + 1;
-  if(desiredNicks.size() > nextNick) {
-    putCmd("NICK", serverEncode(desiredNicks[nextNick]));
+  int nextNickIdx = desiredNicks.indexOf(errnick) + 1;
+  QString nextNick;
+  if(nextNickIdx > 0 && desiredNicks.size() > nextNickIdx) {
+    nextNick = desiredNicks[nextNickIdx];
   } else {
-    emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
+    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) {
@@ -991,7 +505,22 @@ bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QB
   }
 }
 
+void IrcServerHandler::destroyNetsplits() {
+  qDeleteAll(_netsplits);
+  _netsplits.clear();
+}
 
-/***********************************************************************************/
+#ifdef HAVE_QCA2
+QByteArray IrcServerHandler::decrypt(const QString &bufferName, const QByteArray &message_, bool isTopic) {
+  if(message_.isEmpty())
+    return message_;
 
+  Cipher *cipher = network()->cipher(bufferName);
+  if(!cipher)
+    return message_;
 
+  QByteArray message = message_;
+  message = isTopic? cipher->decryptTopic(message) : cipher->decrypt(message);
+  return message;
+}
+#endif