#include "corenetworkconfig.h"
#include "coresessioneventprocessor.h"
#include "coreusersettings.h"
+#include "ctcpparser.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"
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
_eventManager(new EventManager(this)),
- _eventProcessor(new CoreSessionEventProcessor(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)
loadSettings();
initScriptEngine();
- eventManager()->registerObject(eventProcessor(), EventManager::Prepend, "process");
+ 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()));
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());
}
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());
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);