X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=2649824a87a5cd7af2fbf5c3b9bed20f3edd8a62;hp=cbc6110b4f65b2912361c7701c5e848939f78f4e;hb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45;hpb=92bc51670686fe3e2c7077e7114389d25cbbfe13

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index cbc6110b..2649824a 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,55 +18,87 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QtScript>
+
 #include "core.h"
 #include "coresession.h"
-#include "networkconnection.h"
-
+#include "userinputhandler.h"
 #include "signalproxy.h"
+#include "buffersyncer.h"
+#include "corebacklogmanager.h"
+#include "corebufferviewmanager.h"
+#include "coreirclisthelper.h"
 #include "storage.h"
 
-#include "network.h"
+#include "coreidentity.h"
+#include "corenetwork.h"
 #include "ircuser.h"
 #include "ircchannel.h"
-#include "identity.h"
 
 #include "util.h"
 #include "coreusersettings.h"
+#include "logger.h"
 
-#include <QtScript>
-
-CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent),
+CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
+  : QObject(parent),
     _user(uid),
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
+    _aliasManager(this),
+    _bufferSyncer(new BufferSyncer(this)),
+    _backlogManager(new CoreBacklogManager(this)),
+    _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
+    _ircListHelper(new CoreIrcListHelper(this)),
+    _coreInfo(this),
     scriptEngine(new QScriptEngine(this))
 {
 
   SignalProxy *p = signalProxy();
+  connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
+
+  connect(p, SIGNAL(connected()), this, SLOT(clientsConnected()));
+  connect(p, SIGNAL(disconnected()), this, SLOT(clientsDisconnected()));
 
-  p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
-  p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
   p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
-  p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
   p->attachSignal(this, SIGNAL(displayMsg(Message)));
   p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
-  p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
-  p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
 
   p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
   p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
-  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(createIdentity(const Identity &, const QVariantMap &)), this, SLOT(createIdentity(const Identity &, const QVariantMap &)));
   p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
 
   p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
   p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
   p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
-  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
   p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
 
   loadSettings();
   initScriptEngine();
 
+  // init BufferSyncer
+  QHash<BufferId, MsgId> lastSeenHash = Core::bufferLastSeenMsgIds(user());
+  foreach(BufferId id, lastSeenHash.keys())
+    _bufferSyncer->requestSetLastSeenMsg(id, lastSeenHash[id]);
+
+  connect(_bufferSyncer, SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(storeBufferLastSeenMsg(BufferId, MsgId)));
+  connect(_bufferSyncer, SIGNAL(removeBufferRequested(BufferId)), this, SLOT(removeBufferRequested(BufferId)));
+  connect(this, SIGNAL(bufferRemoved(BufferId)), _bufferSyncer, SLOT(removeBuffer(BufferId)));
+  connect(this, SIGNAL(bufferRenamed(BufferId, QString)), _bufferSyncer, SLOT(renameBuffer(BufferId, QString)));
+  p->synchronize(_bufferSyncer);
+
+
+  // init alias manager
+  p->synchronize(&aliasManager());
+
+  // init BacklogManager
+  p->synchronize(_backlogManager);
+
+  // init IrcListHelper
+  p->synchronize(ircListHelper());
+
+  // init CoreInfo
+  p->synchronize(&_coreInfo);
+
   // Restore session state
   if(restoreState) restoreSessionState();
 
