#include "core.h"
#include "coresession.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
#include "signalproxy.h"
#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
_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()));
loadSettings();
initScriptEngine();
- connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferSyncer, SLOT(storeDirtyIds()));
- connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferViewManager, SLOT(saveBufferViews()));
+ // periodically save our session state
+ connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
QList<NetworkInfo>::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);
// 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());
}
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);
-
- networkName = _networks.value(bufferInfo.networkId())->networkName();
- // if message is ignored with "HardStrictness" we discard it here
- if(_ignoreListManager.match(msg, networkName) != IgnoreListManager::HardStrictness) {
- Core::storeMessage(msg);
- emit displayMsg(msg);
- }
+ Core::storeMessage(msg);
+ emit displayMsg(msg);
} else {
QHash<NetworkId, QHash<QString, BufferInfo> > bufferInfoCache;
MessageList messages;
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 {
- bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
- bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+ bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
+ bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
}
Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
- networkName = _networks.value(bufferInfo.networkId())->networkName();
- // if message is ignored with "HardStrictness" we discard it here
- if(_ignoreListManager.match(msg, networkName) == IgnoreListManager::HardStrictness)
- continue;
messages << msg;
}
Core::storeMessages(messages);
QVariant CoreSession::sessionState() {
QVariantMap v;
+ v["CoreFeatures"] = (int)Quassel::features();
+
QVariantList bufs;
foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
v["BufferInfos"] = bufs;
if(identity->detachAwayEnabled() && !me->isAway()) {
if(!identity->detachAwayReason().isEmpty())
- awayReason = identity->detachAwayReason();
+ awayReason = identity->detachAwayReason();
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}