core: Fix timestamps in manual /away messages
[quassel.git] / src / core / coresession.cpp
index 9ac44d2..2ca9627 100644 (file)
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-2016 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        *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coresession.h"
-#include "server.h"
+
+#include <QtScript>
+
+#include "core.h"
+#include "coreuserinputhandler.h"
+#include "corebuffersyncer.h"
+#include "corebacklogmanager.h"
+#include "corebufferviewmanager.h"
+#include "coredccconfig.h"
+#include "coreeventmanager.h"
+#include "coreidentity.h"
+#include "coreignorelistmanager.h"
+#include "coreirclisthelper.h"
+#include "corenetwork.h"
+#include "corenetworkconfig.h"
+#include "coresessioneventprocessor.h"
+#include "coretransfermanager.h"
+#include "coreusersettings.h"
+#include "ctcpparser.h"
+#include "eventstringifier.h"
+#include "internalpeer.h"
+#include "ircchannel.h"
+#include "ircparser.h"
+#include "ircuser.h"
+#include "logger.h"
+#include "messageevent.h"
+#include "remotepeer.h"
 #include "storage.h"
 #include "util.h"
 
-CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_storage) {
-  coreProxy = new CoreProxy();
-
-  QSettings s;
-  s.beginGroup(QString("SessionData/%1").arg(user));
-  mutex.lock();
-  foreach(QString key, s.allKeys()) {
-    sessionData[key] = s.value(key);
-  }
-  mutex.unlock();
 
-  connect(coreProxy, SIGNAL(send(CoreSignal, QVariant, QVariant, QVariant)), this, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)));
-  connect(coreProxy, SIGNAL(requestServerStates()), this, SIGNAL(serverStateRequested()));
-  connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList)));
-  connect(coreProxy, SIGNAL(gsUserInput(BufferId, QString)), this, SLOT(msgFromGui(BufferId, QString)));
-  connect(coreProxy, SIGNAL(gsImportBacklog()), storage, SLOT(importOldBacklog()));
-  connect(coreProxy, SIGNAL(gsRequestBacklog(BufferId, QVariant, QVariant)), this, SLOT(sendBacklog(BufferId, QVariant, QVariant)));
-  connect(coreProxy, SIGNAL(gsRequestNetworkStates()), this, SLOT(sendServerStates()));
-  connect(this, SIGNAL(displayMsg(Message)), coreProxy, SLOT(csDisplayMsg(Message)));
-  connect(this, SIGNAL(displayStatusMsg(QString, QString)), coreProxy, SLOT(csDisplayStatusMsg(QString, QString)));
-  connect(this, SIGNAL(backlogData(BufferId, QList<QVariant>, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList<QVariant>, bool)));
-  connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
-  connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
-  connect(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), coreProxy, SLOT(csSessionDataChanged(const QString &, const QVariant &)));
-  connect(coreProxy, SIGNAL(gsSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
+class ProcessMessagesEvent : public QEvent
+{
+public:
+    ProcessMessagesEvent() : QEvent(QEvent::User) {}
+};
+
+
+CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
+    : QObject(parent),
+    _user(uid),
+    _signalProxy(new SignalProxy(SignalProxy::Server, this)),
+    _aliasManager(this),
+    _bufferSyncer(new CoreBufferSyncer(this)),
+    _backlogManager(new CoreBacklogManager(this)),
+    _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
+    _dccConfig(new CoreDccConfig(this)),
+    _ircListHelper(new CoreIrcListHelper(this)),
+    _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
+    _coreInfo(this),
+    _transferManager(new CoreTransferManager(this)),
+    _eventManager(new CoreEventManager(this)),
+    _eventStringifier(new EventStringifier(this)),
+    _sessionEventProcessor(new CoreSessionEventProcessor(this)),
+    _ctcpParser(new CtcpParser(this)),
+    _ircParser(new IrcParser(this)),
+    scriptEngine(new QScriptEngine(this)),
+    _processMessages(false),
+    _ignoreListManager(this)
+{
+    SignalProxy *p = signalProxy();
+    p->setHeartBeatInterval(30);
+    p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
+
+    connect(p, SIGNAL(peerRemoved(Peer*)), SLOT(removeClient(Peer*)));
+
+    connect(p, SIGNAL(connected()), SLOT(clientsConnected()));
+    connect(p, SIGNAL(disconnected()), SLOT(clientsDisconnected()));
+
+    p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
+    p->attachSignal(this, SIGNAL(displayMsg(Message)));
+    p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
+
+    p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
+    p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
+    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 &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &)));
+    p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+
+    p->attachSlot(SIGNAL(changePassword(PeerPtr,QString,QString,QString)), this, SLOT(changePassword(PeerPtr,QString,QString,QString)));
+    p->attachSignal(this, SIGNAL(passwordChanged(PeerPtr,bool)));
+
+    loadSettings();
+    initScriptEngine();
+
+    eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
+    eventManager()->registerObject(sessionEventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+    eventManager()->registerObject(ctcpParser(), EventManager::NormalPriority);
+    eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
+    eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
+    // some events need to be handled after msg generation
+    eventManager()->registerObject(sessionEventProcessor(), EventManager::LowPriority, "lateProcess");
+    eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
+
+    // periodically save our session state
+    connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
+
+    p->synchronize(_bufferSyncer);
+    p->synchronize(&aliasManager());
+    p->synchronize(_backlogManager);
+    p->synchronize(dccConfig());
+    p->synchronize(ircListHelper());
+    p->synchronize(networkConfig());
+    p->synchronize(&_coreInfo);
+    p->synchronize(&_ignoreListManager);
+    p->synchronize(transferManager());
+    // Restore session state
+    if (restoreState)
+        restoreSessionState();
+
+    emit initialized();
 }
 
