X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=d57678dd49905ad9bfa8ad35d8b816750555bab2;hp=49c45f4cd7597df83840fbfae2ee6c41a94aeab4;hb=f953257711e147661ce79e4da4c8b84f083e3e95;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 49c45f4c..d57678dd 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -21,6 +21,7 @@
 #include "client.h"
 
 #include "bufferinfo.h"
+#include "buffersyncer.h"
 #include "global.h"
 #include "identity.h"
 #include "ircchannel.h"
@@ -34,6 +35,7 @@
 #include "util.h"
 
 QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
 
 /*** Initialization/destruction ***/
 
@@ -44,7 +46,8 @@ Client *Client::instance() {
 }
 
 void Client::destroy() {
-  delete instanceptr;
+  //delete instanceptr;
+  instanceptr->deleteLater();
 }
 
 void Client::init(AbstractUi *ui) {
@@ -59,38 +62,31 @@ Client::Client(QObject *parent)
     mainUi(0),
     _networkModel(0),
     _bufferModel(0),
-    connectedToCore(false)
+    _bufferSyncer(0),
+    _connectedToCore(false),
+    _syncedToCore(false)
 {
+  _monitorBuffer = new Buffer(BufferInfo(), this);
 }
 
 Client::~Client() {
+  disconnectFromCore();
 }
 
 void Client::init() {
-  blockSize = 0;
-
+  _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->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
-                  SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)));
-  p->attachSlot(SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)),
-                this, SLOT(recvSessionData(const QString &, const QVariant &)));
-  p->attachSlot(SIGNAL(coreState(const QVariant &)),
-                this, SLOT(recvCoreState(const QVariant &)));
-  p->attachSlot(SIGNAL(networkConnected(uint)),
-                this, SLOT(networkConnected(uint)));
-  p->attachSlot(SIGNAL(networkDisconnected(uint)),
-                this, SLOT(networkDisconnected(uint)));
-  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(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
+  p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
 
   p->attachSlot(SIGNAL(backlogData(BufferInfo, const QVariantList &, bool)), this, SLOT(recvBacklogData(BufferInfo, const QVariantList &, bool)));
   p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo)));
@@ -103,7 +99,15 @@ void Client::init() {
   p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &)));
   p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId)));
 
