X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=69ffbfc787396f59d9267e27ae7fd97123e16d09;hp=419a8a2a47333c7bf22a9ba29229f53db3221cc5;hb=278aef059d7652b2a4e1359d72bb4028524246d4;hpb=73edffb5f0f6ecae4118c36a7ca2c0d479b7f8c6

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 419a8a2a..69ffbfc7 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 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        *
@@ -19,45 +19,38 @@
  ***************************************************************************/
 
 #include "client.h"
-#include "clientproxy.h"
-#include "buffer.h"
-#include "buffertreemodel.h"
-#include "util.h"
 
-Client * Client::instanceptr = 0;
+#include "bufferinfo.h"
+#include "buffersyncer.h"
+#include "clientbacklogmanager.h"
+#include "bufferviewmanager.h"
+#include "global.h"
+#include "identity.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "message.h"
+#include "network.h"
+#include "networkmodel.h"
+#include "buffermodel.h"
+#include "quasselui.h"
+#include "signalproxy.h"
+#include "util.h"
+#include "buffersettings.h"
 
-Client::ClientMode Client::clientMode;
-QHash<BufferId, Buffer *> Client::buffers;
-QHash<uint, BufferId> Client::bufferIds;
-QHash<QString, QHash<QString, VarMap> > Client::nicks;
-QHash<QString, bool> Client::connected;
-QHash<QString, QString> Client::ownNick;
-QList<BufferId> Client::coreBuffers;
+QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
 
+/*** Initialization/destruction ***/
 
 Client *Client::instance() {
-  if(instanceptr) return instanceptr;
-  instanceptr = new Client();
+  if(!instanceptr)
+    instanceptr = new Client();
   return instanceptr;
 }
 
 void Client::destroy() {
-  delete instanceptr;
-  instanceptr = 0;
-}
-
-Client::Client() {
-  clientProxy = ClientProxy::instance();
-
-  _bufferModel = new BufferTreeModel(this);
-
-  connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *)));
-  connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *)));
-  connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
-
-    // TODO: make this configurable (allow monolithic client to connect to remote cores)
-  if(Global::runMode == Global::Monolithic) clientMode = LocalCore;
-  else clientMode = RemoteCore;
+  //delete instanceptr;
+  instanceptr->deleteLater();
 }
 
 void Client::init(AbstractUi *ui) {
@@ -65,289 +58,575 @@ void Client::init(AbstractUi *ui) {
   instance()->init();
 }
 
+Client::Client(QObject *parent)
+  : QObject(parent),
+    socket(0),
+    _signalProxy(new SignalProxy(SignalProxy::Client, this)),
+    mainUi(0),
+    _networkModel(0),
+    _bufferModel(0),
+    _bufferSyncer(0),
+    _backlogManager(new ClientBacklogManager(this)),
+    _bufferViewManager(0),
+    _connectedToCore(false),
+    _syncedToCore(false)
+{
+  _monitorBuffer = new Buffer(BufferInfo(), this);
+  connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
+	  this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
+}
+
+Client::~Client() {
+  disconnectFromCore();
+}
+
 void Client::init() {
-  blockSize = 0;
-
-  connect(&socket, SIGNAL(readyRead()), this, SLOT(serverHasData()));
-  connect(&socket, SIGNAL(connected()), this, SLOT(coreConnected()));
-  connect(&socket, SIGNAL(disconnected()), this, SLOT(coreDisconnected()));
-  connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
-
-  connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateCoreData(UserId, QString)));
-  connect(clientProxy, SIGNAL(csUpdateGlobalData(QString, QVariant)), this, SLOT(updateLocalData(QString, QVariant)));
-
-  connect(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
-  connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
-  connect(clientProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
-  connect(clientProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
-  connect(clientProxy, SIGNAL(csDisplayMsg(Message)), this, SLOT(recvMessage(const Message &)));
-  connect(clientProxy, SIGNAL(csDisplayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
-  connect(clientProxy, SIGNAL(csTopicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString)));
-  connect(clientProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
-  connect(clientProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
-  connect(clientProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
-  connect(clientProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
-  connect(clientProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
-  connect(clientProxy, SIGNAL(csBacklogData(BufferId, const QList<QVariant> &, bool)), this, SLOT(recvBacklogData(BufferId, QList<QVariant>, bool)));
-  connect(clientProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId)));
-  connect(this, SIGNAL(sendInput(BufferId, QString)), clientProxy, SLOT(gsUserInput(BufferId, QString)));
-  connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), clientProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
-
-  syncToCore();
+  _currentCoreAccount = 0;
+  _networkModel = new NetworkModel(this);
+  connect(this, SIGNAL(bufferUpdated(BufferInfo)),
+          _networkModel, SLOT(bufferUpdated(BufferInfo)));
+  connect(this, SIGNAL(networkRemoved(NetworkId)),
+	  _networkModel, SLOT(networkRemoved(NetworkId)));
+
+  _bufferModel = new BufferModel(_networkModel);
+
+  SignalProxy *p = signalProxy();
+
+  p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
+  p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
+
+  p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo)));
+  p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString)));
+  p->attachSignal(this, SIGNAL(requestNetworkStates()));
+
+  p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &)), SIGNAL(createIdentity(const Identity &)));
+  p->attachSignal(this, SIGNAL(requestUpdateIdentity(const Identity &)), SIGNAL(updateIdentity(const Identity &)));
+  p->attachSignal(this, SIGNAL(requestRemoveIdentity(IdentityId)), SIGNAL(removeIdentity(IdentityId)));
+  p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &)));
+  p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId)));
+
+  p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(const NetworkInfo &)));
+  p->attachSignal(this, SIGNAL(requestUpdateNetwork(const NetworkInfo &)), SIGNAL(updateNetwork(const NetworkInfo &)));
+  p->attachSignal(this, SIGNAL(requestRemoveNetwork(NetworkId)), SIGNAL(removeNetwork(NetworkId)));
+  p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, SLOT(coreNetworkCreated(NetworkId)));
+  p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId)));
+
+  connect(p, SIGNAL(disconnected()), this, SLOT(disconnectFromCore()));
+
+  //connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
+  connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
+  connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
+  connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
 
   layoutTimer = new QTimer(this);
   layoutTimer->setInterval(0);
   layoutTimer->setSingleShot(false);
   connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg()));
 