-CoreSession::~CoreSession() {
 
+CoreSession::~CoreSession()
+{
+    saveSessionState();
+
+    /* Why partially duplicate CoreNetwork destructor?  When each CoreNetwork quits in the
+     * destructor, disconnections are processed in sequence for each object.  For many IRC servers
+     * on a slow network, this could significantly delay core shutdown [msecs wait * network count].
+     *
+     * Here, CoreSession first calls disconnect on all networks, letting them all start
+     * disconnecting before beginning to sequentially wait for each network.  Ideally, after the
+     * first network is disconnected, the other networks will have already closed.  Worst-case may
+     * still wait [msecs wait time * num. of networks], but the risk should be much lower.
+     *
+     * CoreNetwork should still do cleanup in its own destructor in case a network is deleted
+     * outside of deleting the whole CoreSession.
+     *
+     * If this proves to be problematic in the future, there's an alternative Qt signal-based system
+     * implemented in another pull request that guarentees a maximum amount of time to disconnect,
+     * but at the cost of more complex code.
+     *
+     * See https://github.com/quassel/quassel/pull/203
+     */
+
+    foreach(CoreNetwork *net, _networks.values()) {
+        // Request each network properly disconnect, but don't count as user-requested disconnect
+        if (net->socketConnected()) {
+            // Only try if the socket's fully connected (not initializing or disconnecting).
+            // Force an immediate disconnect, jumping the command queue.  Ensures the proper QUIT is
+            // shown even if other messages are queued.
+            net->disconnectFromIrc(false, QString(), false, true);
+        }
+    }
+
+    // Process the putCmd events that trigger the quit.  Without this, shutting down the core
+    // results in abrubtly closing the socket rather than sending the QUIT as expected.
+    QCoreApplication::processEvents();
+
+    foreach(CoreNetwork *net, _networks.values()) {
+        // Wait briefly for each network to disconnect.  Sometimes it takes a little while to send.
+        if (!net->forceDisconnect()) {
+            qWarning() << "Timed out quitting network" << net->networkName() <<
+                          "(user ID " << net->userId() << ")";
+        }
+        // Delete the network now that it's closed
+        delete net;
+    }
 }
 
-UserId CoreSession::userId() const {
-  return user;
+
+CoreNetwork *CoreSession::network(NetworkId id) const
+{
+    if (_networks.contains(id)) return _networks[id];
+    return 0;
 }
 
-void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
-  coreProxy->recv(sig, arg1, arg2, arg3);
+
+CoreIdentity *CoreSession::identity(IdentityId id) const
+{
+    if (_identities.contains(id)) return _identities[id];
+    return 0;
 }
 
-void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
-  QSettings s;
-  s.beginGroup(QString("SessionData/%1").arg(user));
-  mutex.lock();
-  sessionData[key] = data;
-  s.setValue(key, data);
-  mutex.unlock();
-  s.endGroup();
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
+
+void CoreSession::loadSettings()
+{
+    CoreUserSettings s(user());
+
+    // 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);
+    }
+    // end of migration
+
+    foreach(CoreIdentity identity, Core::identities(user())) {
+        createIdentity(identity);
+    }
+
+    foreach(NetworkInfo info, Core::networks(user())) {
+        createNetwork(info);
+    }
 }
 
-QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
-  QVariant data;
-  mutex.lock();
-  if(!sessionData.contains(key)) data = def;
-  else data = sessionData[key];
-  mutex.unlock();
-  return data;
+
+void CoreSession::saveSessionState() const
+{
+    _bufferSyncer->storeDirtyIds();
+    _bufferViewManager->saveBufferViews();
+    _networkConfig->save();
 }
 
-void CoreSession::connectToIrc(QStringList networks) {
-  foreach(QString net, networks) {
-    if(servers.contains(net)) {
 
-    } else {
-      Server *server = new Server(userId(), net);
-      connect(this, SIGNAL(serverStateRequested()), server, SLOT(sendState()));
-      connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
-      connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
-      connect(this, SIGNAL(msgFromGui(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString)));
+void CoreSession::restoreSessionState()
+{
+    QList<NetworkId> nets = Core::connectedNetworks(user());
+    CoreNetwork *net = 0;
+    foreach(NetworkId id, nets) {
+        net = network(id);
+        Q_ASSERT(net);
+        net->connectToIrc();
+    }
+}
 
-      connect(server, SIGNAL(connected(QString)), this, SLOT(serverConnected(QString)));
-      connect(server, SIGNAL(disconnected(QString)), this, SLOT(serverDisconnected(QString)));
 
-      connect(server, SIGNAL(serverState(QString, VarMap)), coreProxy, SLOT(csServerState(QString, VarMap)));
-      //connect(server, SIGNAL(displayMsg(Message)), this, SLOT(recvMessageFromServer(Message)));
-      connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
-      connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
-      connect(server, SIGNAL(modeSet(QString, QString, QString)), coreProxy, SLOT(csModeSet(QString, QString, QString)));
-      connect(server, SIGNAL(topicSet(QString, QString, QString)), coreProxy, SLOT(csTopicSet(QString, QString, QString)));
-      connect(server, SIGNAL(nickAdded(QString, QString, VarMap)), coreProxy, SLOT(csNickAdded(QString, QString, VarMap)));
-      connect(server, SIGNAL(nickRenamed(QString, QString, QString)), coreProxy, SLOT(csNickRenamed(QString, QString, QString)));
-      connect(server, SIGNAL(nickRemoved(QString, QString)), coreProxy, SLOT(csNickRemoved(QString, QString)));
-      connect(server, SIGNAL(nickUpdated(QString, QString, VarMap)), coreProxy, SLOT(csNickUpdated(QString, QString, VarMap)));
-      connect(server, SIGNAL(ownNickSet(QString, QString)), coreProxy, SLOT(csOwnNickSet(QString, QString)));
-      connect(server, SIGNAL(queryRequested(QString, QString)), coreProxy, SLOT(csQueryRequested(QString, QString)));
-      // TODO add error handling
-      connect(server, SIGNAL(connected(QString)), coreProxy, SLOT(csServerConnected(QString)));
-      connect(server, SIGNAL(disconnected(QString)), coreProxy, SLOT(csServerDisconnected(QString)));
+void CoreSession::addClient(RemotePeer *peer)
+{
+    peer->dispatch(sessionState());
+    signalProxy()->addPeer(peer);
+}
 
-      server->start();
-      servers[net] = server;
-    }
-    emit connectToIrc(net);
-  }
+
+void CoreSession::addClient(InternalPeer *peer)
+{
+    signalProxy()->addPeer(peer);
+    emit sessionState(sessionState());
 }
 
-void CoreSession::serverConnected(QString net) {
-  storage->getBufferId(userId(), net); // create status buffer
+
+void CoreSession::removeClient(Peer *peer)
+{
+    RemotePeer *p = qobject_cast<RemotePeer *>(peer);
+    if (p)
+        quInfo() << qPrintable(tr("Client")) << p->description() << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
 }
 
-void CoreSession::serverDisconnected(QString net) {
-  delete servers[net];
-  servers.remove(net);
-  coreProxy->csServerDisconnected(net);
+
+QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const
+{
+    return Core::persistentChannels(user(), id);
 }
 
-void CoreSession::msgFromGui(BufferId bufid, QString msg) {
-  emit msgFromGui(bufid.network(), bufid.buffer(), msg);
+
+// FIXME switch to BufferId
+void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg)
+{
+    CoreNetwork *net = network(bufinfo.networkId());
+    if (net) {
+        net->userInput(bufinfo, msg);
+    }
+    else {
+        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(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType,
+    const QString &target, const QString &text_, const QString &sender, Message::Flags flags)
+{
+    // U+FDD0 and U+FDD1 are special characters for Qt's text engine, specifically they mark the boundaries of
+    // text frames in a QTextDocument. This might lead to problems in widgets displaying QTextDocuments (such as
+    // KDE's notifications), hence we remove those just to be safe.
+    QString text = text_;
+    text.remove(QChar(0xfdd0)).remove(QChar(0xfdd1));
+    RawMessage rawMsg(networkId, type, bufferType, target, text, sender, flags);
+
+    // check for HardStrictness ignore
+    CoreNetwork *currentNetwork = network(networkId);
+    QString networkName = currentNetwork ? currentNetwork->networkName() : QString("");
+    if (_ignoreListManager.match(rawMsg, networkName) == IgnoreListManager::HardStrictness)
+        return;
+
+    _messageQueue << rawMsg;
+    if (!_processMessages) {
+        _processMessages = true;
+        QCoreApplication::postEvent(this, new ProcessMessagesEvent());
+    }
+}
+
+
+void CoreSession::recvStatusMsgFromServer(QString msg)
+{
+    CoreNetwork *net = qobject_cast<CoreNetwork *>(sender());
+    Q_ASSERT(net);
+    emit displayStatusMsg(net->networkName(), msg);
+}
+
+
+void CoreSession::processMessageEvent(MessageEvent *event)
+{
+    recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(),
+        event->target().isNull() ? "" : event->target(),
+        event->text().isNull() ? "" : event->text(),
+        event->sender().isNull() ? "" : event->sender(),
+        event->msgFlags());
+}
+
+
+QList<BufferInfo> CoreSession::buffers() const
+{
+    return Core::requestBuffers(user());
+}
+
+
+void CoreSession::customEvent(QEvent *event)
+{
+    if (event->type() != QEvent::User)
+        return;
+
+    processMessages();
+    event->accept();
+}
+
+
+void CoreSession::processMessages()
+{
+    if (_messageQueue.count() == 1) {
+        const RawMessage &rawMsg = _messageQueue.first();
+        bool createBuffer = !(rawMsg.flags & Message::Redirected);
+        BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target, createBuffer);
+        if (!bufferInfo.isValid()) {
+            Q_ASSERT(!createBuffer);
+            bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, BufferInfo::StatusBuffer, "");
+        }
+        Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
+        if(Core::storeMessage(msg))
+            emit displayMsg(msg);
+    }
+    else {
+        QHash<NetworkId, QHash<QString, BufferInfo> > bufferInfoCache;
+        MessageList messages;
+        QList<RawMessage> redirectedMessages; // list of Messages which don't enforce a buffer creation
+        BufferInfo bufferInfo;
+        for (int i = 0; i < _messageQueue.count(); i++) {
+            const RawMessage &rawMsg = _messageQueue.at(i);
+            if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
+                bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
+            }
+            else {
+                bool createBuffer = !(rawMsg.flags & Message::Redirected);
+                bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target, createBuffer);
+                if (!bufferInfo.isValid()) {
+                    Q_ASSERT(!createBuffer);
+                    redirectedMessages << rawMsg;
+                    continue;
+                }
+                bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+            }
+            Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
+            messages << msg;
+        }
+
+        // recheck if there exists a buffer to store a redirected message in
+        for (int i = 0; i < redirectedMessages.count(); i++) {
+            const RawMessage &rawMsg = redirectedMessages.at(i);
+            if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
+                bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
+            }
+            else {
+                // no luck -> we store them in the StatusBuffer
+                bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, BufferInfo::StatusBuffer, "");
+                // add the StatusBuffer to the Cache in case there are more Messages for the original target
+                bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+            }
+            Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
+            messages << msg;
+        }
+
+        if(Core::storeMessages(messages)) {
+            // FIXME: extend protocol to a displayMessages(MessageList)
+            for (int i = 0; i < messages.count(); i++) {
+                emit displayMsg(messages[i]);
+            }
+        }
+    }
+    _processMessages = false;
+    _messageQueue.clear();
+}
+
+
+Protocol::SessionState CoreSession::sessionState() const
+{
+    QVariantList bufferInfos;
+    QVariantList networkIds;
+    QVariantList identities;
+
+    foreach(const BufferInfo &id, buffers())
+        bufferInfos << QVariant::fromValue(id);
+    foreach(const NetworkId &id, _networks.keys())
+        networkIds << QVariant::fromValue(id);
+    foreach(const Identity *i, _identities.values())
+        identities << QVariant::fromValue(*i);
 
-void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
-  Server *s = qobject_cast<Server*>(this->sender());
-  Q_ASSERT(s);
-  BufferId buf;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
-    buf = storage->getBufferId(user, s->getNetwork(), nickFromMask(sender));
-  } else {
-    buf = storage->getBufferId(user, s->getNetwork(), target);
-  }
-  Message msg(buf, type, text, sender, flags);
-  msg.msgId = storage->logMessage(msg);
-  Q_ASSERT(msg.msgId);
-  emit displayMsg(msg);
+    return Protocol::SessionState(identities, bufferInfos, networkIds);
 }
 
-void CoreSession::recvStatusMsgFromServer(QString msg) {
-  Server *s = qobject_cast<Server*>(sender());
-  Q_ASSERT(s);
-  emit displayStatusMsg(s->getNetwork(), msg);
+
+void CoreSession::initScriptEngine()
+{
+    signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
+    signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
+
+    // FIXME
+    //QScriptValue storage_ = scriptEngine->newQObject(storage);
+    //scriptEngine->globalObject().setProperty("storage", storage_);
 }
 
 
-QList<BufferId> CoreSession::buffers() const {
-  return storage->requestBuffers(user);
+void CoreSession::scriptRequest(QString script)
+{
+    emit scriptResult(scriptEngine->evaluate(script).toString());
 }
 
 
-QVariant CoreSession::sessionState() {
-  VarMap v;
-  QList<QVariant> bufs;
-  foreach(BufferId id, storage->requestBuffers(user)) { bufs.append(QVariant::fromValue(id)); }
-  v["Buffers"] = bufs;
-  mutex.lock();
-  v["SessionData"] = sessionData;
-  mutex.unlock();
-  v["Networks"] = QVariant(servers.keys());
-  v["Payload"] = QByteArray(100000000, 'a');
-  return v;
+/*** 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
+    qDebug() << Q_FUNC_INFO;
+    IdentityId id = Core::createIdentity(user(), coreIdentity);
+    if (!id.isValid())
+        return;
+    else
+        createIdentity(coreIdentity);
 }
 
-void CoreSession::sendServerStates() {
-  emit serverStateRequested();
+
+void CoreSession::createIdentity(const CoreIdentity &identity)
+{
+    CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
+    _identities[identity.id()] = coreIdentity;
+    // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
+    coreIdentity->synchronize(signalProxy());
+    connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender()));
+    emit identityCreated(*coreIdentity);
 }
 
-void CoreSession::sendBacklog(BufferId id, QVariant v1, QVariant v2) {
-  QList<QVariant> log;
-  QList<Message> msglist;
-  if(v1.type() == QVariant::DateTime) {
+
+void CoreSession::updateIdentityBySender()
+{
+    CoreIdentity *identity = qobject_cast<CoreIdentity *>(sender());
+    if (!identity)
+        return;
+    Core::updateIdentity(user(), *identity);
+}
 
 
-  } else {
-    msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt());
-  }
+void CoreSession::removeIdentity(IdentityId id)
+{
+    CoreIdentity *identity = _identities.take(id);
+    if (identity) {
+        emit identityRemoved(id);
+        Core::removeIdentity(user(), id);
+        identity->deleteLater();
+    }
+}
 
-  // 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();
+
+/*** Network Handling ***/
+
+void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &persistentChans)
+{
+    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;
+    }
+
+    id = info.networkId.toInt();
+    if (!_networks.contains(id)) {
+        // create persistent chans
+        QRegExp rx("\\s*(\\S+)(?:\\s*(\\S+))?\\s*");
+        foreach(QString channel, persistentChans) {
+            if (!rx.exactMatch(channel)) {
+                qWarning() << QString("Invalid persistent channel declaration: %1").arg(channel);
+                continue;
+            }
+            Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, rx.cap(1), true);
+            Core::setChannelPersistent(user(), info.networkId, rx.cap(1), true);
+            if (!rx.cap(2).isEmpty())
+                Core::setPersistentChannelKey(user(), info.networkId, rx.cap(1), rx.cap(2));
+        }
+
+        CoreNetwork *net = new CoreNetwork(id, this);
+        connect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)),
+            SLOT(recvMessageFromServer(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)));
+        connect(net, SIGNAL(displayStatusMsg(QString)), SLOT(recvStatusMsgFromServer(QString)));
+        connect(net, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
+
+        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::removeNetwork(NetworkId id)
+{
+    // Make sure the network is disconnected!
+    CoreNetwork *net = network(id);
+    if (!net)
+        return;
+
+    if (net->connectionState() != Network::Disconnected) {
+        // make sure we no longer receive data from the tcp buffer
+        disconnect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), this, 0);
+        disconnect(net, SIGNAL(displayStatusMsg(QString)), this, 0);
+        connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
+        net->disconnectFromIrc();
+    }
+    else {
+        destroyNetwork(id);
     }
-  }
-  if(log.count() > 0) emit backlogData(id, log, true);
+}
+
+
+void CoreSession::destroyNetwork(NetworkId id)
+{
+    QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
+    Network *net = _networks.take(id);
+    if (net && Core::removeNetwork(user(), id)) {
+        // make sure that all unprocessed RawMessages from this network are removed
+        QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+        while (messageIter != _messageQueue.end()) {
+            if (messageIter->networkId == id) {
+                messageIter = _messageQueue.erase(messageIter);
+            }
+            else {
+                ++messageIter;
+            }
+        }
+        // remove buffers from syncer
+        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;
+    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->detachAwayReason().isEmpty())
+                awayReason = identity->detachAwayReason();
+            net->setAutoAwayActive(true);
+            // Allow handleAway() to format the current date/time in the string.
+            net->userInputHandler()->handleAway(BufferInfo(), awayReason);
+        }
+    }
+}
+
+
+void CoreSession::globalAway(const QString &msg, const bool skipFormatting)
+{
+    QHash<NetworkId, CoreNetwork *>::iterator netIter = _networks.begin();
+    CoreNetwork *net = 0;
+    while (netIter != _networks.end()) {
+        net = *netIter;
+        ++netIter;
+
+        if (!net->isConnected())
+            continue;
+
+        net->userInputHandler()->issueAway(msg, false /* no force away */, skipFormatting);
+    }
+}
+
+void CoreSession::changePassword(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword)
+{
+    bool success = false;
+    UserId uid = Core::validateUser(userName, oldPassword);
+    if (uid.isValid() && uid == user())
+        success = Core::changeUserPassword(uid, newPassword);
+
+    emit passwordChanged(peer, success);
 }