* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include "coresession.h"
+
#include <QtScript>
#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 "ctcpparser.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:
_ircListHelper(new CoreIrcListHelper(this)),
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
+ _eventManager(new EventManager(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(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());
}
void CoreSession::createIdentity(const CoreIdentity &identity) {
CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
_identities[identity.id()] = coreIdentity;
- // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+ // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
coreIdentity->synchronize(signalProxy());
connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender()));
emit identityCreated(*coreIdentity);
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) {
+ // make sure we no longer receive data from the tcp buffer
+ disconnect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), this, 0);
+ disconnect(net, SIGNAL(displayStatusMsg(QString)), this, 0);
connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
net->disconnectFromIrc();
} else {
QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
Network *net = _networks.take(id);
if(net && Core::removeNetwork(user(), id)) {
+ // make sure that all unprocessed RawMessages from this network are removed
+ QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+ while(messageIter != _messageQueue.end()) {
+ if(messageIter->networkId == id) {
+ messageIter = _messageQueue.erase(messageIter);
+ } else {
+ messageIter++;
+ }
+ }
+ // remove buffers from syncer
foreach(BufferId bufferId, removedBuffers) {
_bufferSyncer->removeBuffer(bufferId);
}