-  /* make lookups by id faster */
-  foreach(BufferId id, coreBuffers) {
-    bufferIds[id.uid()] = id;  // make lookups by id faster
-    buffer(id);                // create all buffers, so we see them in the network views
-    emit requestBacklog(id, -1, -1);  // TODO: use custom settings for backlog request
+}
+
+/*** public static methods ***/
+
+AccountId Client::currentCoreAccount() {
+  return _currentCoreAccount;
+}
+
+void Client::setCurrentCoreAccount(AccountId id) {
+  _currentCoreAccount = id;
+}
+
+QList<BufferInfo> Client::allBufferInfos() {
+  QList<BufferInfo> bufferids;
+  foreach(Buffer *buffer, buffers()) {
+    bufferids << buffer->bufferInfo();
   }
+  return bufferids;
 }
 
-Client::~Client() {
-  //delete mainUi;
-  //delete _bufferModel;
-  foreach(Buffer *buf, buffers.values()) delete buf;
-  ClientProxy::destroy();
+QList<Buffer *> Client::buffers() {
+  return instance()->_buffers.values();
+}
 
+
+Buffer *Client::statusBuffer(const NetworkId &networkId) const {
+  if(_statusBuffers.contains(networkId))
+    return _statusBuffers[networkId];
+  else
+    return 0;
 }
 
-BufferTreeModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+Buffer *Client::buffer(BufferId bufferId) {
+  if(instance()->_buffers.contains(bufferId))
+    return instance()->_buffers[bufferId];
+  else
+    return 0;
 }
 
-void Client::coreConnected() {
+Buffer *Client::buffer(BufferInfo bufferInfo) {
+  Buffer *buff = buffer(bufferInfo.bufferId());
+
+  if(!buff) {
+    Client *client = Client::instance();
+    buff = new Buffer(bufferInfo, client);
+    connect(buff, SIGNAL(destroyed()), client, SLOT(bufferDestroyed()));
+    client->_buffers[bufferInfo.bufferId()] = buff;
+    if(bufferInfo.type() == BufferInfo::StatusBuffer)
+      client->_statusBuffers[bufferInfo.networkId()] = buff;
 
+    emit client->bufferUpdated(bufferInfo);
+
+    // I don't like this: but currently there isn't really a prettier way:
+    if(isSynced()) {  // this slows down syncing a lot, so disable it during sync
+      QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId());
+      bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx));
+    }
+  }
+  Q_ASSERT(buff);
+  return buff;
 }
 
