#include "core.h"
#include "coresession.h"
-#include "userinputhandler.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 "util.h"
#include "coreusersettings.h"
#include "logger.h"
+#include "coreignorelistmanager.h"
class ProcessMessagesEvent : public QEvent {
public:
_backlogManager(new CoreBacklogManager(this)),
_bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
_ircListHelper(new CoreIrcListHelper(this)),
+ _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(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()));
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());
p->synchronize(_backlogManager);
p->synchronize(ircListHelper());
+ p->synchronize(networkConfig());
p->synchronize(&_coreInfo);
-
+ p->synchronize(&_ignoreListManager);
// Restore session state
if(restoreState)
restoreSessionState();
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);
void CoreSession::saveSessionState() const {
_bufferSyncer->storeDirtyIds();
_bufferViewManager->saveBufferViews();
+ _networkConfig->save();
}
void CoreSession::restoreSessionState() {
// 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());
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<NetworkId, QHash<QString, BufferInfo> > bufferInfoCache;
MessageList messages;
+ QList<RawMessage> 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 {
- bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
- bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
+ 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;
}
- messages << Message(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
+ 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);
+ messages << msg;
+ }
+
Core::storeMessages(messages);
// FIXME: extend protocol to a displayMessages(MessageList)
for(int i = 0; i < messages.count(); i++) {
QVariant CoreSession::sessionState() {
QVariantMap v;
+ v["CoreFeatures"] = (int)Quassel::features();
+
QVariantList bufs;
foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
v["BufferInfos"] = bufs;
_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);
}
if(identity->detachAwayEnabled() && !me->isAway()) {
if(!identity->detachAwayReason().isEmpty())
- awayReason = identity->detachAwayReason();
+ awayReason = identity->detachAwayReason();
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}