X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=a33b942ce868b5519c5de10d8fb811aa6857b7b2;hp=355d867f8b665aca521e66fec098e8de126caf83;hb=3eebe11329417e77038d860af3b6f35630f40450;hpb=bee603c31bc513796ddfbbe53e6774dd8667dcc4 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 355d867f..a33b942c 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -18,28 +18,32 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "coresession.h" + #include #include "core.h" -#include "coresession.h" #include "coreuserinputhandler.h" -#include "signalproxy.h" #include "corebuffersyncer.h" #include "corebacklogmanager.h" #include "corebufferviewmanager.h" -#include "coreirclisthelper.h" -#include "corenetworkconfig.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 "coreignorelistmanager.h" +#include "messageevent.h" +#include "signalproxy.h" +#include "storage.h" +#include "util.h" class ProcessMessagesEvent : public QEvent { public: @@ -57,6 +61,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) _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), _ignoreListManager(this) @@ -87,6 +95,11 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) loadSettings(); initScriptEngine(); + eventManager()->registerObject(ircParser(), EventManager::NormalPriority); + eventManager()->registerObject(eventProcessor(), EventManager::HighPriority); + eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority); + eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client + // periodically save our session state connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState())); @@ -219,8 +232,15 @@ void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type, // 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 << RawMessage(networkId, type, bufferType, target, text, sender, flags); + _messageQueue << rawMsg; if(!_processMessages) { _processMessages = true; QCoreApplication::postEvent(this, new ProcessMessagesEvent()); @@ -233,6 +253,11 @@ void CoreSession::recvStatusMsgFromServer(QString msg) { emit displayStatusMsg(net->networkName(), msg); } +void CoreSession::processMessageEvent(MessageEvent *event) { + recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(), event->target(), + event->text(), event->sender(), event->msgFlags()); +} + QList CoreSession::buffers() const { return Core::requestBuffers(user()); } @@ -246,40 +271,55 @@ void CoreSession::customEvent(QEvent *event) { } void CoreSession::processMessages() { - QString networkName; if(_messageQueue.count() == 1) { const RawMessage &rawMsg = _messageQueue.first(); - BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); - Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); - - CoreNetwork *currentNetwork = network(bufferInfo.networkId()); - networkName = currentNetwork ? currentNetwork->networkName() : QString(""); - // if message is ignored with "HardStrictness" we discard it here - if(_ignoreListManager.match(msg, networkName) != IgnoreListManager::HardStrictness) { - Core::storeMessage(msg); - emit displayMsg(msg); + 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]; } else { - bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + 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 { + // 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); - CoreNetwork *currentNetwork = network(bufferInfo.networkId()); - networkName = currentNetwork ? currentNetwork->networkName() : QString(""); - // if message is ignored with "HardStrictness" we discard it here - if(_ignoreListManager.match(msg, networkName) == IgnoreListManager::HardStrictness) - continue; messages << msg; } + Core::storeMessages(messages); // FIXME: extend protocol to a displayMessages(MessageList) for(int i = 0; i < messages.count(); i++) { @@ -293,6 +333,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; @@ -491,6 +533,7 @@ void CoreSession::clientsDisconnected() { if(!net->isConnected()) continue; + identity = net->identityPtr(); if(!identity) continue; @@ -506,3 +549,18 @@ void CoreSession::clientsDisconnected() { } } } + + +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 */); + } +}