@@ -75,29 +107,17 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
 
 CoreSession::~CoreSession() {
   saveSessionState();
-  foreach(NetworkConnection *conn, _connections.values()) {
-    delete conn;
-  }
-  foreach(Network *net, _networks.values()) {
+  foreach(CoreNetwork *net, _networks.values()) {
     delete net;
   }
 }
 
-UserId CoreSession::user() const {
-  return _user;
-}
-
-Network *CoreSession::network(NetworkId id) const {
+CoreNetwork *CoreSession::network(NetworkId id) const {
   if(_networks.contains(id)) return _networks[id];
   return 0;
 }
 
-NetworkConnection *CoreSession::networkConnection(NetworkId id) const {
-  if(_connections.contains(id)) return _connections[id];
-  return 0;
-}
-
-Identity *CoreSession::identity(IdentityId id) const {
+CoreIdentity *CoreSession::identity(IdentityId id) const {
   if(_identities.contains(id)) return _identities[id];
   return 0;
 }
@@ -106,151 +126,40 @@ void CoreSession::loadSettings() {
   CoreUserSettings s(user());
 
   foreach(IdentityId id, s.identityIds()) {
-    Identity *i = new Identity(s.identity(id), this);
-    if(!i->isValid()) {
-      qWarning() << QString("Invalid identity! Removing...");
-      s.removeIdentity(id);
-      delete i;
-      continue;
-    }
-    if(_identities.contains(i->id())) {
-      qWarning() << "Duplicate identity, ignoring!";
-      delete i;
-      continue;
-    }
-    _identities[i->id()] = i;
-    signalProxy()->synchronize(i);
+    createIdentity(s.identity(id));
   }
   if(!_identities.count()) {
-    Identity i(1);
-    i.setToDefaults();
-    i.setIdentityName(tr("Default Identity"));
-    createIdentity(i);
+    Identity identity;
+    identity.setToDefaults();
+    identity.setIdentityName(tr("Default Identity"));
+    createIdentity(identity);
   }
 
-  foreach(NetworkId id, s.networkIds()) {
-    NetworkInfo info = s.networkInfo(id);
-    createNetwork(info, true);
-  }
-
-  // FIXME Migrate old settings if available...
-  if(!_networks.count()) {
-    QVariantMap networks = s.sessionValue("Networks").toMap();
-    if(networks.keys().count()) {
-      qWarning() << "Migrating your old network settings to the new format!";
-      foreach(QString netname, networks.keys()) {
-        QVariantMap network = networks[netname].toMap();
-        NetworkId netid = Core::networkId(user(), netname);
-        NetworkInfo info;
-        info.networkId = netid;
-        info.networkName = netname;
-        info.identity = 1;
-        info.codecForEncoding = "ISO-8859-15";
-        info.codecForDecoding = "ISO-8859-15";
-        QVariantList slist;
-        foreach(QVariant v, network["Servers"].toList()) {
-          QVariantMap server;
-          server["Host"] = v.toMap()["Address"];
-          server["Port"] = v.toMap()["Port"];
-          slist << server;
-        }
-        info.serverList = slist;
-        createNetwork(info, true);
-      }
-    }
+  foreach(NetworkInfo info, Core::networks(user())) {
+    createNetwork(info);
   }
 }
 
 void CoreSession::saveSessionState() const {
-  QVariantMap res;
-  QVariantList conn;
-  foreach(NetworkConnection *net, _connections.values()) {
-    QVariantMap m;
-    m["NetworkId"] = QVariant::fromValue<NetworkId>(net->networkId());
-    m["State"] = net->state();
-    conn << m;
-  }
-  res["CoreBuild"] = Global::quasselBuild;
-  res["ConnectedNetworks"] = conn;
-  CoreUserSettings s(user());
-  s.setSessionState(res);
 }
 
 void CoreSession::restoreSessionState() {
-  CoreUserSettings s(user());
-  uint build = s.sessionState().toMap()["CoreBuild"].toUInt();
-  if(build < 362) {
-    qWarning() << qPrintable(tr("Session state does not exist or is too old!"));
-    return;
+  QList<NetworkId> nets = Core::connectedNetworks(user());
+  CoreNetwork *net = 0;
+  foreach(NetworkId id, nets) {
+    net = network(id);
+    Q_ASSERT(net);
+    net->connectToIrc();
   }
-  QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList();
-  foreach(QVariant v, conn) {
-    NetworkId id = v.toMap()["NetworkId"].value<NetworkId>();
-    if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]);
-  }
-}
-
-void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
-  if(uid == user()) emit bufferInfoUpdated(bufinfo);
-}
-
-// FIXME remove
-void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) {
-  Network *net = 0;
-  foreach(Network *n, _networks.values()) {
-    if(n->networkName() == netname) {
-      net = n; break;
-    }
-  }
-  if(!net) {
-    qWarning() << "Connect to unknown network requested, ignoring!";
-    return;
-  }
-  connectToNetwork(net->networkId(), previousState);
-}
-
-void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) {
-  Network *net = network(id);
-  if(!net) {
-    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
-    return;
-  }
-
-  NetworkConnection *conn = networkConnection(id);
-  if(!conn) {
-    conn = new NetworkConnection(net, this, previousState);
-    _connections[id] = conn;
-    attachNetworkConnection(conn);
-  }
-  conn->connectToIrc();
 }
 
-void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
-  connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
-  connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
-
-  // I guess we don't need these anymore, client-side can just connect the network's signals directly
-  //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
-  //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
-
-  connect(conn, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
-  connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
-
-}
-
-void CoreSession::disconnectFromNetwork(NetworkId id) {
-  if(!_connections.contains(id)) return;
-  _connections[id]->disconnectFromIrc();
-}
-
-void CoreSession::networkStateRequested() {
-}
-
-void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections
-  QIODevice *device = qobject_cast<QIODevice *>(dev);
+void CoreSession::addClient(QIODevice *device) {
   if(!device) {
-    qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
+    qCritical() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
   } else {
+    // if the socket is an orphan, the signalProxy adopts it.
+    // -> we don't need to care about it anymore
+    device->setParent(0);
     signalProxy()->addPeer(device);
     QVariantMap reply;
     reply["MsgType"] = "SessionInit";
@@ -259,54 +168,50 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it
   }
 }
 
-SignalProxy *CoreSession::signalProxy() const {
-  return _signalProxy;
+void CoreSession::addClient(SignalProxy *proxy) {
+  signalProxy()->addPeer(proxy);
+  emit sessionState(sessionState());
 }
 
-// FIXME we need a sane way for creating buffers!
-void CoreSession::networkConnected(NetworkId networkid) {
-  Core::bufferInfo(user(), networkConnection(networkid)->networkName()); // create status buffer
+void CoreSession::removeClient(QIODevice *iodev) {
+  QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
+  if(socket)
+    quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
 }
 
-void CoreSession::networkDisconnected(NetworkId networkid) {
-  // FIXME
-  // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise
-
-  Q_ASSERT(_connections.contains(networkid));
-  _connections.take(networkid)->deleteLater();
+QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const {
+  return Core::persistentChannels(user(), id);
+  return QHash<QString, QString>();
 }
 
 // FIXME switch to BufferId
 void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
-  NetworkConnection *conn = networkConnection(bufinfo.networkId());
-  if(conn) {
-    conn->userInput(bufinfo.buffer(), msg);
+  CoreNetwork *net = network(bufinfo.networkId());
+  if(net) {
+    net->userInput(bufinfo, msg);
   } else {
-    qWarning() << "Trying to send to unconnected network!";
+    qWarning() << "Trying to send to unconnected network:" << msg;
   }
 }
 
 // ALL messages coming pass through these functions before going to the GUI.
 // So this is the perfect place for storing the backlog and log stuff.
-void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
-  NetworkConnection *s = qobject_cast<NetworkConnection*>(this->sender());
-  Q_ASSERT(s);
-  BufferInfo buf;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
-    buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender));
-  } else {
-    buf = Core::bufferInfo(user(), s->networkName(), target);
-  }
-  Message msg(buf, type, text, sender, flags);
+void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType,
+                                        QString target, QString text, QString sender, Message::Flags flags) {
+  CoreNetwork *net = qobject_cast<CoreNetwork*>(this->sender());
+  Q_ASSERT(net);
+
+  BufferInfo bufferInfo = Core::bufferInfo(user(), net->networkId(), bufferType, target);
+  Message msg(bufferInfo, type, text, sender, flags);
   msg.setMsgId(Core::storeMessage(msg));
   Q_ASSERT(msg.msgId() != 0);
   emit displayMsg(msg);
 }
 
 void CoreSession::recvStatusMsgFromServer(QString msg) {
-  NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
-  Q_ASSERT(s);
-  emit displayStatusMsg(s->networkName(), msg);
+  CoreNetwork *net = qobject_cast<CoreNetwork*>(sender());
+  Q_ASSERT(net);
+  emit displayStatusMsg(net->networkName(), msg);
 }
 
 QList<BufferInfo> CoreSession::buffers() const {
@@ -341,28 +246,10 @@ QVariant CoreSession::sessionState() {
   return v;
 }
 
-void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
-  QList<QVariant> log;
-  QList<Message> msglist;
-  if(v1.type() == QVariant::DateTime) {
-
-
-  } else {
-    msglist = Core::requestMsgs(id, v1.toInt(), v2.toInt());
-  }
-
-  // Send messages out in smaller packages - we don't want to make the signal data too large!
-  for(int i = 0; i < msglist.count(); i++) {
-    log.append(qVariantFromValue(msglist[i]));
-    if(log.count() >= 5) {
-      emit backlogData(id, log, i >= msglist.count() - 1);
-      log.clear();
-    }
-  }
-  if(log.count() > 0) emit backlogData(id, log, true);
+void CoreSession::storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId) {
+  Core::setBufferLastSeenMsg(user(), buffer, msgId);
 }
 
