X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=bc4289bae24f3a53b317d132436bbbbbfc202a75;hp=e3c58450b78fcce6dcb01d0ca3930be0dbbd0b84;hb=9f9d207ecf28dd5470ecef9d4076a3f447662a20;hpb=da3aa4136fe01e142238f0f42fe1273481037b9d

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index e3c58450..bc4289ba 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -69,9 +69,11 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
   initScriptEngine();
 
   // init BufferSyncer
-  QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
-  foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
-  connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
+  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)));
@@ -138,74 +140,18 @@ void CoreSession::loadSettings() {
     createIdentity(i);
   }
 
-
-  // migration to pure DB storage
-  QList<NetworkId> netIds = s.networkIds();
-  if(!netIds.isEmpty()) {
-    qDebug() << "Migrating Networksettings to DB Storage for User:" << user();
-    foreach(NetworkId id, netIds) {
-      NetworkInfo info = s.networkInfo(id);
-
-      // default new options
-      info.useRandomServer = false;
-      info.useAutoReconnect = true;
-      info.autoReconnectInterval = 60;
-      info.autoReconnectRetries = 20;
-      info.unlimitedReconnectRetries = false;
-      info.useAutoIdentify = false;
-      info.autoIdentifyService = "NickServ";
-      info.rejoinChannels = true;
-
-      Core::updateNetwork(user(), info);
-      s.removeNetworkInfo(id);
-    }
-  }
-
   foreach(NetworkInfo info, Core::networks(user())) {
     createNetwork(info);
   }
 }
 
 void CoreSession::saveSessionState() const {
-  QVariantMap res;
-  QVariantList conn;
-  foreach(NetworkConnection *nc, _connections.values()) {
-    QHash<QString, QString> persistentChans = nc->network()->persistentChannels();
-    QStringList list;
-    foreach(QString chan, persistentChans.keys()) list << QString("%1/%2").arg(chan).arg(persistentChans.value(chan));
-    QVariantMap m;
-    m["NetworkId"] = QVariant::fromValue<NetworkId>(nc->networkId());
-    m["PersistentChannels"] = list;
-    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;
-  }
-  QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList();
-  foreach(QVariant v, conn) {
-    NetworkId id = v.toMap()["NetworkId"].value<NetworkId>();
-    // TODO remove migration code some time
-    QStringList list = v.toMap()["PersistentChannels"].toStringList();
-    if(!list.count()) {
-      // migrate older state
-      QStringList old = v.toMap()["State"].toStringList();
-      foreach(QString chan, old) list << QString("%1/").arg(chan);
-    }
-    foreach(QString chan, list) {
-      QStringList l = chan.split("/");
-      network(id)->addPersistentChannel(l[0], l[1]);
-    }
-    qDebug() << "User" << user() << "connecting to" << network(id)->networkName();
+  QList<NetworkId> nets = Core::connectedNetworks(user());
+  foreach(NetworkId id, nets) {
     connectToNetwork(id);
   }
 }
@@ -214,23 +160,6 @@ 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) {
   Network *net = network(id);
   if(!net) {
@@ -261,6 +190,10 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
 
   connect(conn, SIGNAL(nickChanged(const NetworkId &, const QString &, const QString &)),
 	  this, SLOT(renameBuffer(const NetworkId &, const QString &, const QString &)));
+  connect(conn, SIGNAL(channelJoined(NetworkId, const QString &, const QString &)),
+          this, SLOT(channelJoined(NetworkId, const QString &, const QString &)));
+  connect(conn, SIGNAL(channelParted(NetworkId, const QString &)),
+          this, SLOT(channelParted(NetworkId, const QString &)));
 }
 
 void CoreSession::disconnectFromNetwork(NetworkId id) {
@@ -291,13 +224,29 @@ SignalProxy *CoreSession::signalProxy() const {
 // FIXME we need a sane way for creating buffers!
 void CoreSession::networkConnected(NetworkId networkid) {
   Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
+  Core::setNetworkConnected(user(), networkid, true);
 }
 
 // called now only on /quit and requested disconnects, not on normal disconnects!
 void CoreSession::networkDisconnected(NetworkId networkid) {
+  Core::setNetworkConnected(user(), networkid, false);
   if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
 }
 
+void CoreSession::channelJoined(NetworkId id, const QString &channel, const QString &key) {
+  Core::setChannelPersistent(user(), id, channel, true);
+  Core::setPersistentChannelKey(user(), id, channel, key);
+}
+
+void CoreSession::channelParted(NetworkId id, const QString &channel) {
+  Core::setChannelPersistent(user(), id, channel, false);
+}
+
+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());
@@ -359,8 +308,8 @@ QVariant CoreSession::sessionState() {
   return v;
 }
 
-void CoreSession::storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen) {
-  Core::setBufferLastSeen(user(), buffer, lastSeen);
+void CoreSession::storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId) {
+  Core::setBufferLastSeenMsg(user(), buffer, msgId);
 }
 
 void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {