#include "client.h"
#include "bufferinfo.h"
+#include "buffersyncer.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
mainUi(0),
_networkModel(0),
_bufferModel(0),
+ _bufferSyncer(0),
_connectedToCore(false),
_syncedToCore(false)
{
_networkModel = new NetworkModel(this);
connect(this, SIGNAL(bufferUpdated(BufferInfo)),
_networkModel, SLOT(bufferUpdated(BufferInfo)));
+ connect(this, SIGNAL(networkRemoved(NetworkId)),
+ _networkModel, SLOT(networkRemoved(NetworkId)));
_bufferModel = new BufferModel(_networkModel);
return buff;
}
-Buffer *Client::monitorBuffer() {
- return instance()->_monitorBuffer;
-}
-
-
-NetworkModel *Client::networkModel() {
- return instance()->_networkModel;
-}
-
-BufferModel *Client::bufferModel() {
- return instance()->_bufferModel;
-}
-
-SignalProxy *Client::signalProxy() {
- return instance()->_signalProxy;
-}
-
bool Client::isConnected() {
return instance()->_connectedToCore;
}
}
void Client::setSyncedToCore() {
+ // create buffersyncer
+ Q_ASSERT(!_bufferSyncer);
+ _bufferSyncer = new BufferSyncer(this);
+ connect(bufferSyncer(), SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(updateLastSeen(BufferId, const QDateTime &)));
+ signalProxy()->synchronize(bufferSyncer());
+
_syncedToCore = true;
emit connected();
emit coreConnectionStateChanged(true);
emit coreConnectionStateChanged(false);
// Clear internal data. Hopefully nothing relies on it at this point.
+ _bufferSyncer->deleteLater();
+ _bufferSyncer = 0;
_networkModel->clear();
+ QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
+ while(bufferIter != _buffers.end()) {
+ Buffer *buffer = bufferIter.value();
+ disconnect(buffer, SIGNAL(destroyed()), this, 0);
+ bufferIter = _buffers.erase(bufferIter);
+ buffer->deleteLater();
+ }
+ Q_ASSERT(_buffers.isEmpty());
+
QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
while(netIter != _networks.end()) {
Network *net = netIter.value();
}
Q_ASSERT(_networks.isEmpty());
- QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
- while(bufferIter != _buffers.end()) {
- Buffer *buffer = bufferIter.value();
- disconnect(buffer, SIGNAL(destroyed()), this, 0);
- bufferIter = _buffers.erase(bufferIter);
- buffer->deleteLater();
- }
- Q_ASSERT(_buffers.isEmpty());
-
QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
while(idIter != _identities.end()) {
Identity *id = idIter.value();
}
}
-void Client::recvMessage(const Message &msg) {
+void Client::recvMessage(const Message &message) {
+ Message msg = message;
+ Buffer *b;
+
if(msg.type() == Message::Error) {
- Buffer *b = buffer(msg.bufferInfo().bufferId());
- if(b) {
- b->appendMsg(msg);
- networkModel()->updateBufferActivity(msg);
- } else {
- //TODO: display message in the status buffer
+ b = buffer(msg.bufferInfo().bufferId());
+ if(!b) {
+ // FIXME: if buffer doesn't exist, forward the message to the status or current buffer
b = buffer(msg.bufferInfo());
- b->appendMsg(msg);
- networkModel()->updateBufferActivity(msg);
}
} else {
- Buffer *b = buffer(msg.bufferInfo());
- b->appendMsg(msg);
- networkModel()->updateBufferActivity(msg);
+ b = buffer(msg.bufferInfo());
}
+ checkForHighlight(msg);
+ b->appendMsg(msg);
+ //bufferModel()->updateBufferActivity(msg);
+
if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
const Network *net = network(msg.bufferInfo().networkId());
QString networkName = net != 0
Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
monitorBuffer()->appendMsg(mmsg);
}
-
}
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
Buffer *b = buffer(id);
foreach(QVariant v, msgs) {
Message msg = v.value<Message>();
+ checkForHighlight(msg);
b->prependMsg(msg);
- networkModel()->updateBufferActivity(msg);
+ //networkModel()->updateBufferActivity(msg);
if(!layoutQueue.contains(b)) layoutQueue.append(b);
}
if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
return instance()->mainUi->layoutMsg(msg);
}
+void Client::checkForHighlight(Message &msg) {
+ const Network *net = network(msg.bufferInfo().networkId());
+ if(net && !net->myNick().isEmpty()) {
+ QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
+ if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text()))
+ msg.setFlags(msg.flags() | Message::Highlight);
+ }
+}
+
+void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) {
+ Buffer *b = buffer(id);
+ if(!b) {
+ qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+ return;
+ }
+ b->setLastSeen(lastSeen);
+}
+
+void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) {
+ if(!bufferSyncer()) return;
+ bufferSyncer()->requestSetLastSeen(id, lastSeen);
+}
+
+