X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=491e99a882ff82c97deb4feb837042b37b06c1c5;hp=6b28d71e942ae2397912ab0be6ca50e435a59644;hb=558260f52de5a9b1364f5672ace17554efc10a74;hpb=e733408e4759473bf38831f498f48a0f2f5e6dc7

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 6b28d71e..491e99a8 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,232 +18,155 @@
  *   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 "corebuffersyncer.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, 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 CoreBufferSyncer(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 *)));
 
-  CoreUserSettings s(user());
-  sessionData = s.sessionData();
-
-  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;
-  }
-  if(!_identities.count()) {
-    Identity i(1);
-    i.setToDefaults();
-    i.setIdentityName(tr("Default Identity"));
-    createIdentity(i);
-  }
+  connect(p, SIGNAL(connected()), this, SLOT(clientsConnected()));
+  connect(p, SIGNAL(disconnected()), this, SLOT(clientsDisconnected()));
 
-  //p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(networkStateRequested()));
-  p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
   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(sessionDataChanged(const QString &, const QVariant &)), SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)));
-  p->attachSlot(SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
 
   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(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+
+  loadSettings();
   initScriptEngine();
 
-  foreach(Identity *id, _identities.values()) {
-    p->synchronize(id);
-  }
+  connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferSyncer, SLOT(storeDirtyIds()));
+  connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferViewManager, SLOT(saveBufferViews()));
 
-  // Load and init networks.
-  // FIXME For now we use the old info from sessionData...
-
-  QVariantMap networks = retrieveSessionData("Networks").toMap();
-  foreach(QString netname, networks.keys()) {
-    QVariantMap network = networks[netname].toMap();
-    NetworkId netid = Core::networkId(user(), netname);
-    Network *net = new Network(netid, this);
-    connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
-    net->setNetworkName(netname);
-    net->setIdentity(1); // FIXME default identity for now
-    net->setCodecForEncoding("ISO-8859-15"); // FIXME
-    net->setCodecForDecoding("ISO-8859-15"); // FIXME
-    QList<QVariantMap> slist;
-    foreach(QVariant v, network["Servers"].toList()) slist << v.toMap();
-    net->setServerList(slist);
-    net->setProxy(p);
-    _networks[netid] = net;
-    p->synchronize(net);
-  }
+  p->synchronize(_bufferSyncer);
+  p->synchronize(&aliasManager());
+  p->synchronize(_backlogManager);
+  p->synchronize(ircListHelper());
+  p->synchronize(&_coreInfo);
+
+  // Restore session state
+  if(restoreState)
+    restoreSessionState();
 
   emit initialized();
 }
 
 CoreSession::~CoreSession() {
+  saveSessionState();
+  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;
 }
 
-QVariant CoreSession::state() const { // FIXME
-  QVariantMap res;
-  /*
-  QList<QVariant> conn;
-  foreach(NetworkConnection *net, connections.values()) {
-    if(net->isConnected()) {
-      QVariantMap m;
-      m["Network"] = net->networkName();
-      m["State"] = net->state();
-      conn << m;
-    }
-  }
-  res["ConnectedServers"] = conn;
-  */
-  return res;
-}
-
-void CoreSession::restoreState(const QVariant &previousState) { // FIXME
-  // Session restore
-  /*
-  QVariantMap state = previousState.toMap();
-  if(state.contains("ConnectedServers")) {
-    foreach(QVariant v, state["ConnectedServers"].toList()) {
-      QVariantMap m = v.toMap();
-      QString net = m["Network"].toString();
-      if(!net.isEmpty()) connectToNetwork(net, m["State"]);
-    }
-  }
-  */
-}
-
-
-void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
+void CoreSession::loadSettings() {
   CoreUserSettings s(user());
-  s.setSessionValue(key, data);
-  sessionData[key] = data;
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
-}
 
-QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
-  QVariant data;
-  if(!sessionData.contains(key)) data = def;
-  else data = sessionData[key];
-  return data;
-}
-
-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;
+  // migrate to db
+  QList<IdentityId> ids = s.identityIds();
+  QList<NetworkInfo> networkInfos = Core::networks(user());
+  foreach(IdentityId id, ids) {
+    CoreIdentity identity(s.identity(id));
+    IdentityId newId = Core::createIdentity(user(), identity);
+    QList<NetworkInfo>::iterator networkIter = networkInfos.begin();
+    while(networkIter != networkInfos.end()) {
+      if(networkIter->identity == id) {
+	networkIter->identity = newId;
+	Core::updateNetwork(user(), *networkIter);
+	networkIter = networkInfos.erase(networkIter);
+      } else {
+	networkIter++;
+      }
     }
+    s.removeIdentity(id);
   }
-  if(!net) {
-    qWarning() << "Connect to unknown network requested, ignoring!";
-    return;
-  }
-  connectToNetwork(net->networkId(), previousState);
-}
+  // end of migration
 
-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;
+  foreach(CoreIdentity identity, Core::identities(user())) {
+    createIdentity(identity);
+  }
+  if(!_identities.count()) {
+    Identity identity;
+    identity.setToDefaults();
+    identity.setIdentityName(tr("Default Identity"));
+    createIdentity(identity, QVariantMap());
   }
 
-  NetworkConnection *conn = networkConnection(id);
-  if(!conn) {
-    conn = new NetworkConnection(net, this, previousState);
-    _connections[id] = conn;
-    attachNetworkConnection(conn);
-    conn->connectToIrc();
+  foreach(NetworkInfo info, Core::networks(user())) {
+    createNetwork(info);
   }
 }
 
