X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=504fdab02f032abe052e1a000af929ceca284869;hp=ef3b397b8ae6104655a7f215da5622b7c6be0f3d;hb=712781ef33198acb7267e02ee6f8f9bfc8598d5a;hpb=371368423788eec9f5756dc4cebb01aeb93d0e7a diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index ef3b397b..504fdab0 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -18,26 +18,32 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "coresession.h" + #include #include "core.h" -#include "coresession.h" -#include "userinputhandler.h" -#include "signalproxy.h" +#include "coreuserinputhandler.h" #include "corebuffersyncer.h" #include "corebacklogmanager.h" #include "corebufferviewmanager.h" -#include "coreirclisthelper.h" -#include "storage.h" - #include "coreidentity.h" +#include "coreignorelistmanager.h" +#include "coreirclisthelper.h" #include "corenetwork.h" -#include "ircuser.h" -#include "ircchannel.h" - -#include "util.h" +#include "corenetworkconfig.h" +#include "coresessioneventprocessor.h" #include "coreusersettings.h" +#include "eventmanager.h" +#include "eventstringifier.h" +#include "ircchannel.h" +#include "ircparser.h" +#include "ircuser.h" #include "logger.h" +#include "messageevent.h" +#include "signalproxy.h" +#include "storage.h" +#include "util.h" class ProcessMessagesEvent : public QEvent { public: @@ -53,11 +59,20 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) _backlogManager(new CoreBacklogManager(this)), _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), _ircListHelper(new CoreIrcListHelper(this)), + _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)), _coreInfo(this), + _eventManager(new EventManager(this)), + _eventStringifier(new EventStringifier(this)), + _eventProcessor(new CoreSessionEventProcessor(this)), + _ircParser(new IrcParser(this)), scriptEngine(new QScriptEngine(this)), - _processMessages(false) + _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(QIODevice *)), this, SLOT(removeClient(QIODevice *))); connect(p, SIGNAL(connected()), this, SLOT(clientsConnected())); @@ -80,15 +95,23 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) loadSettings(); initScriptEngine(); - connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferSyncer, SLOT(storeDirtyIds())); - connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferViewManager, SLOT(saveBufferViews())); + eventManager()->registerObject(ircParser(), EventManager::NormalPriority); + eventManager()->registerObject(eventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier! + 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(eventProcessor(), EventManager::LowPriority, "lateProcess"); + + // 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(ircListHelper()); + p->synchronize(networkConfig()); p->synchronize(&_coreInfo); - + p->synchronize(&_ignoreListManager); // Restore session state if(restoreState) restoreSessionState(); @@ -125,11 +148,11 @@ void CoreSession::loadSettings() { QList::iterator networkIter = networkInfos.begin(); while(networkIter != networkInfos.end()) { if(networkIter->identity == id) { - networkIter->identity = newId; - Core::updateNetwork(user(), *networkIter); - networkIter = networkInfos.erase(networkIter); + networkIter->identity = newId; + Core::updateNetwork(user(), *networkIter); + networkIter = networkInfos.erase(networkIter); } else { - networkIter++; + networkIter++; } } s.removeIdentity(id); @@ -148,6 +171,7 @@ void CoreSession::loadSettings() { void CoreSession::saveSessionState() const { _bufferSyncer->storeDirtyIds(); _bufferViewManager->saveBufferViews(); + _networkConfig->save(); } void CoreSession::restoreSessionState() { @@ -203,8 +227,22 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString 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) { - _messageQueue << RawMessage(networkId, type, bufferType, target, text, sender, flags); + 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()); @@ -217,6 +255,14 @@ void CoreSession::recvStatusMsgFromServer(QString msg) { 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 CoreSession::buffers() const { return Core::requestBuffers(user()); } @@ -232,24 +278,53 @@ void CoreSession::customEvent(QEvent *event) { void CoreSession::processMessages() { if(_messageQueue.count() == 1) { const RawMessage &rawMsg = _messageQueue.first(); - BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + 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); Core::storeMessage(msg); emit displayMsg(msg); } else { QHash > bufferInfoCache; MessageList messages; + QList 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]; + 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 = _messageQueue.at(i); + if(bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) { + bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target]; } else { - bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); - bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo; + // 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; } - messages << Message(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + messages << msg; } + Core::storeMessages(messages); // FIXME: extend protocol to a displayMessages(MessageList) for(int i = 0; i < messages.count(); i++) { @@ -263,6 +338,8 @@ void CoreSession::processMessages() { QVariant CoreSession::sessionState() { QVariantMap v; + v["CoreFeatures"] = (int)Quassel::features(); + QVariantList bufs; foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id); v["BufferInfos"] = bufs; @@ -326,7 +403,7 @@ void CoreSession::createIdentity(const CoreIdentity &identity) { _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())); + connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender())); emit identityCreated(*coreIdentity); } @@ -380,6 +457,7 @@ void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &per 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()); @@ -399,7 +477,7 @@ void CoreSession::removeNetwork(NetworkId id) { return; if(net->connectionState() != Network::Disconnected) { - connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId))); + connect(net, SIGNAL(disconnected(NetworkId)), SLOT(destroyNetwork(NetworkId))); net->disconnectFromIrc(); } else { destroyNetwork(id); @@ -461,6 +539,7 @@ void CoreSession::clientsDisconnected() { if(!net->isConnected()) continue; + identity = net->identityPtr(); if(!identity) continue; @@ -470,9 +549,24 @@ void CoreSession::clientsDisconnected() { if(identity->detachAwayEnabled() && !me->isAway()) { if(!identity->detachAwayReason().isEmpty()) - awayReason = identity->detachAwayReason(); + awayReason = identity->detachAwayReason(); net->setAutoAwayActive(true); net->userInputHandler()->handleAway(BufferInfo(), awayReason); } } } + + +void CoreSession::globalAway(const QString &msg) { + QHash::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 */); + } +}