X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=bb4b3dd9ec518fbfa8a64d9450f7664779cefbf5;hp=efdad6e4084a859c865282d1210ca141d61a5aa8;hb=2bb25e1fbdb848b76790fe060094fb62f28e65a1;hpb=c0c8cea57282c56951562e427bc1acb3ee2028a3

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index efdad6e4..bb4b3dd9 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -57,6 +57,9 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   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(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
   p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
   p->attachSignal(this, SIGNAL(displayMsg(Message)));
@@ -71,7 +74,6 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   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();
@@ -117,10 +119,6 @@ CoreSession::~CoreSession() {
   }
 }
 
-UserId CoreSession::user() const {
-  return _user;
-}
-
 CoreNetwork *CoreSession::network(NetworkId id) const {
   if(_networks.contains(id)) return _networks[id];
   return 0;
@@ -142,13 +140,13 @@ void CoreSession::loadSettings() {
   foreach(IdentityId id, s.identityIds()) {
     Identity *i = new Identity(s.identity(id), this);
     if(!i->isValid()) {
-      quWarning() << "Invalid identity! Removing...";
+      qWarning() << "Invalid identity! Removing...";
       s.removeIdentity(id);
       delete i;
       continue;
     }
     if(_identities.contains(i->id())) {
-      quWarning() << "Duplicate identity, ignoring!";
+      qWarning() << "Duplicate identity, ignoring!";
       delete i;
       continue;
     }
@@ -186,7 +184,7 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
 void CoreSession::connectToNetwork(NetworkId id) {
   CoreNetwork *net = network(id);
   if(!net) {
-    quWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
+    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
     return;
   }
 
@@ -230,11 +228,13 @@ void CoreSession::disconnectFromNetwork(NetworkId id) {
 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) {
-    quError() << "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";
@@ -243,15 +243,15 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it
   }
 }
 
+void CoreSession::addClient(SignalProxy *proxy) {
+  signalProxy()->addPeer(proxy);
+  emit sessionState(sessionState());
+}
+
 void CoreSession::removeClient(QIODevice *iodev) {
-  // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
     quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
-  else
-    quInfo() << "Local client disconnedted.";
-  disconnect(socket, 0, this, 0);
-  socket->deleteLater();
 }
 
 SignalProxy *CoreSession::signalProxy() const {
@@ -294,7 +294,7 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
   if(conn) {
     conn->userInput(bufinfo, msg);
   } else {
-    quWarning() << "Trying to send to unconnected network:" << msg;
+    qWarning() << "Trying to send to unconnected network:" << msg;
   }
 }
 
@@ -399,7 +399,7 @@ void CoreSession::removeIdentity(IdentityId id) {
 void CoreSession::identityUpdated(const QVariantMap &data) {
   IdentityId id = data.value("identityId", 0).value<IdentityId>();
   if(!id.isValid() || !_identities.contains(id)) {
-    quWarning() << "Update request for unknown identity received!";
+    qWarning() << "Update request for unknown identity received!";
     return;
   }
   CoreUserSettings s(user());
@@ -416,7 +416,7 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     Core::createNetwork(user(), info);
 
   if(!info.networkId.isValid()) {
-    quWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
+    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
     return;
   }
 
@@ -431,21 +431,11 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     signalProxy()->synchronize(net);
     emit networkCreated(id);
   } else {
-    quWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
-    updateNetwork(info);
+    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
+    _networks[info.networkId]->requestSetNetworkInfo(info);
   }
 }
 
-// FIXME: move to CoreNetwork
-void CoreSession::updateNetwork(const NetworkInfo &info) {
-  if(!_networks.contains(info.networkId)) {
-    quWarning() << "Update request for unknown network received!";
-    return;
-  }
-  _networks[info.networkId]->setNetworkInfo(info);
-  Core::updateNetwork(user(), info);
-}
-
 void CoreSession::removeNetwork(NetworkId id) {
   // Make sure the network is disconnected!
   NetworkConnection *conn = _connections.value(id, 0);
@@ -481,24 +471,24 @@ void CoreSession::destroyNetwork(NetworkId id) {
 void CoreSession::removeBufferRequested(BufferId bufferId) {
   BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
   if(!bufferInfo.isValid()) {
-    quWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
     return;
   }
 
   if(bufferInfo.type() == BufferInfo::StatusBuffer) {
-    quWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
     return;
   }
 
   if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
     CoreNetwork *net = network(bufferInfo.networkId());
     if(!net) {
-      quWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!";
+      qWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!";
       return;
     }
     IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
     if(chan) {
-      quWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
       return;
     }
   }
@@ -512,3 +502,66 @@ void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newNam
     emit bufferRenamed(bufferId, newName);
   }
 }
+
+void CoreSession::clientsConnected() {
+  QHash<NetworkId, NetworkConnection *>::iterator conIter = _connections.begin();
+  Identity *identity = 0;
+  NetworkConnection *con = 0;
+  Network *network = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(conIter != _connections.end()) {
+    con = *conIter;
+    conIter++;
+
+    if(!con->isConnected())
+      continue;
+    identity = con->identity();
+    if(!identity)
+      continue;
+    network = con->network();
+    if(!network)
+      continue;
+    me = network->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && me->isAway()) {
+      con->userInputHandler()->handleAway(BufferInfo(), QString());
+    }
+  }
+}
+
+void CoreSession::clientsDisconnected() {
+  QHash<NetworkId, NetworkConnection *>::iterator conIter = _connections.begin();
+  Identity *identity = 0;
+  NetworkConnection *con = 0;
+  Network *network = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(conIter != _connections.end()) {
+    con = *conIter;
+    conIter++;
+
+    if(!con->isConnected())
+      continue;
+    identity = con->identity();
+    if(!identity)
+      continue;
+    network = con->network();
+    if(!network)
+      continue;
+    me = network->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && !me->isAway()) {
+      if(identity->detachAwayReasonEnabled())
+	awayReason = identity->detachAwayReason();
+      else
+	awayReason = identity->awayReason();
+      network->setAutoAwayActive(true);
+      con->userInputHandler()->handleAway(BufferInfo(), awayReason);
+    }
+  }
+}