-
 void CoreSession::initScriptEngine() {
   signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
   signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
@@ -378,31 +265,35 @@ void CoreSession::scriptRequest(QString script) {
 
 /*** Identity Handling ***/
 
-void CoreSession::createIdentity(const Identity &id) {
-  // find free ID
-  int i;
-  for(i = 1; i <= _identities.count(); i++) {
-    if(!_identities.keys().contains(i)) break;
+void CoreSession::createIdentity(const Identity &identity, const QVariantMap &additional) {
+  if(_identities.contains(identity.id())) {
+    qWarning() << "duplicate Identity:" << identity.id();
+    return;
   }
-  //qDebug() << "found free id" << i;
-  Identity *newId = new Identity(id, this);
-  newId->setId(i);
-  _identities[i] = newId;
-  signalProxy()->synchronize(newId);
-  CoreUserSettings s(user());
-  s.storeIdentity(*newId);
-  emit identityCreated(*newId);
-}
 
-void CoreSession::updateIdentity(const Identity &id) {
-  if(!_identities.contains(id.id())) {
-    qWarning() << "Update request for unknown identity received!";
-    return;
+  int id = identity.id().toInt();
+  bool newId = !identity.isValid();
+  CoreIdentity *coreIdentity = new CoreIdentity(identity, signalProxy(), this);
+  if(additional.contains("KeyPem"))
+    coreIdentity->setSslKey(additional["KeyPem"].toByteArray());
+  if(additional.contains("CertPem"))
+    coreIdentity->setSslCert(additional["CertPem"].toByteArray());
+  if(newId) {
+    // find free ID
+    for(id = 1; id <= _identities.count(); id++) {
+      if(!_identities.keys().contains(id))
+	break;
+    }
+    coreIdentity->setId(id);
+    coreIdentity->save();
   }
-  _identities[id.id()]->update(id);
 
-  CoreUserSettings s(user());
-  s.storeIdentity(id);
+  _identities[id] = coreIdentity;
+  qDebug() << id << coreIdentity->id();
+  signalProxy()->synchronize(coreIdentity);
+
+  if(newId)
+    emit identityCreated(*coreIdentity);
 }
 
 void CoreSession::removeIdentity(IdentityId id) {
@@ -417,45 +308,149 @@ void CoreSession::removeIdentity(IdentityId id) {
 
 /*** Network Handling ***/
 
-void CoreSession::createNetwork(const NetworkInfo &_info, bool useId) {
-  NetworkInfo info = _info;
+void CoreSession::createNetwork(const NetworkInfo &info_) {
+  NetworkInfo info = info_;
   int id;
-  if(useId && info.networkId > 0) id = info.networkId.toInt();
-  else {
-    for(id = 1; id <= _networks.count(); id++) {
-      if(!_networks.keys().contains(id)) break;
-    }
-    //qDebug() << "found free id" << i;
-    info.networkId = id;
+
+  if(!info.networkId.isValid())
+    Core::createNetwork(user(), info);
+
+  if(!info.networkId.isValid()) {
+    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
+    return;
+  }
+
+  id = info.networkId.toInt();
+  if(!_networks.contains(id)) {
+    CoreNetwork *net = new CoreNetwork(id, this);
+    connect(net, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
+	    this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
+    connect(net, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+
+    net->setNetworkInfo(info);
+    net->setProxy(signalProxy());
+    _networks[id] = net;
+    signalProxy()->synchronize(net);
+    emit networkCreated(id);
+  } else {
+    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
+    _networks[info.networkId]->requestSetNetworkInfo(info);
   }
-  Network *net = new Network(id, this);
-  connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
-  connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId)));
-  net->setNetworkInfo(info);
-  net->setProxy(signalProxy());
-  _networks[id] = net;
-  signalProxy()->synchronize(net);
-  CoreUserSettings s(user());
-  s.storeNetworkInfo(info);
-  emit networkCreated(id);
 }
 
-void CoreSession::updateNetwork(const NetworkInfo &info) {
-  if(!_networks.contains(info.networkId)) {
-    qWarning() << "Update request for unknown network received!";
+void CoreSession::removeNetwork(NetworkId id) {
+  // Make sure the network is disconnected!
+  CoreNetwork *net = network(id);
+  if(!net)
     return;
+
+  if(net->connectionState() != Network::Disconnected) {
+    connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
+    net->disconnectFromIrc();
+  } else {
+    destroyNetwork(id);
   }
-  _networks[info.networkId]->setNetworkInfo(info);
-  CoreUserSettings s(user());
-  s.storeNetworkInfo(info);
 }
 
-void CoreSession::removeNetwork(NetworkId id) {
+void CoreSession::destroyNetwork(NetworkId id) {
+  QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
   Network *net = _networks.take(id);
-  if(net) {
+  if(net && Core::removeNetwork(user(), id)) {
+    foreach(BufferId bufferId, removedBuffers) {
+      _bufferSyncer->removeBuffer(bufferId);
+    }
     emit networkRemoved(id);
-    CoreUserSettings s(user());
-    s.removeNetworkInfo(id);
     net->deleteLater();
   }
 }
+
+void CoreSession::removeBufferRequested(BufferId bufferId) {
+  BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
+  if(!bufferInfo.isValid()) {
+    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+    return;
+  }
+
+  if(bufferInfo.type() == BufferInfo::StatusBuffer) {
+    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+    return;
+  }
+
+  if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
+    CoreNetwork *net = network(bufferInfo.networkId());
+    if(!net) {
+      qWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!";
+      return;
+    }
+    IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
+    if(chan) {
+      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+      return;
+    }
+  }
+  if(Core::removeBuffer(user(), bufferId))
+    emit bufferRemoved(bufferId);
+}
+
+// FIXME: use a coreBufferSyncer for this
+void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) {
+  BufferId bufferId = Core::renameBuffer(user(), networkId, newName, oldName);
+  if(bufferId.isValid()) {
+    emit bufferRenamed(bufferId, newName);
+  }
+}
+
+void CoreSession::clientsConnected() {
+  QHash<NetworkId, CoreNetwork *>::iterator netIter = _networks.begin();
+  Identity *identity = 0;
+  CoreNetwork *net = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(netIter != _networks.end()) {
+    net = *netIter;
+    netIter++;
+
+    if(!net->isConnected())
+      continue;
+    identity = net->identityPtr();
+    if(!identity)
+      continue;
+    me = net->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && me->isAway()) {
+      net->userInputHandler()->handleAway(BufferInfo(), QString());
+    }
+  }
+}
+
+void CoreSession::clientsDisconnected() {
+  QHash<NetworkId, CoreNetwork *>::iterator netIter = _networks.begin();
+  Identity *identity = 0;
+  CoreNetwork *net = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(netIter != _networks.end()) {
+    net = *netIter;
+    netIter++;
+
+    if(!net->isConnected())
+      continue;
+    identity = net->identityPtr();
+    if(!identity)
+      continue;
+    me = net->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && !me->isAway()) {
+      if(identity->detachAwayReasonEnabled())
+	awayReason = identity->detachAwayReason();
+      else
+	awayReason = identity->awayReason();
+      net->setAutoAwayActive(true);
+      net->userInputHandler()->handleAway(BufferInfo(), awayReason);
+    }
+  }
+}