-  connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
+  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()));
@@ -117,16 +121,12 @@ void Client::init() {
 
 /*** public static methods ***/
 
-
-QList<Network *> Client::networks() {
-  return instance()->_network.values();
+AccountId Client::currentCoreAccount() {
+  return _currentCoreAccount;
 }
 
-Network *Client::network(uint networkid) {
-  if(instance()->_network.contains(networkid))
-    return instance()->_network[networkid];
-  else
-    return 0;
+void Client::setCurrentCoreAccount(AccountId id) {
+  _currentCoreAccount = id;
 }
 
 QList<BufferInfo> Client::allBufferInfos() {
@@ -141,44 +141,86 @@ QList<Buffer *> Client::buffers() {
   return instance()->_buffers.values();
 }
 
-Buffer *Client::buffer(uint bufferUid) {
-  if(instance()->_buffers.contains(bufferUid))
-    return instance()->_buffers[bufferUid];
+
+// FIXME remove
+Buffer *Client::buffer(BufferId bufferId) {
+  if(instance()->_buffers.contains(bufferId))
+    return instance()->_buffers[bufferId];
   else
     return 0;
 }
 
-Buffer *Client::buffer(BufferInfo id) {
-  Buffer *buff = buffer(id.uid());
+// FIXME remove
+Buffer *Client::buffer(BufferInfo bufferInfo) {
+  Buffer *buff = buffer(bufferInfo.bufferId());
 
   if(!buff) {
     Client *client = Client::instance();
-    buff = new Buffer(id, client);
-
-    connect(buff, SIGNAL(userInput(BufferInfo, QString)),
-	    client, SLOT(userInput(BufferInfo, QString)));
+    buff = new Buffer(bufferInfo, client);
     connect(buff, SIGNAL(destroyed()),
 	    client, SLOT(bufferDestroyed()));
-    client->_buffers[id.uid()] = buff;
-    emit client->bufferUpdated(id);
+    client->_buffers[bufferInfo.bufferId()] = buff;
+    emit client->bufferUpdated(bufferInfo);
   }
   Q_ASSERT(buff);
   return buff;
 }
 
-NetworkModel *Client::networkModel() {
-  return instance()->_networkModel;
+bool Client::isConnected() {
+  return instance()->_connectedToCore;
+}
+
+bool Client::isSynced() {
+  return instance()->_syncedToCore;
+}
+
+/*** Network handling ***/
+
+QList<NetworkId> Client::networkIds() {
+  return instance()->_networks.keys();
+}
+
+const Network * Client::network(NetworkId networkid) {
+  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+  else return 0;
+}
+
+void Client::createNetwork(const NetworkInfo &info) {
+  emit instance()->requestCreateNetwork(info);
 }
 
-BufferModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+void Client::updateNetwork(const NetworkInfo &info) {
+  emit instance()->requestUpdateNetwork(info);
 }
 
+void Client::removeNetwork(NetworkId id) {
+  emit instance()->requestRemoveNetwork(id);
+}
 
-SignalProxy *Client::signalProxy() {
-  return instance()->_signalProxy;
+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::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::coreNetworkRemoved(NetworkId id) {
+  if(!_networks.contains(id)) return;
+  Network *net = _networks.take(id);
+  emit networkRemoved(net->networkId());
+  net->deleteLater();
+}
 
 /*** Identity handling ***/
 
@@ -191,7 +233,6 @@ const Identity * Client::identity(IdentityId id) {
   else return 0;
 }
 
-
 void Client::createIdentity(const Identity &id) {
   emit instance()->requestCreateIdentity(id);
 }
@@ -225,83 +266,51 @@ void Client::coreIdentityRemoved(IdentityId id) {
 }
 
 /***  ***/
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+  emit instance()->sendInput(bufferInfo, message);
+}
 
+/*** core connection stuff ***/
 
-bool Client::isConnected() {
-  return instance()->connectedToCore;
+void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
+  socket = sock;
+  signalProxy()->addPeer(socket);
+  _connectedToCore = true;
+  setCurrentCoreAccount(id);
 }
 
-void Client::fakeInput(uint bufferUid, QString message) {
-  Buffer *buff = buffer(bufferUid);
-  if(!buff)
-    qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
-  else
-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
+void Client::setSyncedToCore() {
+  // create buffersyncer
+  Q_ASSERT(!_bufferSyncer);
+  _bufferSyncer = new BufferSyncer(this);
+  connect(bufferSyncer(), SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(updateLastSeen(BufferId, const QDateTime &)));
+  connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
+  signalProxy()->synchronize(bufferSyncer());
 
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
+  _syncedToCore = true;
+  emit connected();
+  emit coreConnectionStateChanged(true);
 }
 
-void Client::connectToCore(const QVariantMap &conn) {
-  // TODO implement SSL
-  coreConnectionInfo = conn;
-  if(isConnected()) {
-    emit coreConnectionError(tr("Already connected to Core!"));
+void Client::disconnectFromCore() {
+  if(!isConnected())
     return;
-  }
   
-  if(socket != 0)
+  if(socket) {
+    socket->close();
     socket->deleteLater();
-  
-  if(conn["Host"].toString().isEmpty()) {
-    clientMode = LocalCore;
-    socket = new QBuffer(this);
-    connect(socket, SIGNAL(readyRead()), this, SLOT(coreHasData()));
-    socket->open(QIODevice::ReadWrite);
-    //QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
-    //syncToCore(state);
-    coreSocketConnected();
-  } else {
-    clientMode = RemoteCore;
-    emit coreConnectionMsg(tr("Connecting..."));
-    Q_ASSERT(!socket);
-    QTcpSocket *sock = new QTcpSocket(this);
-    socket = sock;
-    connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
-    connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
-    connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-    connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
-    sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
   }
-}
-
-void Client::disconnectFromCore() {
-  socket->close();
-}
-
-void Client::setCoreConfiguration(const QVariantMap &settings) {
-  SignalProxy::writeDataToDevice(socket, settings);
-}
-
-void Client::coreSocketConnected() {
-  connect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
-  emit coreConnectionMsg(tr("Synchronizing to core..."));
-  QVariantMap clientInit;
-  clientInit["GuiProtocol"] = GUI_PROTOCOL;
-  clientInit["User"] = coreConnectionInfo["User"].toString();
-  clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  SignalProxy::writeDataToDevice(socket, clientInit);
-}
-
-void Client::coreSocketDisconnected() {
-  instance()->connectedToCore = false;
+  _connectedToCore = false;
+  _syncedToCore = false;
+  setCurrentCoreAccount(0);
   emit disconnected();
   emit coreConnectionStateChanged(false);
-  socket->deleteLater();
-  blockSize = 0;
 
-  /* Clear internal data. Hopefully nothing relies on it at this point. */
+  // Clear internal data. Hopefully nothing relies on it at this point.
+  if(_bufferSyncer) {
+    _bufferSyncer->deleteLater();
+    _bufferSyncer = 0;
+  }
   _networkModel->clear();
 
   QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
@@ -313,15 +322,15 @@ void Client::coreSocketDisconnected() {
   }
   Q_ASSERT(_buffers.isEmpty());
 
-
-  QHash<NetworkId, Network*>::iterator netIter = _network.begin();
-  while(netIter != _network.end()) {
+  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 = _network.erase(netIter);
+    netIter = _networks.erase(netIter);
     net->deleteLater();
   }
-  Q_ASSERT(_network.isEmpty());
+  Q_ASSERT(_networks.isEmpty());
 
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
@@ -332,196 +341,15 @@ void Client::coreSocketDisconnected() {
   }
   Q_ASSERT(_identities.isEmpty());
 
-  coreConnectionInfo.clear();
-  sessionData.clear();
   layoutQueue.clear();
   layoutTimer->stop();
 }
 
-void Client::recvCoreState(const QVariant &state) {
-  disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
-  disconnect(socket, 0, this, 0);  // rest of communication happens through SignalProxy
-  signalProxy()->addPeer(socket);
-  syncToCore(state);
-}
-
-// TODO: auth errors
-void Client::syncToCore(const QVariant &coreState) {
-  if(!coreState.toMap().contains("SessionState")) {
-    emit coreConnectionError(tr("Invalid data received from core!"));
-    disconnectFromCore();
-    return;
-  }
-
-  QVariantMap sessionState = coreState.toMap()["SessionState"].toMap();
-
-  // store sessionData
-  QVariantMap sessData = sessionState["SessionData"].toMap();
-  foreach(QString key, sessData.keys())
-    recvSessionData(key, sessData[key]);
-
-  // create identities
-  foreach(QVariant vid, sessionState["Identities"].toList()) {
-    coreIdentityCreated(vid.value<Identity>());
-  }
-
-  // store Buffer details
-  QVariantList coreBuffers = sessionState["Buffers"].toList();
-  /* make lookups by id faster */
-  foreach(QVariant vid, coreBuffers) {
-    buffer(vid.value<BufferInfo>()); // create all buffers, so we see them in the network views
-  }
-
-  // create network objects
-  QVariantList networkids = sessionState["Networks"].toList();
-  foreach(QVariant networkid, networkids) {
-    networkConnected(networkid.toUInt());
-  }
-
-  instance()->connectedToCore = true;
-  updateCoreConnectionProgress();
-
-}
-
-void Client::updateCoreConnectionProgress() {
-  // we'll do this in three steps:
-  // 1.) networks
-  // 2.) channels
-  // 3.) ircusers
-
-  int numNets = networks().count();
-  int numNetsWaiting = 0;
-
-  int numIrcUsers = 0;
-  int numIrcUsersWaiting = 0;
-
-  int numChannels = 0;
-  int numChannelsWaiting = 0;
-
-  foreach(Network *net, networks()) {
-    if(! net->initialized())
-      numNetsWaiting++;
-
-    numIrcUsers += net->ircUsers().count();
-    foreach(IrcUser *user, net->ircUsers()) {
-      if(! user->initialized())
-	numIrcUsersWaiting++;
-    }
-
-    numChannels += net->ircChannels().count();
-    foreach(IrcChannel *channel, net->ircChannels()) {
-      if(! channel->initialized())
-	numChannelsWaiting++;
-    }
-  }
-
-  if(numNetsWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting network states..."));
-    emit coreConnectionProgress(numNets - numNetsWaiting, numNets);
-    return;
-  }
-
-  if(numIrcUsersWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting User states..."));
-    emit coreConnectionProgress(numIrcUsers - numIrcUsersWaiting, numIrcUsers);
-    return;
-  }
-
-  if(numChannelsWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting Channel states..."));
-    emit coreConnectionProgress(numChannels - numChannelsWaiting, numChannels);
-    return;
-  }
-
-  emit coreConnectionProgress(1,1);
-  emit connected();
-  emit coreConnectionStateChanged(true);
-  foreach(Network *net, networks()) {
-    disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
-  }
-
-  // signalProxy()->dumpProxyStats();
-}
-
-void Client::recvSessionData(const QString &key, const QVariant &data) {
-  sessionData[key] = data;
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
-}
-
-void Client::storeSessionData(const QString &key, const QVariant &data) {
-  // Not sure if this is a good idea, but we'll try it anyway:
-  // Calling this function only sends a signal to core. Data is stored upon reception of the update signal,
-  // rather than immediately.
-  emit instance()->sendSessionData(key, data);
-}
-
-QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) {
-  if(instance()->sessionData.contains(key)) return instance()->sessionData[key];
-  else return def;
-}
-
-QStringList Client::sessionDataKeys() {
-  return instance()->sessionData.keys();
-}
-
-void Client::coreSocketError(QAbstractSocket::SocketError) {
-  emit coreConnectionError(socket->errorString());
-  socket->deleteLater();
-}
-
-void Client::coreHasData() {
-  QVariant item;
-  if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
-    emit recvPartialItem(1,1);
-    QVariantMap msg = item.toMap();
-    if (!msg["StartWizard"].toBool()) {
-      recvCoreState(msg["Reply"]);
-    } else {
-      qWarning("Core not configured!");
-      qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
-      emit showConfigWizard(msg);
-    }
-    blockSize = 0;
-    return;
-  }
-  if(blockSize > 0) {
-    emit recvPartialItem(socket->bytesAvailable(), blockSize);
-  }
-}
-
-void Client::networkConnected(uint netid) {
-  // TODO: create statusBuffer / switch to networkids
-  //BufferInfo id = statusBufferInfo(net);
-  //Buffer *b = buffer(id);
-  //b->setActive(true);
-
-  Network *netinfo = new Network(netid, this);
-  netinfo->setProxy(signalProxy());
-  networkModel()->attachNetwork(netinfo);
-  
-  if(!isConnected()) {
-    connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
-    connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
-    connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
-  }
-  connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkDestroyed()));
-  _network[netid] = netinfo;
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
-void Client::networkDisconnected(uint networkid) {
-  if(!_network.contains(networkid)) {
-    qWarning() << "Client::networkDisconnected(uint): unknown Network" << networkid;
-    return;
-  }
-
-  Network *net = _network.take(networkid);
-  if(!net->initialized()) {
-    qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
-    updateCoreConnectionProgress();
-  }
-  net->deleteLater();
-}
+/*** ***/
 
 void Client::updateBufferInfo(BufferInfo id) {
   emit bufferUpdated(id);
@@ -540,25 +368,45 @@ void Client::bufferDestroyed() {
 }
 
 void Client::networkDestroyed() {
-  Network *netinfo = static_cast<Network *>(sender());
-  uint networkId = netinfo->networkId();
-  if(_network.contains(networkId))
-    _network.remove(networkId);
+  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());
-
-//   Buffer::ActivityLevel level = Buffer::OtherActivity;
-//   if(msg.type() == Message::Plain || msg.type() == Message::Notice){
-//     level |= Buffer::NewMessage;
-//   }
-//   if(msg.flags() & Message::Highlight){
-//     level |= Buffer::Highlight;
-//   }
-//   emit bufferActivity(level, b);
+void Client::recvMessage(const Message &message) {
+  Message msg = message;
+  Buffer *b;
+  
+  if(msg.type() == Message::Error) {
+    b = buffer(msg.bufferInfo().bufferId());
+    if(!b) {
+      // FIXME: if buffer doesn't exist, forward the message to the status or current buffer
+      b = buffer(msg.bufferInfo());
+    }
+  } else {
+    b = buffer(msg.bufferInfo());
+  }
 
+  checkForHighlight(msg);
   b->appendMsg(msg);
+  //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);
+  }
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
@@ -569,7 +417,9 @@ void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
   Buffer *b = buffer(id);
   foreach(QVariant v, msgs) {
     Message msg = v.value<Message>();
+    checkForHighlight(msg);
     b->prependMsg(msg);
+    //networkModel()->updateBufferActivity(msg);
     if(!layoutQueue.contains(b)) layoutQueue.append(b);
   }
   if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
@@ -590,7 +440,34 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::userInput(BufferInfo id, QString msg) {
-  emit sendInput(id, msg);
+void Client::checkForHighlight(Message &msg) {
+  const Network *net = network(msg.bufferInfo().networkId());
+  if(net && !net->myNick().isEmpty()) {
+    QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
+    if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text()))
+      msg.setFlags(msg.flags() | Message::Highlight);
+  }
 }
 
+void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) {
+  Buffer *b = buffer(id);
+  if(!b) {
+    qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+    return;
+  }
+  b->setLastSeen(lastSeen);
+}
+
+void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) {
+  if(!bufferSyncer()) return;
+  bufferSyncer()->requestSetLastSeen(id, lastSeen);
+}
+
+void Client::bufferRemoved(BufferId bufferId) {
+  networkModel()->removeBuffer(bufferId);
+  if(_buffers.contains(bufferId)) {
+    Buffer *buff = _buffers.take(bufferId);
+    disconnect(buff, 0, this, 0);
+    buff->deleteLater();
+  }
+}