-void Client::coreDisconnected() {
+bool Client::isConnected() {
+  return instance()->_connectedToCore;
+}
 
+bool Client::isSynced() {
+  return instance()->_syncedToCore;
 }
 
-void Client::updateCoreData(UserId, QString key) {
-  if(clientMode == LocalCore) return;
-  QVariant data = Global::data(key);
-  recvProxySignal(GS_UPDATE_GLOBAL_DATA, key, data, QVariant());
+/*** Network handling ***/
+
+QList<NetworkId> Client::networkIds() {
+  return instance()->_networks.keys();
 }
 
-void Client::updateLocalData(QString key, QVariant data) {
-  Global::updateData(key, data);
+const Network * Client::network(NetworkId networkid) {
+  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+  else return 0;
 }
 
-void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
-  if(clientMode == LocalCore) return;
-  QList<QVariant> sigdata;
-  sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
-  //qDebug() << "Sending signal: " << sigdata;
-  writeDataToDevice(&socket, QVariant(sigdata));
+void Client::createNetwork(const NetworkInfo &info) {
+  emit instance()->requestCreateNetwork(info);
 }
 
-void Client::connectToCore(QString host, quint16 port) {
-  // TODO implement SSL
-  socket.connectToHost(host, port);
+void Client::updateNetwork(const NetworkInfo &info) {
+  emit instance()->requestUpdateNetwork(info);
 }
 
-void Client::disconnectFromCore() {
-  socket.close();
+void Client::removeNetwork(NetworkId id) {
+  emit instance()->requestRemoveNetwork(id);
 }
 
-void Client::serverError(QAbstractSocket::SocketError) {
-  emit coreConnectionError(socket.errorString());
+void Client::addNetwork(Network *net) {
+  net->setProxy(signalProxy());
+  signalProxy()->synchronize(net);
+  networkModel()->attachNetwork(net);
+  connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed()));
+  instance()->_networks[net->networkId()] = net;
+  emit instance()->networkCreated(net->networkId());
 }
 
-void Client::serverHasData() {
-  QVariant item;
-  while(readDataFromDevice(&socket, blockSize, item)) {
-    emit recvPartialItem(1,1);
-    QList<QVariant> sigdata = item.toList();
-    Q_ASSERT(sigdata.size() == 4);
-    ClientProxy::instance()->recv((CoreSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);
-    blockSize = 0;
-  }
-  if(blockSize > 0) {
-    emit recvPartialItem(socket.bytesAvailable(), blockSize);
+void Client::coreNetworkCreated(NetworkId id) {
+  if(_networks.contains(id)) {
+    qWarning() << "Creation of already existing network requested!";
+    return;
   }
+  Network *net = new Network(id, this);
+  addNetwork(net);
 }
 
-void Client::networkConnected(QString net) {
-  connected[net] = true;
-  BufferId id = statusBufferId(net);
-  Buffer *b = buffer(id);
-  b->setActive(true);
-  //b->displayMsg(Message(id, Message::Server, tr("Connected.")));
-  // TODO buffersUpdated();
+void Client::coreNetworkRemoved(NetworkId id) {
+  if(!_networks.contains(id)) return;
+  Network *net = _networks.take(id);
+  emit networkRemoved(net->networkId());
+  net->deleteLater();
 }
 
-void Client::networkDisconnected(QString net) {
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() != net) continue;
-    Buffer *b = buffer(id);
-    //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME
-    b->setActive(false);
+/*** Identity handling ***/
+
+QList<IdentityId> Client::identityIds() {
+  return instance()->_identities.keys();
+}
+
+const Identity * Client::identity(IdentityId id) {
+  if(instance()->_identities.contains(id)) return instance()->_identities[id];
+  else return 0;
+}
+
+void Client::createIdentity(const Identity &id) {
+  emit instance()->requestCreateIdentity(id);
+}
+
+void Client::updateIdentity(const Identity &id) {
+  emit instance()->requestUpdateIdentity(id);
+}
+
+void Client::removeIdentity(IdentityId id) {
+  emit instance()->requestRemoveIdentity(id);
+}
+
+void Client::coreIdentityCreated(const Identity &other) {
+  if(!_identities.contains(other.id())) {
+    Identity *identity = new Identity(other, this);
+    _identities[other.id()] = identity;
+    identity->setInitialized();
+    signalProxy()->synchronize(identity);
+    emit identityCreated(other.id());
+  } else {
+    qWarning() << tr("Identity already exists in client!");
+  }
+}
+
+void Client::coreIdentityRemoved(IdentityId id) {
+  if(_identities.contains(id)) {
+    emit identityRemoved(id);
+    Identity *i = _identities.take(id);
+    i->deleteLater();
   }
-  connected[net] = false;
 }
 
-void Client::updateBufferId(BufferId id) {
-  bufferIds[id.uid()] = id;  // make lookups by id faster
-  buffer(id);
+/***  ***/
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+  emit instance()->sendInput(bufferInfo, message);
 }
 
-BufferId Client::bufferId(QString net, QString buf) {
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() == net && id.buffer() == buf) return id;
+/*** core connection stuff ***/
+
+void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
+  socket = sock;
+  signalProxy()->addPeer(socket);
+  _connectedToCore = true;
+  setCurrentCoreAccount(id);
+}
+
+void Client::setSyncedToCore() {
+  // create buffersyncer
+  Q_ASSERT(!_bufferSyncer);
+  _bufferSyncer = new BufferSyncer(this);
+  connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(updateLastSeenMsg(BufferId, MsgId)));
+  connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
+  connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
+  signalProxy()->synchronize(bufferSyncer());
+
+  // attach backlog manager
+  signalProxy()->synchronize(backlogManager());
+
+  // create a new BufferViewManager
+  _bufferViewManager = new BufferViewManager(signalProxy(), this);
+  
+  _syncedToCore = true;
+  emit connected();
+  emit coreConnectionStateChanged(true);
+}
+
+void Client::disconnectFromCore() {
+  if(!isConnected())
+    return;
+  
+  if(socket) {
+    socket->close();
+    socket->deleteLater();
+  }
+  _connectedToCore = false;
+  _syncedToCore = false;
+  setCurrentCoreAccount(0);
+  emit disconnected();
+  emit coreConnectionStateChanged(false);
+
+  // Clear internal data. Hopefully nothing relies on it at this point.
+  if(_bufferSyncer) {
+    _bufferSyncer->deleteLater();
+    _bufferSyncer = 0;
+  }
+
+  if(_bufferViewManager) {
+    _bufferViewManager->deleteLater();
+    _bufferViewManager = 0;
+  }
+  
+  _networkModel->clear();
+
+  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
+  while(bufferIter != _buffers.end()) {
+    Buffer *buffer = bufferIter.value();
+    disconnect(buffer, SIGNAL(destroyed()), this, 0);
+    bufferIter = _buffers.erase(bufferIter);
+    buffer->deleteLater();
+  }
+  Q_ASSERT(_buffers.isEmpty());
+
+  _statusBuffers.clear();
+
+  QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
+  while(netIter != _networks.end()) {
+    Network *net = netIter.value();
+    emit networkRemoved(net->networkId());
+    disconnect(net, SIGNAL(destroyed()), this, 0);
+    netIter = _networks.erase(netIter);
+    net->deleteLater();
   }
-  Q_ASSERT(false);  // should never happen!
-  return BufferId();
+  Q_ASSERT(_networks.isEmpty());
+
+  QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
+  while(idIter != _identities.end()) {
+    Identity *id = idIter.value();
+    emit identityRemoved(id->id());
+    idIter = _identities.erase(idIter);
+    id->deleteLater();
+  }
+  Q_ASSERT(_identities.isEmpty());
+
+  layoutQueue.clear();
+  layoutTimer->stop();
 }
 
-BufferId Client::statusBufferId(QString net) {
-  return bufferId(net, "");
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
+/*** ***/
+
+void Client::updateBufferInfo(BufferInfo id) {
+  emit bufferUpdated(id);
+}
 
-Buffer * Client::buffer(BufferId id) {
-  Client *client = Client::instance();
-  if(!buffers.contains(id)) {
-    Buffer *b = new Buffer(id);
-    b->setOwnNick(ownNick[id.network()]);
-    connect(b, SIGNAL(userInput(BufferId, QString)), client, SLOT(userInput(BufferId, QString)));
-    connect(b, SIGNAL(bufferUpdated(Buffer *)), client, SIGNAL(bufferUpdated(Buffer *)));
-    connect(b, SIGNAL(bufferDestroyed(Buffer *)), client, SIGNAL(bufferDestroyed(Buffer *)));
-    buffers[id] = b;
-    emit client->bufferUpdated(b);
+void Client::bufferDestroyed() {
+  Buffer *buffer = static_cast<Buffer *>(sender());
+  QHash<BufferId, Buffer *>::iterator iter = _buffers.begin();
+  while(iter != _buffers.end()) {
+    if(iter.value() == buffer) {
+      iter = _buffers.erase(iter);
+      break;
+    }
+    iter++;
   }
-  return buffers[id];
-}
-
-void Client::recvNetworkState(QString net, QVariant state) {
-  connected[net] = true;
-  setOwnNick(net, state.toMap()["OwnNick"].toString());
-  buffer(statusBufferId(net))->setActive(true);
-  VarMap t = state.toMap()["Topics"].toMap();
-  VarMap n = state.toMap()["Nicks"].toMap();
-  foreach(QVariant v, t.keys()) {
-    QString buf = v.toString();
-    BufferId id = bufferId(net, buf);
-    buffer(id)->setActive(true);
-    setTopic(net, buf, t[buf].toString());
+
+  QHash<NetworkId, Buffer *>::iterator statusIter = _statusBuffers.begin();
+  while(statusIter != _statusBuffers.end()) {
+    if(statusIter.value() == buffer) {
+      statusIter = _statusBuffers.erase(statusIter);
+      break;
+    }
+    statusIter++;
   }
-  foreach(QString nick, n.keys()) {
-    addNick(net, nick, n[nick].toMap());
+}
+
+void Client::networkDestroyed() {
+  Network *net = static_cast<Network *>(sender());
+  QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
+  while(netIter != _networks.end()) {
+    if(*netIter == net) {
+      netIter = _networks.erase(netIter);
+      break;
+    } else {
+      netIter++;
+    }
   }
 }
 
-void Client::recvMessage(const Message &msg) {
-  Buffer *b = buffer(msg.buffer);
+void Client::recvMessage(const Message &message) {
+  Message msg = message;
+  Buffer *b;
+
+  checkForHighlight(msg);
+
+  // FIXME clean up code! (dup)
+
+  if(msg.flags() & Message::Redirected) {
+    BufferSettings bufferSettings;
+    bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool();
+    bool inQuery = bufferSettings.value("UserMessagesInQueryBuffer", QVariant(false)).toBool();
+    bool inCurrent = bufferSettings.value("UserMessagesInCurrentBuffer", QVariant(false)).toBool();
 
-  Buffer::ActivityLevel level = Buffer::OtherActivity;
-  if(msg.type == Message::Plain || msg.type == Message::Notice){
-    level |= Buffer::NewMessage;
+    if(inStatus) {
+      b = statusBuffer(msg.bufferInfo().networkId());
+      if(b) {
+        b->appendMsg(msg);
+      } else if(!inQuery && !inCurrent) {	// make sure the message get's shown somewhere
+        b = buffer(msg.bufferInfo());
+        b->appendMsg(msg);
+      }
+    }
+
+    if(inQuery) {
+      b = buffer(msg.bufferInfo().bufferId());
+      if(b) {
+        b->appendMsg(msg);
+      } else if(!inStatus && !inCurrent) { // make sure the message get's shown somewhere
+        b = statusBuffer(msg.bufferInfo().networkId());
+      if(!b) b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways...
+      b->appendMsg(msg);
+      }
+    }
+
+    if(inCurrent) {
+      BufferId currentId = bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
+      b = buffer(currentId);
+      if(b && currentId != msg.bufferInfo().bufferId() && !inQuery) {
+        b->appendMsg(msg);
+      } else if(!inStatus && !inQuery) {	// make sure the message get's shown somewhere
+        b = statusBuffer(msg.bufferInfo().networkId());
+        if(!b) b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways...
+        b->appendMsg(msg);
+      }
+    }
+  } else {
+    // the regular case: we can deliver where it was supposed to go
+    b = buffer(msg.bufferInfo());
+    b->appendMsg(msg);
   }
-  if(msg.flags & Message::Highlight){
-    level |= Buffer::Highlight;
+  
+  //bufferModel()->updateBufferActivity(msg);
+
+  if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
+    const Network *net = network(msg.bufferInfo().networkId());
+    QString networkName = net != 0
+      ? net->networkName() + ":"
+      : QString();
+    QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender();
+    Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
+    monitorBuffer()->appendMsg(mmsg);
   }
-  emit bufferActivity(level, b);
 
-  b->appendMsg(msg);
+  emit messageReceived(msg);
 }
 
-void Client::recvStatusMsg(QString net, QString msg) {
+void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
   //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
-
 }
 
-void Client::recvBacklogData(BufferId id, const QList<QVariant> &msgs, bool done) {
-  Buffer *b = buffer(id);
-  foreach(QVariant v, msgs) {
-    Message msg = v.value<Message>();
-    b->prependMsg(msg);
-    if(!layoutQueue.contains(b)) layoutQueue.append(b);
+void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+  Buffer *buffer_ = buffer(bufferId);
+  if(!buffer_) {
+    qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId;
+    return;
+  }
+
+  if(msgs.isEmpty())
+    return; // no work to be done...
+  
+  QVariantList::const_iterator msgIter = msgs.constBegin();
+  QVariantList::const_iterator msgIterEnd = msgs.constEnd();
+  Message msg;
+  while(msgIter != msgIterEnd) {
+    msg = (*msgIter).value<Message>();
+    checkForHighlight(msg);
+    buffer_->prependMsg(msg);
+    msgIter++;
+  }
+
+  if(!layoutQueue.contains(buffer_))
+    layoutQueue.append(buffer_);
+
+  if(!layoutTimer->isActive()) {
+    layoutTimer->start();
   }
-  if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
 }
 
 void Client::layoutMsg() {
-  if(layoutQueue.count()) {
-    Buffer *b = layoutQueue.takeFirst();  // TODO make this the current buffer
-    if(b->layoutMsg()) layoutQueue.append(b);  // Buffer has more messages in its queue --> Round Robin
+  if(layoutQueue.isEmpty()) {
+    layoutTimer->stop();
+    return;
   }
-  if(!layoutQueue.count()) layoutTimer->stop();
+  
+  Buffer *buffer = layoutQueue.takeFirst();
+  if(buffer->layoutMsg()) {
+    layoutQueue.append(buffer);  // Buffer has more messages in its queue --> Round Robin
+    return;
+  } 
+
+  if(layoutQueue.isEmpty())
+    layoutTimer->stop();
 }
 
 AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::userInput(BufferId id, QString msg) {
-  emit sendInput(id, msg);
+void Client::checkForHighlight(Message &msg) {
+  NotificationSettings notificationSettings;
+  const Network *net = network(msg.bufferInfo().networkId());
+  if(net && !net->myNick().isEmpty()) {
+    if(notificationSettings.highlightCurrentNick()) {
+      QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
+      if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
+          && !(msg.flags() & Message::Self)
+          && nickRegExp.exactMatch(msg.text())) {
+            msg.setFlags(msg.flags() | Message::Highlight);
+            return;
+      }
+    }
+    foreach(QVariant highlight, notificationSettings.highlightList()) {
+      QVariantMap highlightRule = highlight.toMap();
+      if(!highlightRule["enable"].toBool())
+        continue;
+      QString name = highlightRule["name"].toString();
+      QRegExp userRegExp;
+      if(highlightRule["regex"].toBool()) {
+        userRegExp = QRegExp(name);
+      } else {
+        userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$");
+      }
+      if((msg.type() & (Message::Plain | Message::Notice | Message::Action))
+          && !(msg.flags() & Message::Self)
+          && userRegExp.exactMatch(msg.text())) {
+        msg.setFlags(msg.flags() | Message::Highlight);
+        return;
+      }
+    }
+  }
 }
 
-void Client::setTopic(QString net, QString buf, QString topic) {
-  BufferId id = bufferId(net, buf);
-  if(!connected[id.network()]) return;
+void Client::updateLastSeenMsg(BufferId id, const MsgId &msgId) {
   Buffer *b = buffer(id);
-  b->setTopic(topic);
-  //if(!b->isActive()) {
-  //  b->setActive(true);
-  //  buffersUpdated();
-  //}
-}
-
-void Client::addNick(QString net, QString nick, VarMap props) {
-  if(!connected[net]) return;
-  nicks[net][nick] = props;
-  VarMap chans = props["Channels"].toMap();
-  QStringList c = chans.keys();
-  foreach(QString bufname, c) {
-    buffer(bufferId(net, bufname))->addNick(nick, props);
+  if(!b) {
+    qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+    return;
   }
+  b->setLastSeenMsg(msgId);
 }
 
-void Client::renameNick(QString net, QString oldnick, QString newnick) {
-  if(!connected[net]) return;
-  QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys();
-  foreach(QString c, chans) {
-    buffer(bufferId(net, c))->renameNick(oldnick, newnick);
-  }
-  nicks[net][newnick] = nicks[net].take(oldnick);
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
+  if(!bufferSyncer())
+    return;
+  bufferSyncer()->requestSetLastSeenMsg(id, msgId);
 }
 
-void Client::updateNick(QString net, QString nick, VarMap props) {
-  if(!connected[net]) return;
-  QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys();
-  QStringList newchans = props["Channels"].toMap().keys();
-  foreach(QString c, newchans) {
-    if(oldchans.contains(c)) buffer(bufferId(net, c))->updateNick(nick, props);
-    else buffer(bufferId(net, c))->addNick(nick, props);
-  }
-  foreach(QString c, oldchans) {
-    if(!newchans.contains(c)) buffer(bufferId(net, c))->removeNick(nick);
-  }
-  nicks[net][nick] = props;
+void Client::removeBuffer(BufferId id) {
+  if(!bufferSyncer()) return;
+  bufferSyncer()->requestRemoveBuffer(id);
 }
 
-void Client::removeNick(QString net, QString nick) {
-  if(!connected[net]) return;
-  VarMap chans = nicks[net][nick]["Channels"].toMap();
-  foreach(QString bufname, chans.keys()) {
-    buffer(bufferId(net, bufname))->removeNick(nick);
+void Client::bufferRemoved(BufferId bufferId) {
+  // first remove the buffer from has. this prohibits further lastSeenUpdates
+  Buffer *buff = 0;
+  if(_buffers.contains(bufferId)) {
+    buff = _buffers.take(bufferId);
+    disconnect(buff, 0, this, 0);
   }
-  nicks[net].remove(nick);
-}
 
-void Client::setOwnNick(QString net, QString nick) {
-  if(!connected[net]) return;
-  ownNick[net] = nick;
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() == net) {
-      buffers[id]->setOwnNick(nick);
-    }
+  // then we select a sane buffer (status buffer)
+  /* we have to manually select a buffer because otherwise inconsitent changes
+   * to the model might occur:
+   * the result of a buffer removal triggers a change in the selection model.
+   * the newly selected buffer might be a channel that hasn't been selected yet
+   * and a new nickview would be created (which never heard of the "rowsAboutToBeRemoved").
+   * this new view (and/or) its sort filter will then only receive a "rowsRemoved" signal.
+   */
+  QModelIndex current = bufferModel()->currentIndex();
+  if(current.data(NetworkModel::BufferIdRole).value<BufferId>() == bufferId) {
+    bufferModel()->setCurrentIndex(current.sibling(0,0));
   }
-}
 
+  // and remove it from the model
+  networkModel()->removeBuffer(bufferId);
+
+  if(buff)
+    buff->deleteLater();
+}
 
+void Client::bufferRenamed(BufferId bufferId, const QString &newName) {
+  QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId);
+  if(bufferIndex.isValid()) {
+    networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
+  }
+}