-void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
- NetworkConnection *s = qobject_cast<NetworkConnection*>(this->sender());
- Q_ASSERT(s);
- BufferInfo buf;
- if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
- buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender));
- } else {
- buf = Core::bufferInfo(user(), s->networkName(), target);
- }
- Message msg(buf, type, text, sender, flags);
- msg.setMsgId(Core::storeMessage(msg));
- Q_ASSERT(msg.msgId());
- emit displayMsg(msg);
-}
-
-void CoreSession::recvStatusMsgFromServer(QString msg) {
- NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
- Q_ASSERT(s);
- emit displayStatusMsg(s->networkName(), msg);
-}
-
-QList<BufferInfo> CoreSession::buffers() const {
- return Core::requestBuffers(user());
-}
-
-
-QVariant CoreSession::sessionState() {
- QVariantMap v;
-
- QVariantList bufs;
- foreach(BufferInfo id, buffers()) bufs << QVariant::fromValue(id);
- v["BufferInfos"] = bufs;
- QVariantList networkids;
- foreach(NetworkId id, _networks.keys()) networkids << QVariant::fromValue(id);
- v["NetworkIds"] = networkids;
-
- quint32 ircusercount = 0;
- quint32 ircchannelcount = 0;
- foreach(Network *net, _networks.values()) {
- ircusercount += net->ircUserCount();
- ircchannelcount += net->ircChannelCount();
- }
- v["IrcUserCount"] = ircusercount;
- v["IrcChannelCount"] = ircchannelcount;
- qDebug() << "nets:" << _networks.count() << " chans:" << ircchannelcount << " users:" << ircusercount;
-
- QList<QVariant> idlist;
- foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
- v["Identities"] = idlist;
-
- v["SessionData"] = sessionData;
+void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType,
+ 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::recvStatusMsgFromServer(QString msg)
+{
+ CoreNetwork *net = qobject_cast<CoreNetwork *>(sender());
+ Q_ASSERT(net);
+ 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::customEvent(QEvent *event)
+{
+ if (event->type() != QEvent::User)
+ return;
+
+ processMessages();
+ event->accept();
+}
+
+
+void CoreSession::processMessages()
+{
+ if (_messageQueue.count() == 1) {
+ const RawMessage &rawMsg = _messageQueue.first();
+ 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];
+ }
+ else {
+ 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);
+ messages << msg;
+ }
+
+ Core::storeMessages(messages);
+ // FIXME: extend protocol to a displayMessages(MessageList)
+ for (int i = 0; i < messages.count(); i++) {
+ emit displayMsg(messages[i]);
+ }
+ }
+ _processMessages = false;
+ _messageQueue.clear();
+}
+
+
+QVariant CoreSession::sessionState()
+{
+ QVariantMap v;
+
+ v["CoreFeatures"] = (int)Quassel::features();
+
+ QVariantList bufs;
+ foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
+ v["BufferInfos"] = bufs;
+ QVariantList networkids;
+ foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
+ v["NetworkIds"] = networkids;
+
+ quint32 ircusercount = 0;
+ quint32 ircchannelcount = 0;
+ foreach(Network *net, _networks.values()) {
+ ircusercount += net->ircUserCount();
+ ircchannelcount += net->ircChannelCount();
+ }
+ v["IrcUserCount"] = ircusercount;
+ v["IrcChannelCount"] = ircchannelcount;
+
+ QList<QVariant> idlist;
+ foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
+ v["Identities"] = idlist;