-void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
-  //connect(this, SIGNAL(connectToIrc(QString)), network, SLOT(connectToIrc(QString)));
-  //connect(this, SIGNAL(disconnectFromIrc(QString)), network, SLOT(disconnectFromIrc(QString)));
-  //connect(this, SIGNAL(msgFromGui(uint, QString, QString)), network, SLOT(userInput(uint, QString, QString)));
-
-  //connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
-  //connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
-  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)));
-
-  // TODO add error handling
+void CoreSession::saveSessionState() const {
+  _bufferSyncer->storeDirtyIds();
+  _bufferViewManager->saveBufferViews();
 }
 
-void CoreSession::networkStateRequested() {
+void CoreSession::restoreSessionState() {
+  QList<NetworkId> nets = Core::connectedNetworks(user());
+  CoreNetwork *net = 0;
+  foreach(NetworkId id, nets) {
+    net = network(id);
+    Q_ASSERT(net);
+    net->connectToIrc();
+  }
 }
 
-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";
@@ -252,53 +175,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());
 }
 
-void CoreSession::networkConnected(uint 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(uint 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();
-  Q_ASSERT(!_connections.contains(networkid));
+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 {
@@ -310,10 +230,10 @@ QVariant CoreSession::sessionState() {
   QVariantMap v;
 
   QVariantList bufs;
-  foreach(BufferInfo id, buffers()) bufs << QVariant::fromValue(id);
+  foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
   v["BufferInfos"] = bufs;
   QVariantList networkids;
-  foreach(NetworkId id, _networks.keys()) networkids << QVariant::fromValue(id);
+  foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
   v["NetworkIds"] = networkids;
 
   quint32 ircusercount = 0;
@@ -326,37 +246,13 @@ QVariant CoreSession::sessionState() {
   v["IrcChannelCount"] = ircchannelcount;
 
   QList<QVariant> idlist;
-  foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+  foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
   v["Identities"] = idlist;
 
-  v["SessionData"] = sessionData;
-
-    //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
+  //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
   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(QVariant::fromValue(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::initScriptEngine() {
   signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
   signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
@@ -369,41 +265,168 @@ void CoreSession::initScriptEngine() {
 void CoreSession::scriptRequest(QString script) {
   emit scriptResult(scriptEngine->evaluate(script).toString());
 }
-#include <QDebug>
-void CoreSession::createIdentity(const Identity &id) {
-  // find free ID
-  int i;
-  for(i = 1; i <= _identities.count(); i++) {
-    if(!_identities.keys().contains(i)) break;
+
+/*** Identity Handling ***/
+void CoreSession::createIdentity(const Identity &identity, const QVariantMap &additional) {
+#ifndef HAVE_SSL
+  Q_UNUSED(additional)
+#endif
+
+  CoreIdentity coreIdentity(identity);
+#ifdef HAVE_SSL
+  if(additional.contains("KeyPem"))
+    coreIdentity.setSslKey(additional["KeyPem"].toByteArray());
+  if(additional.contains("CertPem"))
+    coreIdentity.setSslCert(additional["CertPem"].toByteArray());
+#endif
+  IdentityId id = Core::createIdentity(user(), coreIdentity);
+  if(!id.isValid())
+    return;
+  else
+    createIdentity(coreIdentity);
+}
+
+void CoreSession::createIdentity(const CoreIdentity &identity) {
+  CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
+  _identities[identity.id()] = coreIdentity;
+  // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+  coreIdentity->synchronize(signalProxy());
+  connect(coreIdentity, SIGNAL(updated(const QVariantMap &)), this, SLOT(updateIdentityBySender()));
+  emit identityCreated(*coreIdentity);
+}
+
+void CoreSession::updateIdentityBySender() {
+  CoreIdentity *identity = qobject_cast<CoreIdentity *>(sender());
+  if(!identity)
+    return;
+  Core::updateIdentity(user(), *identity);
+}
+
+void CoreSession::removeIdentity(IdentityId id) {
+  CoreIdentity *identity = _identities.take(id);
+  if(identity) {
+    emit identityRemoved(id);
+    Core::removeIdentity(user(), id);
+    identity->deleteLater();
   }
-  //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!";
+/*** Network Handling ***/
+
+void CoreSession::createNetwork(const NetworkInfo &info_) {
+  NetworkInfo info = info_;
+  int 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;
   }
-  _identities[id.id()]->update(id);
 
-  CoreUserSettings s(user());
-  s.storeIdentity(id);
+  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);
+  }
 }
 
-void CoreSession::removeIdentity(IdentityId id) {
-  Identity *i = _identities.take(id);
-  if(i) {
-    emit identityRemoved(id);
-    CoreUserSettings s(user());
-    s.removeIdentity(id);
-    i->deleteLater();
+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);
+  }
+}
+
+void CoreSession::destroyNetwork(NetworkId id) {
+  QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
+  Network *net = _networks.take(id);
+  if(net && Core::removeNetwork(user(), id)) {
+    foreach(BufferId bufferId, removedBuffers) {
+      _bufferSyncer->removeBuffer(bufferId);
+    }
+    emit networkRemoved(id);
+    net->deleteLater();
   }
 }
 
+void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) {
+  BufferInfo bufferInfo = Core::bufferInfo(user(), networkId, BufferInfo::QueryBuffer, oldName, false);
+  if(bufferInfo.isValid()) {
+    _bufferSyncer->renameBuffer(bufferInfo.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);
+    }
+  }
+}